diff --git a/TestBenchFramework/BenchControl/State.cs b/TestBenchFramework/BenchControl/State.cs
index 481e0e6c8..988276c8b 100644
--- a/TestBenchFramework/BenchControl/State.cs
+++ b/TestBenchFramework/BenchControl/State.cs
@@ -42,8 +42,8 @@ namespace TBF.BenchControl
 		/// </summary>
 		static State()
 		{
-			currentState = State.Empty;
-			PermanentOperations = new List<IOperation>();
+            PermanentOperations = new List<IOperation>();
+            currentState = State.Empty;
 		}
 
 		///
diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs
index 7b4d207a1..704fa3ce6 100644
--- a/TestBenchFramework/MainWnd.Designer.cs
+++ b/TestBenchFramework/MainWnd.Designer.cs
@@ -47,7 +47,7 @@
             this.activityLabel = new System.Windows.Forms.Label();
             this.mainTabControl = new System.Windows.Forms.TabControl();
             this.homeTabPage = new System.Windows.Forms.TabPage();
-            this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
+            this.ctrlBrdComponent = new ControlCom2VB.ControlCom2panel();
             this.processTabPage = new System.Windows.Forms.TabPage();
             this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl();
             this.measurementTabPage = new System.Windows.Forms.TabPage();
diff --git a/TestBenchFramework/MainWnd.resx b/TestBenchFramework/MainWnd.resx
index a868332dc..6f050c9fc 100644
--- a/TestBenchFramework/MainWnd.resx
+++ b/TestBenchFramework/MainWnd.resx
@@ -1063,7 +1063,7 @@
     <value>0, 0</value>
   </data>
   <data name="&gt;&gt;ctrlBrdComponent.Type" xml:space="preserve">
-    <value>ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ControlCom2VB.ControlCom2panel, ControlCom2VB, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>30</value>
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index d60d24a66..c0ecf96d8 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -38,7 +38,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DN100</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -46,7 +46,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DN100</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -73,8 +73,8 @@
     <StartupObject>TBF.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlCom2VB">
+      <HintPath>..\packages\ControlBoard\ControlCom2VB.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>