1 files changed, 9 insertions, 28 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 0889be54e..feb9b7de5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -63,12 +63,9 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<ProcessParametersTablesViewVM>();
             SimpleIoc.Default.Register<ProcessParametersTablesGroupsViewVM>();
 
-            SimpleIoc.Default.Register<MotorTypesViewVM>();
-            SimpleIoc.Default.Register<DancerTypesViewVM>();
-            SimpleIoc.Default.Register<HardwareVersionsDancerTypeViewVM>();
-            SimpleIoc.Default.Register<HardwareVersionsMotorTypesViewVM>();
-
-            SimpleIoc.Default.Register<PidControlsViewVM>();
+            SimpleIoc.Default.Register<HardwareMotorTypesViewVM>();
+            SimpleIoc.Default.Register<HardwareDancerTypesViewVM>();
+            SimpleIoc.Default.Register<HardwarePidControlTypesViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -375,43 +372,27 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static MotorTypesViewVM MotorTypesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<MotorTypesViewVM>();
-            }
-        }
-
-        public static DancerTypesViewVM DancerTypesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<DancerTypesViewVM>();
-            }
-        }
-
-        public static HardwareVersionsDancerTypeViewVM HardwareVersionsDancerTypeViewVM
+        public static HardwareMotorTypesViewVM HardwareMotorTypesViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareVersionsDancerTypeViewVM>();
+                return ServiceLocator.Current.GetInstance<HardwareMotorTypesViewVM>();
             }
         }
 
-        public static HardwareVersionsMotorTypesViewVM HardwareVersionsMotorTypesViewVM
+        public static HardwareDancerTypesViewVM HardwareDancerTypesViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<HardwareVersionsMotorTypesViewVM>();
+                return ServiceLocator.Current.GetInstance<HardwareDancerTypesViewVM>();
             }
         }
 
-        public static PidControlsViewVM PidControlsViewVM
+        public static HardwarePidControlTypesViewVM HardwarePidControlTypesViewVM
         {
             get
             {
-                return ServiceLocator.Current.GetInstance<PidControlsViewVM>();
+                return ServiceLocator.Current.GetInstance<HardwarePidControlTypesViewVM>();
             }
         }
     }