diff --git a/car-mode-switches-skill/__init__.py b/car-mode-switches-skill/__init__.py
index 49b56af..b235d1f 100644
--- a/car-mode-switches-skill/__init__.py
+++ b/car-mode-switches-skill/__init__.py
@@ -15,19 +15,19 @@ class CarModeSwitches(MycroftSkill):
         MycroftSkill.__init__(self)
 
     @intent_file_handler('switches.mode.pet.intent')
-    def handle_switches_mode_car(self, message):
+    def pet_mode(self, message):
         url = self.settings.get("OSD_API", "http://localhost:5050/send")
         emit(url, "switchPlugin", {"plugin": "petMode"})
         self.speak_dialog('switches.mode.pet')
 
     @intent_file_handler('switches.mode.smart_home.intent')
-    def handle_switches_mode_car(self, message):
+    def smart_home(self, message):
         url = self.settings.get("OSD_API", "http://localhost:5050/send")
         emit(url, "switchPlugin", {"plugin": "smartHome"})
         self.speak_dialog('switches.mode.smart_home')
 
     @intent_file_handler('switches.mode.maps.intent')
-    def handle_switches_mode_car(self, message):
+    def maps(self, message):
         url = self.settings.get("OSD_API", "http://localhost:5050/send")
         emit(url, "switchPlugin", {"plugin": "maps"})
         self.speak_dialog('switches.mode.maps')