diff --git a/AdditiveManufacturing/ShowcaseAMMachine.cpp b/AdditiveManufacturing/ShowcaseAMMachine.cpp
index 6c850ce7..1276112c 100644
--- a/AdditiveManufacturing/ShowcaseAMMachine.cpp
+++ b/AdditiveManufacturing/ShowcaseAMMachine.cpp
@@ -16,7 +16,7 @@ ShowcaseAMMachine::ShowcaseAMMachine(UA_Server *pServer) : InstantiatedAMMachine
 void ShowcaseAMMachine::CreateObject() {
   InstantiatedAMMachine::CreateObject();
   mt.Identification->ProductInstanceUri = "http://www.3yourmind.com/#ShowcaseAMMachine";
-  mt.Identification->Location = "EMO 9 F24/N 52.491225 E 13.388392";
+  mt.Identification->Location = "BXP 9 9502/N 52.491225 E 13.388392";
   InstantiateEquipment();
 }
 
diff --git a/GMS/FullGMS.cpp b/GMS/FullGMS.cpp
index 11488935..91bd6346 100644
--- a/GMS/FullGMS.cpp
+++ b/GMS/FullGMS.cpp
@@ -68,7 +68,7 @@ void FullGMS::InstantiateIdentification() {
   gms.Identification->YearOfConstruction = 2022;
   gms.Identification->SoftwareRevision = "v1.05";
   gms.Identification->DeviceClass = "CoordinateMeasuringMachine";
-  gms.Identification->Location = "AMB 10 A75/VIRTUAL 0 0/N 48.7685303 E 9.2653923";
+  gms.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 48.7685303 E 9.2653923";
   gms.Identification->Model = {"", MachineName};
   gms.Identification->SubDeviceClass = "CoordinateMeasuringMachine";
 }
diff --git a/MachineTools/FullMachineTool.cpp b/MachineTools/FullMachineTool.cpp
index 931c30ea..7a440769 100644
--- a/MachineTools/FullMachineTool.cpp
+++ b/MachineTools/FullMachineTool.cpp
@@ -121,7 +121,7 @@ void FullMachineTool::InstantiateIdentification() {
   mt.Identification->ComponentName = {"", MachineName};
   mt.Identification->ProductCode = "2021-47110815";
   mt.Identification->SoftwareRevision = "1.00.1";
-  mt.Identification->Location = "EMO 9 F24/VIRTUAL 0 0/N 48.781340 E 9.165731";
+  mt.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731";
   mt.Identification->Model = {"", MachineName};
 
   auto &swOS = mt.Identification->SoftwareIdentification->SoftwareItem.Add(m_pServer, n, {m_nsIndex, "OS"});
diff --git a/MachineTools/MRMachineTool.cpp b/MachineTools/MRMachineTool.cpp
index 2db784db..3b5a5762 100644
--- a/MachineTools/MRMachineTool.cpp
+++ b/MachineTools/MRMachineTool.cpp
@@ -42,7 +42,7 @@ void MRMachineTool::InstantiateIdentification() {
   InstantiateOptional(mt.Identification->Location, m_pServer, n);
   InstantiateOptional(mt.Identification->Model, m_pServer, n);
 
-  mt.Identification->Location = "EMO 9 F24/VIRTUAL 0 0/N 48.781340 E 9.165731";
+  mt.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731";
   mt.Identification->SerialNumber = std::string{"070-101-098-14"};
   mt.Identification->Manufacturer = {"", "ISW UA4MT Team"};
   mt.Identification->Model = {"", "T3IUTH"};
diff --git a/MachineTools/ShowcaseMachineTool.cpp b/MachineTools/ShowcaseMachineTool.cpp
index 710fafb6..dd8ba18e 100644
--- a/MachineTools/ShowcaseMachineTool.cpp
+++ b/MachineTools/ShowcaseMachineTool.cpp
@@ -35,7 +35,7 @@ void ShowcaseMachineTool::InstantiateIdentification() {
   mt.Identification->SoftwareRevision = "v1.02.1";
   mt.Identification->DeviceClass = "Machining centre (other)";
   mt.Identification->ProductInstanceUri = "https://showcase.umati.org/Specs/Machinetools.html";
-  mt.Identification->Location = "EMO 9 F24/VIRTUAL 0 0/N 49.871215 E 8.654204";
+  mt.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 49.871215 E 8.654204";
   mt.Identification->Model = {"", MachineName};
 }
 
diff --git a/Woodworking/FullWoodworking.cpp b/Woodworking/FullWoodworking.cpp
index 86d3886c..2f6d8cf3 100644
--- a/Woodworking/FullWoodworking.cpp
+++ b/Woodworking/FullWoodworking.cpp
@@ -58,7 +58,7 @@ void FullWoodworking::InstantiateIdentification() {
   ww.Identification->InitialOperationDate = std::chrono::system_clock::now();
   ww.Identification->AssetId = "123456";
   ww.Identification->ComponentName = {"", "Machine"};
-  ww.Identification->Location = "VIRTUAL 0 0/N 49.628661 E 9.654903";
+  ww.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 49.628661 E 9.654903";
 }
 
 void FullWoodworking::InstantiateMachineFlags() {