diff --git a/apps.json b/apps.json
index 89249848b..e2501dbcb 100644
--- a/apps.json
+++ b/apps.json
@@ -5007,19 +5007,19 @@
   {
     "id": "pebbled",
     "name": "Pebble Clock with distance",
-    "shortName": "Pebble with distance",
+    "shortName": "Pebble + distance",
     "version": "0.02",
-    "description": "Fork of pebble clock with distance in KM. See step count and the distance together. Default step length = 0.75m (can be changed in settings).",
+    "description": "Fork of Pebble Clock with distance in KM. Both step count and the distance are on the main screen. Default step length = 0.75m (can be changed in settings).",
     "readme": "README.md",
-    "icon": "pebble.png",
+    "icon": "pebbled.png",
     "screenshots": [{"url":"pebble_screenshot.png"}],
     "type": "clock",
     "tags": "clock,distance",
     "supports": ["BANGLEJS2"],
     "storage": [
-      {"name":"pebble.app.js","url":"pebble.app.js"},
-      {"name":"pebble.settings.js","url":"pebble.settings.js"},
-      {"name":"pebble.img","url":"pebble.icon.js","evaluate":true}
+      {"name":"pebbled.app.js","url":"pebbled.app.js"},
+      {"name":"pebbled.settings.js","url":"pebbled.settings.js"},
+      {"name":"pebbled.img","url":"pebbled.icon.js","evaluate":true}
     ]
   }
 ]
diff --git a/apps/pebbled/README.md b/apps/pebbled/README.md
index 7f34aa3c4..7b393d0fc 100644
--- a/apps/pebbled/README.md
+++ b/apps/pebbled/README.md
@@ -7,4 +7,9 @@
 ![](pebble_screenshot.png)
 
 Written by: [Hugh Barney](https://github.com/hughbarney)  For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
+
 Forked and changed by [RomanistHere](https://github.com/RomanistHere)
+
+## Plans
+
+Make step length depend on height/sex/age.
diff --git a/apps/pebbled/pebble.app.js b/apps/pebbled/pebbled.app.js
similarity index 96%
rename from apps/pebbled/pebble.app.js
rename to apps/pebbled/pebbled.app.js
index 9caee62c9..14cc9e398 100644
--- a/apps/pebbled/pebble.app.js
+++ b/apps/pebbled/pebbled.app.js
@@ -8,7 +8,7 @@ Graphics.prototype.setFontLECO1976Regular22 = function(scale) {
   g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22+(scale<<8)+(1<<16));
 };
 
-const SETTINGS_FILE = "pbd.json";
+const SETTINGS_FILE = "pebbleDistance.json";
 let settings;
 
 function loadSettings() {
@@ -23,22 +23,22 @@ const ha = 2*h/5 - 11;
 const h2 = 3*h/5 - 19;
 const h3 = 7*h/8 - 10;
 
-let batWarn = false;
+let batteryWarning = false;
 
 function draw() {
   let date = new Date();
   let da = date.toString().split(" ");
   let timeStr = da[4].substr(0,5);
   const t = 6;
-  const stp = getSteps();
+  const stps = getSteps();
 
   // turn the warning on once we have dipped below 15%
   if (E.getBattery() < 15)
-    batWarn = true;
+    batteryWarning = true;
 
   // turn the warning off once we have dipped above 20%
   if (E.getBattery() > 20)
-    batWarn = false;
+    batteryWarning = false;
 
   g.reset();
   g.setColor(settings.bg);
@@ -57,16 +57,16 @@ function draw() {
   g.setFontLECO1976Regular22();
   g.setFontAlign(0, -1);
   g.drawString(da[0].toUpperCase(), w/4, ha); // day of week
-  g.drawString(stp, 3*w/4, ha);
+  g.drawString(stps, 3*w/4, ha);
 
   // time
   // white on red for battery warning
-  g.setColor(!batWarn ? g.theme.bg : '#f00');
+  g.setColor(!batteryWarning ? g.theme.bg : '#f00');
   g.fillRect(0, h2, w, h3);
 
   g.setFontLECO1976Regular42();
   g.setFontAlign(0, -1);
-  g.setColor(!batWarn ? g.theme.fg : '#fff');
+  g.setColor(!batteryWarning ? g.theme.fg : '#fff');
   g.drawString(timeStr, w/2, h2 + 8);
 
   // contrast bar
@@ -80,7 +80,7 @@ function draw() {
   g.setColor(settings.bg);
   g.drawImage(img, w/2 + ((w/2) - 64)/2, -2, { scale: 1 });
   drawCalendar(((w/2) - 42)/2, 11, 42, 4, da[2]);
-  g.drawString((stp / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107);
+  g.drawString((stps / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107);
 }
 
 // at x,y width:wi thicknes:th
diff --git a/apps/pebbled/pebble.icon.js b/apps/pebbled/pebbled.icon.js
similarity index 100%
rename from apps/pebbled/pebble.icon.js
rename to apps/pebbled/pebbled.icon.js
diff --git a/apps/pebbled/pebble.png b/apps/pebbled/pebbled.png
similarity index 100%
rename from apps/pebbled/pebble.png
rename to apps/pebbled/pebbled.png
diff --git a/apps/pebbled/pebble.settings.js b/apps/pebbled/pebbled.settings.js
similarity index 96%
rename from apps/pebbled/pebble.settings.js
rename to apps/pebbled/pebbled.settings.js
index ea1845e57..3d82f0700 100644
--- a/apps/pebbled/pebble.settings.js
+++ b/apps/pebbled/pebbled.settings.js
@@ -1,5 +1,5 @@
 (function(back) {
-    const SETTINGS_FILE = "pbd.json";
+    const SETTINGS_FILE = "pebbleDistance.json";
 
     // initialize with default settings...
     let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};