diff --git a/Step.Model/DTOModels/DTONcGenericDataModel.cs b/Step.Model/DTOModels/DTONcGenericDataModel.cs
index 37741228..65abad3b 100644
--- a/Step.Model/DTOModels/DTONcGenericDataModel.cs
+++ b/Step.Model/DTOModels/DTONcGenericDataModel.cs
@@ -15,7 +15,7 @@ namespace Step.Model.DTOModels
         public string NcSoftwareVersion { get; set; }
         public string NcModel { get; set; }
         public DateTime DateTime { get; set; }
-        public string MachineNumber { get; set; }
+        public string CmsMachineIdNumber { get; set; }
         public ushort ProcessNumber { get; set; }
         public DateTime InstallationDate { get; set; }
         public string PlcVersion { get; set; }
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index ccb527ba..26e1e48f 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -100,7 +100,7 @@ namespace Step.NC
             if (cmsError.errorCode != 0)
                 return cmsError;
 
-            genericData.MachineNumber = tmpInfo;
+            genericData.CmsMachineIdNumber = tmpInfo;
 
             // Get max process number
             ushort procNum = 0;
diff --git a/Step.UI/ServerControlWindow.cs b/Step.UI/ServerControlWindow.cs
index 5a4e3dc8..f5da3068 100644
--- a/Step.UI/ServerControlWindow.cs
+++ b/Step.UI/ServerControlWindow.cs
@@ -215,7 +215,7 @@ namespace Step.UI
                     TXTType.Text = NcConfig.NcVendor;
                     TXTName.Text = data.NcModel;
                     TXTNcSerial.Text = data.SerialNumber;
-                    TXTCMSMach.Text = data.MachineNumber;
+                    TXTCMSMach.Text = data.CmsMachineIdNumber;
                     TXTSftVers.Text = data.NcSoftwareVersion;
                     TXTNCProc.Text = data.ProcessNumber.ToString();
                     TXTLang.Text = data.Language.EnglishName;