diff --git a/src/_EMR/mqtt.sh b/src/_EMR/mqtt.sh
index b4fc580..e704fc7 100644
--- a/src/_EMR/mqtt.sh
+++ b/src/_EMR/mqtt.sh
@@ -4,10 +4,10 @@
 ROOT_PATH="/srv/hestia"
 EMR_FOLDER="src/_EMR"
 MQTT_HOST="192.168.0.12"
-IGN_TOPIC="hestia/v2/igniter"
-EXH_TOPIC="hestia/v2/exhaust"
-AUG_TOPIC="hestia/v2/auger"
-FR_TOPIC="hestia/v2/feed-rate"
+IGN_TOPIC="hestia/emr/igniter"
+EXH_TOPIC="hestia/emr/exhaust"
+AUG_TOPIC="hestia/emr/auger"
+FR_TOPIC="hestia/emr/feed-rate"
 
 # Loop
 while true; do
diff --git a/src/custom_modules/HestiaClasses.js b/src/custom_modules/HestiaClasses.js
index f815a23..6d55903 100644
--- a/src/custom_modules/HestiaClasses.js
+++ b/src/custom_modules/HestiaClasses.js
@@ -73,20 +73,20 @@ module.exports = {
                 topic: config.mqtt.topics.startup
             };
 
-            this.v2igniter = {
-                topic: config.mqtt.topics.v2igniter
+            this.emrIgniter = {
+                topic: config.mqtt.topics.emrIgniter
             };
 
-            this.v2exhaust = {
-                topic: config.mqtt.topics.v2exhaust
+            this.emrExhaust = {
+                topic: config.mqtt.topics.emrExhaust
             };
 
-            this.v2auger = {
-                topic: config.mqtt.topics.v2auger
+            this.emrAuger = {
+                topic: config.mqtt.topics.emrAuger
             };
 
-            this.v2feedRate = {
-                topic: config.mqtt.topics.v2feedRate
+            this.emrFeedRate = {
+                topic: config.mqtt.topics.emrFeedRate
             };
 
             this.shutdown = {
diff --git a/src/custom_modules/config.json b/src/custom_modules/config.json
index 02ae94d..659296d 100644
--- a/src/custom_modules/config.json
+++ b/src/custom_modules/config.json
@@ -8,10 +8,10 @@
             "vacuum": "hestia/status/vacuum",
             "startup": "hestia/command/startup",
             "shutdown": "hestia/command/shutdown",
-            "v2igniter": "hestia/v2/igniter",
-            "v2exhaust": "hestia/v2/exhaust",
-            "v2auger": "hestia/v2/auger",
-            "v2feedRate": "hestia/v2/feed-rate"
+            "emrIgniter": "hestia/emr/igniter",
+            "emrExhaust": "hestia/emr/exhaust",
+            "emrAuger": "hestia/emr/auger",
+            "emrFeedRate": "hestia/emr/feed-rate"
         }
     },
     "states": {
@@ -21,10 +21,10 @@
             "auger",
             "pof",
             "vacuum",
-            "v2igniter",
-            "v2exhaust",
-            "v2auger",
-            "v2feedRate"
+            "emrIgniter",
+            "emrExhaust",
+            "emrAuger",
+            "emrFeedRate"
         ]
     },
     "pins": [