diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs
index 63c09465c..235471ed9 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
     partial class CycleBeginningForm
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs
index 38adaaf4e..14ef0a383 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs
@@ -7,7 +7,7 @@ using System.Windows.Forms;
 using log4net;
 using TBF.Resources;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
     public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx
similarity index 100%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.Designer.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs
index ec583173f..2ab5dbe93 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
     partial class CycleEndForm
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.cs
similarity index 98%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.cs
index 9c2170d76..c767e4f6a 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
 using log4net;
 using TBF.Resources;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public partial class CycleEndForm : Form, GenericDevices.IHasCompleted
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.resx
similarity index 100%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/CycleEndForm.resx
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/CycleEndForm.resx
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs
index b10159155..c15a02b39 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs
@@ -8,7 +8,7 @@ using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.GenericDevices;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public class EntryForm : ComponentBase, IOperation, IDataEntry, IHasCycleBeginForm, IHasCycleEndForm, IHasWMStatesForm
 	{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
similarity index 96%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
index 81ef86283..686895ee8 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfg.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Xml.Serialization;
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
 	{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
similarity index 97%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
index 65033baae..e467aef43 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
@@ -7,7 +7,7 @@ using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public partial class EntryFormCfgCtrl : UserControl, IComponentCfgCtrl
 	{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs
similarity index 98%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs
index eaa07b600..23f7e8c1d 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.designer.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	partial class EntryFormCfgCtrl
 	{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.resx b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx
similarity index 100%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormCfgCtrl.resx
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.resx
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormFactory.cs
similarity index 92%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormFactory.cs
index f5317282e..b31c9a773 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormFactory.cs
@@ -3,7 +3,7 @@
 ///
 using TBF.BenchControl.Generic;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public class EntryFormFactory : IComponentFactory
 	{
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs
index 853f21077..f1cc3672d 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
 using log4net;
 using TBF.Resources;
 
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
 	public partial class TestStartEndForm : Form, GenericDevices.IHasCompleted
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs
similarity index 99%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.designer.cs
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs
index 4234c5eed..464d0ab5c 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.designer.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
-namespace TBF.BenchControl.DataEntry.Standard
+namespace TBF.BenchControl.DataEntry.Standard6
 {
     partial class TestStartEndForm
     {
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.resx
similarity index 100%
rename from TestBenchFramework/BenchControl/DataEntry/Standard/TestStartEndForm.resx
rename to TestBenchFramework/BenchControl/DataEntry/Standard6/TestStartEndForm.resx
diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 24b8ed1d5..3073ead06 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -27,7 +27,7 @@ namespace TBF.BenchControl
 			Factories.Add(new DataEntry.Munich3.EntryFormFactory());
 			Factories.Add(new DataEntry.Munich.EntryFormFactory());
 			Factories.Add(new DataEntry.iPerl.EntryFormFactory());
-			Factories.Add(new DataEntry.Standard.EntryFormFactory());
+			Factories.Add(new DataEntry.Standard6.EntryFormFactory());
 			Factories.Add(new DataEntry.Standard12.EntryFormFactory());
 			Factories.Add(new DataEntry.Standard24.EntryFormFactory());
 			Factories.Add(new DataEntry.Standard48.EntryFormFactory());
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index d5e8a8ba7..6633ae681 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -291,10 +291,10 @@
     <Compile Include="BenchControl\DataEntry\Standard48\TestStartEndForm.designer.cs">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\TestStartEndForm.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\TestStartEndForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\TestStartEndForm.designer.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\TestStartEndForm.designer.cs">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\DB\SensusOracle\Database.cs" />
@@ -685,27 +685,27 @@
       <DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="BenchControl\DataEntry\Munich\EntryFormFactory.cs" />
-    <Compile Include="BenchControl\DataEntry\Standard\CycleBeginningForm.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\CycleBeginningForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\CycleBeginningForm.designer.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\CycleBeginningForm.designer.cs">
       <DependentUpon>CycleBeginningForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\CycleEndForm.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\CycleEndForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\CycleEndForm.designer.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\CycleEndForm.designer.cs">
       <DependentUpon>CycleEndForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\EntryForm.cs" />
-    <Compile Include="BenchControl\DataEntry\Standard\EntryFormCfg.cs" />
-    <Compile Include="BenchControl\DataEntry\Standard\EntryFormCfgCtrl.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\EntryForm.cs" />
+    <Compile Include="BenchControl\DataEntry\Standard6\EntryFormCfg.cs" />
+    <Compile Include="BenchControl\DataEntry\Standard6\EntryFormCfgCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\EntryFormCfgCtrl.designer.cs">
+    <Compile Include="BenchControl\DataEntry\Standard6\EntryFormCfgCtrl.designer.cs">
       <DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
     </Compile>
-    <Compile Include="BenchControl\DataEntry\Standard\EntryFormFactory.cs" />
+    <Compile Include="BenchControl\DataEntry\Standard6\EntryFormFactory.cs" />
     <Compile Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1538,16 +1538,16 @@
     <EmbeddedResource Include="BenchControl\DataEntry\Standard48\TestStartEndForm.resx">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\CycleBeginningForm.resx">
+    <EmbeddedResource Include="BenchControl\DataEntry\Standard6\CycleBeginningForm.resx">
       <DependentUpon>CycleBeginningForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\CycleEndForm.resx">
+    <EmbeddedResource Include="BenchControl\DataEntry\Standard6\CycleEndForm.resx">
       <DependentUpon>CycleEndForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\EntryFormCfgCtrl.resx">
+    <EmbeddedResource Include="BenchControl\DataEntry\Standard6\EntryFormCfgCtrl.resx">
       <DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\DataEntry\Standard\TestStartEndForm.resx">
+    <EmbeddedResource Include="BenchControl\DataEntry\Standard6\TestStartEndForm.resx">
       <DependentUpon>TestStartEndForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.resx">