diff --git a/core/dragon_engine.py b/core/dragon_engine.py
new file mode 100644
index 0000000000..1058dc7096
--- /dev/null
+++ b/core/dragon_engine.py
@@ -0,0 +1,22 @@
+from talon import Module, speech_system
+
+mod = Module()
+
+
+@mod.action_class
+class Actions:
+    def dragon_engine_sleep():
+        """Sleep the dragon engine"""
+        speech_system.engine_mimic("go to sleep"),
+
+    def dragon_engine_wake():
+        """Wake the dragon engine"""
+        speech_system.engine_mimic("wake up"),
+
+    def dragon_engine_command_mode():
+        """Switch dragon to command mode. Requires Pro."""
+        speech_system.engine_mimic("switch to command mode")
+
+    def dragon_engine_normal_mode():
+        """Switch dragon to normal mode. Requires Pro."""
+        speech_system.engine_mimic("start normal mode")
diff --git a/core/engine.py b/core/engine.py
deleted file mode 100644
index eea51ccf8f..0000000000
--- a/core/engine.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from talon import Module, speech_system
-
-mod = Module()
-
-
-@mod.action_class
-class Actions:
-    def engine_sleep():
-        """Sleep the engine"""
-        speech_system.engine_mimic("go to sleep"),
-
-    def engine_wake():
-        """Wake the engine"""
-        speech_system.engine_mimic("wake up"),
-
-    def engine_mimic(cmd: str):
-        """Sends phrase to engine"""
-        speech_system.engine_mimic(cmd)
diff --git a/core/modes/modes.py b/core/modes/modes.py
index b141a36854..60771afa30 100644
--- a/core/modes/modes.py
+++ b/core/modes/modes.py
@@ -45,11 +45,11 @@ def talon_mode():
         # app.notify(engine)
         if "dragon" in engine:
             if app.platform == "mac":
-                actions.user.engine_sleep()
+                actions.user.dragon_engine_sleep()
             elif app.platform == "windows":
-                actions.user.engine_wake()
+                actions.user.dragon_engine_wake()
                 # note: this may not do anything for all versions of Dragon. Requires Pro.
-                actions.user.engine_mimic("switch to command mode")
+                actions.user.dragon_engine_command_mode()
 
     def dragon_mode():
         """For windows and Mac with Dragon, disables Talon commands and exits Dragon's command mode"""
@@ -60,8 +60,8 @@ def dragon_mode():
             # app.notify("dragon mode")
             actions.speech.disable()
             if app.platform == "mac":
-                actions.user.engine_wake()
+                actions.user.dragon_engine_wake()
             elif app.platform == "windows":
-                actions.user.engine_wake()
+                actions.user.dragon_engine_wake()
                 # note: this may not do anything for all versions of Dragon. Requires Pro.
-                actions.user.engine_mimic("start normal mode")
+                actions.user.dragon_engine_normal_mode()
diff --git a/core/modes/modes_dragon.talon b/core/modes/modes_dragon.talon
index c05a518108..118c21a2f7 100644
--- a/core/modes/modes_dragon.talon
+++ b/core/modes/modes_dragon.talon
@@ -23,4 +23,4 @@ speech.engine: dragon
     user.help_hide()
     user.mouse_sleep()
     speech.disable()
-    user.engine_sleep()
+    user.dragon_engine_sleep()