diff --git a/car_srv/kotlinSrv/src/control/emulator/ControllerEmulator.kt b/car_srv/kotlinSrv/src/control/emulator/ControllerEmulator.kt
index e65ff0eb85d..33169653f8c 100644
--- a/car_srv/kotlinSrv/src/control/emulator/ControllerEmulator.kt
+++ b/car_srv/kotlinSrv/src/control/emulator/ControllerEmulator.kt
@@ -17,8 +17,8 @@ class ControllerEmulator : Controller {
     }
 
     override fun executeRoute(route: RouteRequest) {
-        val moveTimes = route.moveTime
-        val moveDirections = route.moveDirection
+        val moveTimes = route.times
+        val moveDirections = route.directions
         //list of move direction and time to this move in ms
         val commands: MutableList<Pair<MoveDirection, Int>> = mutableListOf()
 
diff --git a/server/src/main/java/DebugClInterface.kt b/server/src/main/java/DebugClInterface.kt
index 0f592b829f4..b2c75c8c93d 100644
--- a/server/src/main/java/DebugClInterface.kt
+++ b/server/src/main/java/DebugClInterface.kt
@@ -139,17 +139,17 @@ class DebugClInterface {
                     continue
                 }
                 val paramType = params[2]//maybe string or int
-                val type: DebugRequest.TYPE
+                val type: DebugRequest.Type
                 try {
-                    type = DebugRequest.TYPE.fromIntToTYPE(paramType.toInt())
+                    type = DebugRequest.Type.fromIntToType(paramType.toInt())
                 } catch (e: NumberFormatException) {
                     try {
-                        type = DebugRequest.TYPE.valueOf(paramType)
+                        type = DebugRequest.Type.valueOf(paramType)
                     } catch (e: IllegalArgumentException) {
-                        type = DebugRequest.TYPE.Unexpected
+                        type = DebugRequest.Type.Unexpected
                     }
                 }
-                if (type == DebugRequest.TYPE.Unexpected) {
+                if (type == DebugRequest.Type.Unexpected) {
                     println("type with name/id $paramType not found")
                     continue
                 }