diff --git a/src/extension-support/extension-manager.js b/src/extension-support/extension-manager.js
index 11b6f336..50f11dcd 100644
--- a/src/extension-support/extension-manager.js
+++ b/src/extension-support/extension-manager.js
@@ -17,7 +17,7 @@ const Scratch3VideoSensingBlocks = require('../extensions/scratch3_video_sensing
 const Scratch3Speech2TextBlocks = require('../extensions/scratch3_speech2text');
 const Scratch3Ev3Blocks = require('../extensions/scratch3_ev3');
 const Scratch3MakeyMakeyBlocks = require('../extensions/scratch3_makeymakey');
-const Scratch3GoForceBlocks = require('../extensions/scratch3_goforce');
+const Scratch3GdxForBlocks = require('../extensions/scratch3_gdx_for');
 
 const builtinExtensions = {
     pen: Scratch3PenBlocks,
@@ -30,7 +30,7 @@ const builtinExtensions = {
     speech2text: Scratch3Speech2TextBlocks,
     ev3: Scratch3Ev3Blocks,
     makeymakey: Scratch3MakeyMakeyBlocks,
-    goforce: Scratch3GoForceBlocks
+    gdxfor: Scratch3GdxForBlocks
 };
 
 /**
diff --git a/src/extensions/scratch3_goforce/index.js b/src/extensions/scratch3_gdx_for/index.js
similarity index 94%
rename from src/extensions/scratch3_goforce/index.js
rename to src/extensions/scratch3_gdx_for/index.js
index d858a7bb..8cb75627 100644
--- a/src/extensions/scratch3_goforce/index.js
+++ b/src/extensions/scratch3_gdx_for/index.js
@@ -19,26 +19,26 @@ const DirectionOptionsMenu = ['x', 'y', 'z'];
 
 
 /**
- * Scratch 3.0 blocks to interact with a GoForce peripheral.
+ * Scratch 3.0 blocks to interact with a GDX-FOR peripheral.
  */
-class Scratch3GoForceBlocks {
+class Scratch3GdxForBlocks {
 
     /**
      * @return {string} - the name of this extension.
      */
     static get EXTENSION_NAME () {
-        return 'Go! Force';
+        return 'GDX-FOR';
     }
 
     /**
      * @return {string} - the ID of this extension.
      */
     static get EXTENSION_ID () {
-        return 'goforce';
+        return 'gdxfor';
     }
 
     /**
-     * Construct a set of GoForce blocks.
+     * Construct a set of GDX-FOR blocks.
      * @param {Runtime} runtime - the Scratch 3.0 runtime.
      */
     constructor (runtime) {
@@ -54,15 +54,15 @@ class Scratch3GoForceBlocks {
      */
     getInfo () {
         return {
-            id: Scratch3GoForceBlocks.EXTENSION_ID,
-            name: Scratch3GoForceBlocks.EXTENSION_NAME,
+            id: Scratch3GdxForBlocks.EXTENSION_ID,
+            name: Scratch3GdxForBlocks.EXTENSION_NAME,
             blockIconURI: blockIconURI,
             showStatusButton: true,
             blocks: [
                 {
                     opcode: 'whenAccelerationCompare',
                     text: formatMessage({
-                        id: 'goforce.whenAccelerationCompare',
+                        id: 'gdxfor.whenAccelerationCompare',
                         default: 'when acceleration [DIRECTION] [COMPARE] [VALUE] m/s\u{00B2}',
                         description: 'when the value measured by the acceleration sensor is compared to some value'
                     }),
@@ -87,7 +87,7 @@ class Scratch3GoForceBlocks {
                 {
                     opcode: 'whenAngularSpeedCompare',
                     text: formatMessage({
-                        id: 'goforce.whenAngularSpeedCompare',
+                        id: 'gdxfor.whenAngularSpeedCompare',
                         default: 'when angular speed [DIRECTION] [COMPARE] [VALUE] rad/s',
                         description: 'when the value measured by the gyroscope sensor is compared to some value'
                     }),
@@ -112,7 +112,7 @@ class Scratch3GoForceBlocks {
                 {
                     opcode: 'whenForceCompare',
                     text: formatMessage({
-                        id: 'goforce.whenForceCompare',
+                        id: 'gdxfor.whenForceCompare',
                         default: 'when force [COMPARE] [VALUE] N',
                         description: 'when the value measured by the force sensor is compared to some value'
                     }),
@@ -132,7 +132,7 @@ class Scratch3GoForceBlocks {
                 {
                     opcode: 'getAcceleration',
                     text: formatMessage({
-                        id: 'goforce.getAcceleration',
+                        id: 'gdxfor.getAcceleration',
                         default: 'acceleration [DIRECTION]',
                         description: 'gets acceleration'
                     }),
@@ -148,7 +148,7 @@ class Scratch3GoForceBlocks {
                 {
                     opcode: 'getAngularSpeed',
                     text: formatMessage({
-                        id: 'goforce.getAngularSpeed',
+                        id: 'gdxfor.getAngularSpeed',
                         default: 'angular speed [DIRECTION]',
                         description: 'gets tilt'
                     }),
@@ -164,7 +164,7 @@ class Scratch3GoForceBlocks {
                 {
                     opcode: 'getForce',
                     text: formatMessage({
-                        id: 'goforce.getForce',
+                        id: 'gdxfor.getForce',
                         default: 'force',
                         description: 'gets force'
                     }),
@@ -228,4 +228,4 @@ class Scratch3GoForceBlocks {
     }
 }
 
-module.exports = Scratch3GoForceBlocks;
+module.exports = Scratch3GdxForBlocks;