diff --git a/apps/terminal_clock/metadata.json b/apps/terminal_clock/metadata.json
deleted file mode 100644
index 4e957edce..000000000
--- a/apps/terminal_clock/metadata.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{ "id": "terminal_clock",
-  "name": "Terminal Clock",
-  "shortName":"Terminal Clock",
-  "icon": "icon.png",
-  "version":"0.01",
-  "type": "clock",
-  "supports": ["BANGLEJS","BANGLEJS2"],
-  "description": "A terminal clock displaying multiple informations",
-  "storage": [
-    {"name": "terminal_clock.app.js","url": "app.js"},
-    {"name": "terminal_clock.settings.js", "url": "settings.js"},
-    {"name": "terminal_clock.img","url": "app-icon.js","evaluate": true}
-  ],
-  "data": [
-    {"name": "terminal_clock.json"},
-  ],
-  "screenshots": [
-    {"url": "screenshot1.png"},
-    {"url": "screenshot2.png"}
-   ]
-}
diff --git a/apps/terminal_clock/ChangeLog b/apps/terminalclock/ChangeLog
similarity index 100%
rename from apps/terminal_clock/ChangeLog
rename to apps/terminalclock/ChangeLog
diff --git a/apps/terminal_clock/README.md b/apps/terminalclock/README.md
similarity index 100%
rename from apps/terminal_clock/README.md
rename to apps/terminalclock/README.md
diff --git a/apps/terminal_clock/app-icon.js b/apps/terminalclock/app-icon.js
similarity index 100%
rename from apps/terminal_clock/app-icon.js
rename to apps/terminalclock/app-icon.js
diff --git a/apps/terminal_clock/app.js b/apps/terminalclock/app.js
similarity index 97%
rename from apps/terminal_clock/app.js
rename to apps/terminalclock/app.js
index 2ce4dda99..8729deace 100644
--- a/apps/terminal_clock/app.js
+++ b/apps/terminalclock/app.js
@@ -128,7 +128,7 @@ var settings = Object.assign({
   showHRM: "Yes",
   showActivity: "Yes",
   showStepCount: "Yes",
-}, require('Storage').readJSON("terminal_clock.json", true) || {});
+}, require('Storage').readJSON("terminalclock.json", true) || {});
 // draw immediately at first
 draw();
 // Show launcher when middle button pressed
diff --git a/apps/terminal_clock/icon.png b/apps/terminalclock/app.png
similarity index 100%
rename from apps/terminal_clock/icon.png
rename to apps/terminalclock/app.png
diff --git a/apps/terminalclock/metadata.json b/apps/terminalclock/metadata.json
new file mode 100644
index 000000000..4a5948159
--- /dev/null
+++ b/apps/terminalclock/metadata.json
@@ -0,0 +1,24 @@
+{ 
+  "id": "terminalclock",
+  "name": "Terminal Clock",
+  "shortName":"TerminalClock",
+  "icon": "app.png",
+  "version":"0.01",
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "description": "A terminal cli like clock displaying multiple sensor data",
+  "readme": "README.md",
+  "storage": [
+    {"name": "terminalclock.app.js","url": "app.js"},
+    {"name": "terminalclock.settings.js","url": "settings.js"},
+    {"name": "terminalclock.img","url": "app-icon.js","evaluate": true}
+  ],
+  "data": [
+    {"name": "terminalclock.json"},
+  ],
+  "screenshots": [
+    {"url": "screenshot1.png"},
+    {"url": "screenshot2.png"}
+   ]
+}
diff --git a/apps/terminal_clock/screenshot1.png b/apps/terminalclock/screenshot1.png
similarity index 100%
rename from apps/terminal_clock/screenshot1.png
rename to apps/terminalclock/screenshot1.png
diff --git a/apps/terminal_clock/screenshot2.png b/apps/terminalclock/screenshot2.png
similarity index 100%
rename from apps/terminal_clock/screenshot2.png
rename to apps/terminalclock/screenshot2.png
diff --git a/apps/terminal_clock/settings.js b/apps/terminalclock/settings.js
similarity index 97%
rename from apps/terminal_clock/settings.js
rename to apps/terminalclock/settings.js
index 8f6aa9467..b4fa1a464 100644
--- a/apps/terminal_clock/settings.js
+++ b/apps/terminalclock/settings.js
@@ -1,5 +1,5 @@
 (function(back) {
-  var FILE = "terminal_clock.json";
+  var FILE = "terminalclock.json";
   // Load settings
   var settings = Object.assign({
     HRMinConfidence: 40,