diff --git a/src/common/DeviceTypes.py b/src/common/DeviceTypes.py
index 08f18dd400296baf373f61901493aa0427e4cf1f..5bc16dd3e6012d0bea42f8837f7f43781a28044f 100644
--- a/src/common/DeviceTypes.py
+++ b/src/common/DeviceTypes.py
@@ -18,7 +18,7 @@ class DeviceTypeEnum(Enum):
 
     # Emulated device types
     EMULATED_DATACENTER             = 'emu-datacenter'
-    EMULATED_MICROVAWE_RADIO_SYSTEM = 'emu-microwave-radio-system'
+    EMULATED_MICROWAVE_RADIO_SYSTEM = 'emu-microwave-radio-system'
     EMULATED_OPEN_LINE_SYSTEM       = 'emu-open-line-system'
     EMULATED_OPTICAL_ROADM          = 'emu-optical-roadm'
     EMULATED_OPTICAL_TRANSPONDER    = 'emu-optical-transponder'
@@ -28,7 +28,7 @@ class DeviceTypeEnum(Enum):
 
     # Real device types
     DATACENTER                      = 'datacenter'
-    MICROVAWE_RADIO_SYSTEM          = 'microwave-radio-system'
+    MICROWAVE_RADIO_SYSTEM          = 'microwave-radio-system'
     OPEN_LINE_SYSTEM                = 'open-line-system'
     OPTICAL_ROADM                   = 'optical-roadm'
     OPTICAL_TRANSPONDER             = 'optical-transponder'
diff --git a/src/common/tools/object_factory/Device.py b/src/common/tools/object_factory/Device.py
index 4a590134dd7b455c92b62fc5e4aa9fece0f874b4..406af80a82081cb60a3d9fd9c0bcb01ecaa78d30 100644
--- a/src/common/tools/object_factory/Device.py
+++ b/src/common/tools/object_factory/Device.py
@@ -33,8 +33,7 @@ DEVICE_PR_DRIVERS   = [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG]
 DEVICE_TAPI_TYPE    = DeviceTypeEnum.OPEN_LINE_SYSTEM.value
 DEVICE_TAPI_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API]
 
-# check which enum type and value assign to microwave device
-DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM.value
+DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value
 DEVICE_MICROWAVE_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY]
 
 DEVICE_P4_TYPE      = DeviceTypeEnum.P4_SWITCH.value
diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py
index 535b553a81c24ea12c4b9fefc1563541e45f77fa..3a56420c9b222f4cbbc13b78692fd895916aedeb 100644
--- a/src/device/service/drivers/__init__.py
+++ b/src/device/service/drivers/__init__.py
@@ -29,7 +29,7 @@ DRIVERS.append(
         {
             FilterFieldEnum.DEVICE_TYPE: [
                 DeviceTypeEnum.EMULATED_DATACENTER,
-                DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,
+                DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM,
                 DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,
                 DeviceTypeEnum.EMULATED_OPTICAL_ROADM,
                 DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
@@ -38,7 +38,7 @@ DRIVERS.append(
                 DeviceTypeEnum.EMULATED_PACKET_SWITCH,
 
                 #DeviceTypeEnum.DATACENTER,
-                #DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM,
+                #DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM,
                 #DeviceTypeEnum.OPEN_LINE_SYSTEM,
                 #DeviceTypeEnum.OPTICAL_ROADM,
                 #DeviceTypeEnum.OPTICAL_TRANSPONDER,
@@ -54,7 +54,7 @@ DRIVERS.append(
         #    # Emulated devices, all drivers => use Emulated
         #    FilterFieldEnum.DEVICE_TYPE: [
         #        DeviceTypeEnum.EMULATED_DATACENTER,
-        #        DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,
+        #        DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM,
         #        DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,
         #        DeviceTypeEnum.EMULATED_OPTICAL_ROADM,
         #        DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
@@ -111,7 +111,7 @@ if LOAD_ALL_DEVICE_DRIVERS:
     DRIVERS.append(
         (IETFApiDriver, [
             {
-                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM,
+                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM,
                 FilterFieldEnum.DRIVER     : ORM_DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,
             }
         ]))
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py b/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
index 8561ab110ad09b52c3040063241c0cc90dbbb223..332d38fd41793925f2649c591d630de3351d4674 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ConstantsMappings.py
@@ -78,22 +78,26 @@ class DeviceLayerEnum(IntEnum):
     OPTICAL_DEVICE         =  0     # Layer 0 domain device
 
 DEVICE_TYPE_TO_LAYER = {
-    DeviceTypeEnum.EMULATED_DATACENTER.value      : DeviceLayerEnum.APPLICATION_DEVICE,
-    DeviceTypeEnum.DATACENTER.value               : DeviceLayerEnum.APPLICATION_DEVICE,
-
-    DeviceTypeEnum.EMULATED_PACKET_ROUTER.value   : DeviceLayerEnum.PACKET_DEVICE,
-    DeviceTypeEnum.PACKET_ROUTER.value            : DeviceLayerEnum.PACKET_DEVICE,
-    DeviceTypeEnum.EMULATED_PACKET_SWITCH.value   : DeviceLayerEnum.MAC_LAYER_DEVICE,
-    DeviceTypeEnum.PACKET_SWITCH.value            : DeviceLayerEnum.MAC_LAYER_DEVICE,
-    DeviceTypeEnum.P4_SWITCH.value                : DeviceLayerEnum.MAC_LAYER_DEVICE,
-
-    DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM.value   : DeviceLayerEnum.MAC_LAYER_CONTROLLER,
-
-    DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value: DeviceLayerEnum.OPTICAL_CONTROLLER,
-    DeviceTypeEnum.OPEN_LINE_SYSTEM.value         : DeviceLayerEnum.OPTICAL_CONTROLLER,
-
-    DeviceTypeEnum.OPTICAL_ROADM.value            : DeviceLayerEnum.OPTICAL_DEVICE,
-    DeviceTypeEnum.OPTICAL_TRANSPONDER.value      : DeviceLayerEnum.OPTICAL_DEVICE,
+    DeviceTypeEnum.EMULATED_DATACENTER.value             : DeviceLayerEnum.APPLICATION_DEVICE,
+    DeviceTypeEnum.DATACENTER.value                      : DeviceLayerEnum.APPLICATION_DEVICE,
+
+    DeviceTypeEnum.EMULATED_PACKET_ROUTER.value          : DeviceLayerEnum.PACKET_DEVICE,
+    DeviceTypeEnum.PACKET_ROUTER.value                   : DeviceLayerEnum.PACKET_DEVICE,
+    DeviceTypeEnum.EMULATED_PACKET_SWITCH.value          : DeviceLayerEnum.MAC_LAYER_DEVICE,
+    DeviceTypeEnum.PACKET_SWITCH.value                   : DeviceLayerEnum.MAC_LAYER_DEVICE,
+    DeviceTypeEnum.EMULATED_P4_SWITCH.value              : DeviceLayerEnum.MAC_LAYER_DEVICE,
+    DeviceTypeEnum.P4_SWITCH.value                       : DeviceLayerEnum.MAC_LAYER_DEVICE,
+
+    DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM.value : DeviceLayerEnum.MAC_LAYER_CONTROLLER,
+    DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value          : DeviceLayerEnum.MAC_LAYER_CONTROLLER,
+
+    DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value       : DeviceLayerEnum.OPTICAL_CONTROLLER,
+    DeviceTypeEnum.OPEN_LINE_SYSTEM.value                : DeviceLayerEnum.OPTICAL_CONTROLLER,
+
+    DeviceTypeEnum.EMULATED_OPTICAL_ROADM.value          : DeviceLayerEnum.OPTICAL_DEVICE,
+    DeviceTypeEnum.OPTICAL_ROADM.value                   : DeviceLayerEnum.OPTICAL_DEVICE,
+    DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER.value    : DeviceLayerEnum.OPTICAL_DEVICE,
+    DeviceTypeEnum.OPTICAL_TRANSPONDER.value             : DeviceLayerEnum.OPTICAL_DEVICE,
 }
 
 DEVICE_LAYER_TO_SERVICE_TYPE = {