diff --git a/apps/gpsmagdir/README.md b/apps/gpsmagcourse/README.md
similarity index 100%
rename from apps/gpsmagdir/README.md
rename to apps/gpsmagcourse/README.md
diff --git a/apps/gpsmagdir/app.png b/apps/gpsmagcourse/app.png
similarity index 100%
rename from apps/gpsmagdir/app.png
rename to apps/gpsmagcourse/app.png
diff --git a/apps/gpsmagdir/boot.js b/apps/gpsmagcourse/boot.js
similarity index 96%
rename from apps/gpsmagdir/boot.js
rename to apps/gpsmagcourse/boot.js
index 2195a8424..189dd9e35 100644
--- a/apps/gpsmagdir/boot.js
+++ b/apps/gpsmagcourse/boot.js
@@ -4,7 +4,7 @@
     compassSrc: 1, // [off, built-in, magnav]
     resetCompassOnPwr: true, // reset compass on power on
     tiltCompensation: true, // tilt compensation on built-in compass
-  }, require("Storage").readJSON("gpsmagdir.json", true) || {});
+  }, require("Storage").readJSON("gpsmagcourse.json", true) || {});
   const CALIBDATA = (settings.compassSrc === 2) ? require("Storage").readJSON("magnav.json",1) : undefined;
 
   // Check if magnav is installed
@@ -91,7 +91,7 @@
     const origSetGPSPower = Bangle.setGPSPower;
     Bangle.setGPSPower = function(on, id) {
       const isGPSon = origSetGPSPower(on, id);
-      Bangle.setCompassPower(isGPSon, "gpsmagdir");
+      Bangle.setCompassPower(isGPSon, "gpsmagcourse");
       return isGPSon;
     };
   } // if (settings.compassSrc > 0)
diff --git a/apps/gpsmagdir/metadata.json b/apps/gpsmagcourse/metadata.json
similarity index 64%
rename from apps/gpsmagdir/metadata.json
rename to apps/gpsmagcourse/metadata.json
index f83f1ee90..2dcc27384 100644
--- a/apps/gpsmagdir/metadata.json
+++ b/apps/gpsmagcourse/metadata.json
@@ -1,7 +1,7 @@
 {
-  "id": "gpsmagdir",
+  "id": "gpsmagcourse",
   "name": "GPS Compass heading switcher",
-  "shortName":"GPS/Compass direction",
+  "shortName":"GPS/Comp. course",
   "icon": "app.png",
   "version":"0.01",
   "description": "Replace GPS heading with compass heading when speed is slow or standing still to avoid the heading from jumping around randomly.",
@@ -10,9 +10,9 @@
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name":"gpsmagdir.boot.js","url":"boot.js"},
-    {"name":"gpsmagdir.wid.js","url":"widget.js"}
+    {"name":"gpsmagcourse.boot.js","url":"boot.js"},
+    {"name":"gpsmagcourse.wid.js","url":"widget.js"}
   ],
-  "data": [{"name":"gpsmagdir.json"}]
+  "data": [{"name":"gpsmagcourse.json"}]
 }
 
diff --git a/apps/gpsmagdir/widget.js b/apps/gpsmagcourse/widget.js
similarity index 70%
rename from apps/gpsmagdir/widget.js
rename to apps/gpsmagcourse/widget.js
index cf3c9c60c..0df33755d 100644
--- a/apps/gpsmagdir/widget.js
+++ b/apps/gpsmagcourse/widget.js
@@ -2,7 +2,7 @@
   const settings = Object.assign({
     compassSrc: 1, // 0 = off
     showWidget: 2, // 0 = never, 1 = when replacing GPS course with compass course, 2 = when GPS is on
-  }, require("Storage").readJSON("gpsmagdir.json", true) || {});
+  }, require("Storage").readJSON("gpsmagcourse.json", true) || {});
 
   function isInside(rect, e) {
     return e.x>=rect.x && e.x<rect.x+rect.w
@@ -37,7 +37,7 @@
 
   if (settings.compassSrc > 0 && settings.showWidget > 0) {
     // add your widget
-    WIDGETS.gpsmagdir={
+    WIDGETS.gpsmagcourse={
       area:"tr", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
       width: 0, // hide by default
       draw:draw,
@@ -46,12 +46,12 @@
 
     // show only when GPS course is replaced
     Bangle.on('GPS', function(gps) {
-      if (gps.courseOrig && WIDGETS.gpsmagdir.show !== 1 && Bangle.isGPSOn()) {
-        WIDGETS.gpsmagdir.show = 1;
-        WIDGETS.gpsmagdir.draw();
-      } else if (WIDGETS.gpsmagdir.show) {
-        WIDGETS.gpsmagdir.show = settings.showWidget === 1 ? 0 : 2;
-        WIDGETS.gpsmagdir.draw();
+      if (gps.courseOrig && WIDGETS.gpsmagcourse.show !== 1 && Bangle.isGPSOn()) {
+        WIDGETS.gpsmagcourse.show = 1;
+        WIDGETS.gpsmagcourse.draw();
+      } else if (WIDGETS.gpsmagcourse.show) {
+        WIDGETS.gpsmagcourse.show = settings.showWidget === 1 ? 0 : 2;
+        WIDGETS.gpsmagcourse.draw();
       }
     });
 
@@ -59,19 +59,19 @@
     const origSetGPSPower = Bangle.setGPSPower;
     Bangle.setGPSPower = function(on, id) {
       const isGPSon = origSetGPSPower(on, id);
-      if (!isGPSon && WIDGETS.gpsmagdir.show) {
-        WIDGETS.gpsmagdir.show = 0;
-        WIDGETS.gpsmagdir.draw();
-      } else if (isGPSon && !WIDGETS.gpsmagdir.show) {
-        WIDGETS.gpsmagdir.show = 2;
-        WIDGETS.gpsmagdir.draw();
+      if (!isGPSon && WIDGETS.gpsmagcourse.show) {
+        WIDGETS.gpsmagcourse.show = 0;
+        WIDGETS.gpsmagcourse.draw();
+      } else if (isGPSon && !WIDGETS.gpsmagcourse.show) {
+        WIDGETS.gpsmagcourse.show = 2;
+        WIDGETS.gpsmagcourse.draw();
       }
       return isGPSon;
     };
 
     // reset compass on click on widget
     Bangle.on('touch', function(button, touch) {
-      if (WIDGETS.gpsmagdir && WIDGETS.gpsmagdir.x && WIDGETS.gpsmagdir.width && isInside({x: WIDGETS.gpsmagdir.x, y: WIDGETS.gpsmagdir.y, w: WIDGETS.gpsmagdir.width, h: 24}, touch)) {
+      if (WIDGETS.gpsmagcourse && WIDGETS.gpsmagcourse.x && WIDGETS.gpsmagcourse.width && isInside({x: WIDGETS.gpsmagcourse.x, y: WIDGETS.gpsmagcourse.y, w: WIDGETS.gpsmagcourse.width, h: 24}, touch)) {
         Bangle.buzz(50);
         Bangle.resetCompass();
       }