diff --git a/apps.json b/apps.json
index bcf097d9d..c3fbb1ace 100644
--- a/apps.json
+++ b/apps.json
@@ -1570,7 +1570,7 @@
     ]
   },
   {
-    "id": "timer",
+    "id": "simpletimer",
     "name": "Timer",
     "icon": "app.png",
     "version": "0.01",
@@ -1580,11 +1580,11 @@
     "allow_emulator": true,
     "storage": [
       {
-        "name": "timer.app.js",
+        "name": "simpletimer.app.js",
         "url": "app.js"
       },
       {
-        "name": "timer.img",
+        "name": "simpletimer.img",
         "url": "app-icon.js",
         "evaluate": true
       }
diff --git a/apps/timer/ChangeLog b/apps/simpletimer/ChangeLog
similarity index 100%
rename from apps/timer/ChangeLog
rename to apps/simpletimer/ChangeLog
diff --git a/apps/timer/README.md b/apps/simpletimer/README.md
similarity index 100%
rename from apps/timer/README.md
rename to apps/simpletimer/README.md
diff --git a/apps/timer/app-icon.js b/apps/simpletimer/app-icon.js
similarity index 100%
rename from apps/timer/app-icon.js
rename to apps/simpletimer/app-icon.js
diff --git a/apps/timer/app.js b/apps/simpletimer/app.js
similarity index 100%
rename from apps/timer/app.js
rename to apps/simpletimer/app.js
diff --git a/apps/timer/app.png b/apps/simpletimer/app.png
similarity index 100%
rename from apps/timer/app.png
rename to apps/simpletimer/app.png