diff --git a/apps.json b/apps.json
index c18228e70..657f93469 100644
--- a/apps.json
+++ b/apps.json
@@ -1170,8 +1170,8 @@
     "storage": [
       {"name":"smartswitch.app.js","url":"app.js"},
       {"name":"smartswitch.img","url":"app-icon.js","evaluate":true},
-      {"name":"smartswitch-on.img","url":"smartswitch-on.js","evaluate":true},
-      {"name":"smartswitch-off.img","url":"smartswitch-off.js","evaluate":true},
+      {"name":"switch-on.img","url":"switch-on.js","evaluate":true},
+      {"name":"switch-off.img","url":"switch-off.js","evaluate":true},
       {"name":"light-on.img","url":"light-on.js","evaluate":true},
       {"name":"light-off.img","url":"light-off.js","evaluate":true}
     ]
diff --git a/apps/smartswitch/smartswitch.app.js b/apps/smartswitch/smartswitch.app.js
index 90e0a82a8..ebfa5768a 100644
--- a/apps/smartswitch/smartswitch.app.js
+++ b/apps/smartswitch/smartswitch.app.js
@@ -21,7 +21,7 @@ let pages = [
   },
   {
     name: "Upstairs",
-    icon: "smartswitch",
+    icon: "switch",
     state: false
   }];
 
diff --git a/apps/smartswitch/smartswitch-off.js b/apps/smartswitch/switch-off.js
similarity index 100%
rename from apps/smartswitch/smartswitch-off.js
rename to apps/smartswitch/switch-off.js
diff --git a/apps/smartswitch/smartswitch-on.js b/apps/smartswitch/switch-on.js
similarity index 100%
rename from apps/smartswitch/smartswitch-on.js
rename to apps/smartswitch/switch-on.js