diff --git a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
index b9ee9956f..39b680e61 100644
--- a/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.Extensions.xml
@@ -71,14 +71,14 @@
             <listitem><para>
               The state the extension is in:
               <simplelist>
-                <member>1: ENABLED</member>
-                <member>2: DISABLED</member>
+                <member>1: ACTIVE</member>
+                <member>2: INACTIVE</member>
                 <member>3: ERROR</member>
                 <member>4: OUT_OF_DATE</member>
                 <member>5: DOWNLOADING</member>
                 <member>6: INITIALIZED</member>
-                <member>7: DISABLING</member>
-                <member>8: ENABLING</member>
+                <member>7: DEACTIVATING</member>
+                <member>8: ACTIVATING</member>
                 <member>99: UNINSTALLED</member>
               </simplelist>
             </para></listitem>
diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 682099e60..2b7720abc 100644
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -13,14 +13,14 @@ export const ExtensionType = {
  * @enum {number}
  */
 export const ExtensionState = {
-    ENABLED: 1,
-    DISABLED: 2,
+    ACTIVE: 1,
+    INACTIVE: 2,
     ERROR: 3,
     OUT_OF_DATE: 4,
     DOWNLOADING: 5,
     INITIALIZED: 6,
-    DISABLING: 7,
-    ENABLING: 8,
+    DEACTIVATING: 7,
+    ACTIVATING: 8,
 
     // Used as an error state for operations on unknown extensions,
     // should never be in a real extensionMeta object.
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index ca6c9180d..55b1e1133 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -119,8 +119,8 @@ export class ExtensionManager extends Signals.EventEmitter {
     }
 
     _loadExtensionStylesheet(extension) {
-        if (extension.state !== ExtensionState.ENABLED &&
-            extension.state !== ExtensionState.ENABLING)
+        if (extension.state !== ExtensionState.ACTIVE &&
+            extension.state !== ExtensionState.ACTIVATING)
             return;
 
         const variant = Main.getStyleVariant();
@@ -182,10 +182,10 @@ export class ExtensionManager extends Signals.EventEmitter {
         if (!extension)
             return;
 
-        if (extension.state !== ExtensionState.ENABLED)
+        if (extension.state !== ExtensionState.ACTIVE)
             return;
 
-        this._changeExtensionState(extension, ExtensionState.DISABLING);
+        this._changeExtensionState(extension, ExtensionState.DEACTIVATING);
 
         // "Rebase" the extension order by disabling and then enabling extensions
         // in order to help prevent conflicts.
@@ -231,7 +231,7 @@ export class ExtensionManager extends Signals.EventEmitter {
         this._extensionOrder.splice(orderIdx, 1);
 
         if (extension.state !== ExtensionState.ERROR)
-            this._changeExtensionState(extension, ExtensionState.DISABLED);
+            this._changeExtensionState(extension, ExtensionState.INACTIVE);
     }
 
     async _callExtensionEnable(uuid) {
@@ -246,10 +246,10 @@ export class ExtensionManager extends Signals.EventEmitter {
             await this._callExtensionInit(uuid);
 
 
-        if (extension.state !== ExtensionState.DISABLED)
+        if (extension.state !== ExtensionState.INACTIVE)
             return;
 
-        this._changeExtensionState(extension, ExtensionState.ENABLING);
+        this._changeExtensionState(extension, ExtensionState.ACTIVATING);
 
         try {
             this._loadExtensionStylesheet(extension);
@@ -260,7 +260,7 @@ export class ExtensionManager extends Signals.EventEmitter {
 
         try {
             await extension.stateObj.enable();
-            this._changeExtensionState(extension, ExtensionState.ENABLED);
+            this._changeExtensionState(extension, ExtensionState.ACTIVE);
             this._extensionOrder.push(uuid);
         } catch (e) {
             this._unloadExtensionStylesheet(extension);
@@ -469,7 +469,7 @@ export class ExtensionManager extends Signals.EventEmitter {
                 if (!await this._callExtensionInit(uuid))
                     return;
 
-                if (extension.state === ExtensionState.DISABLED)
+                if (extension.state === ExtensionState.INACTIVE)
                     await this._callExtensionEnable(uuid);
             } else {
                 extension.state = ExtensionState.INITIALIZED;
@@ -560,7 +560,7 @@ export class ExtensionManager extends Signals.EventEmitter {
         }
 
         extension.stateObj = extensionState;
-        this._changeExtensionState(extension, ExtensionState.DISABLED);
+        this._changeExtensionState(extension, ExtensionState.INACTIVE);
         return true;
     }
 
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index ff44c2728..9f5575f75 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -801,21 +801,21 @@ const Extensions = GObject.registerClass({
 
     _stateToString(extensionState) {
         switch (extensionState) {
-        case ExtensionState.ENABLED:
-            return _('Enabled');
-        case ExtensionState.DISABLED:
+        case ExtensionState.ACTIVE:
+            return _('Active');
+        case ExtensionState.INACTIVE:
         case ExtensionState.INITIALIZED:
-            return _('Disabled');
+            return _('Inactive');
         case ExtensionState.ERROR:
             return _('Error');
         case ExtensionState.OUT_OF_DATE:
             return _('Out of date');
         case ExtensionState.DOWNLOADING:
             return _('Downloading');
-        case ExtensionState.DISABLING:
-            return _('Disabling');
-        case ExtensionState.ENABLING:
-            return _('Enabling');
+        case ExtensionState.DEACTIVATING:
+            return _('Deactivating');
+        case ExtensionState.ACTIVATING:
+            return _('Activating');
         }
         return 'Unknown'; // Not translated, shouldn't appear
     }
diff --git a/subprojects/extensions-app/js/extensionRow.js b/subprojects/extensions-app/js/extensionRow.js
index 965bcd126..3caa636fe 100644
--- a/subprojects/extensions-app/js/extensionRow.js
+++ b/subprojects/extensions-app/js/extensionRow.js
@@ -115,7 +115,7 @@ export const ExtensionRow = GObject.registerClass({
     }
 
     _updateState() {
-        const state = this._extension.state === ExtensionState.ENABLED;
+        const state = this._extension.state === ExtensionState.ACTIVE;
 
         const action = this._actionGroup.lookup_action('enabled');
         action.set_state(new GLib.Variant('b', state));