diff --git a/lib/controller.js b/lib/controller.js
index 8bf9955f..20e1be30 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -17,7 +17,7 @@ const ExtensionDeviceConfigure = require('./extension/deviceConfigure');
 const ExtensionDeviceGroupMembership = require('./extension/legacy/deviceGroupMembership');
 const ExtensionBridgeLegacy = require('./extension/legacy/bridgeLegacy');
 const ExtensionGroups = require('./extension/groups');
-const ExtensionDeviceAvailability = require('./extension/deviceAvailability');
+const ExtensionAvailability = require('./extension/availability');
 const ExtensionDeviceBind = require('./extension/deviceBind');
 const ExtensionDeviceReport = require('./extension/deviceReport');
 const ExtensionDeviceEvent = require('./extension/deviceEvent');
@@ -66,7 +66,7 @@ class Controller {
         }
 
         if (settings.get().advanced.availability_timeout) {
-            this.extensions.push(new ExtensionDeviceAvailability(...args));
+            this.extensions.push(new ExtensionAvailability(...args));
         }
     }
 
diff --git a/lib/extension/deviceAvailability.js b/lib/extension/availability.js
similarity index 98%
rename from lib/extension/deviceAvailability.js
rename to lib/extension/availability.js
index 42fd4a31..e9059909 100644
--- a/lib/extension/deviceAvailability.js
+++ b/lib/extension/availability.js
@@ -16,7 +16,7 @@ const Hours25 = 1000 * 60 * 60 * 25;
 /**
  * This extensions pings devices to check if they are online.
  */
-class DeviceAvailability extends Extension {
+class Availability extends Extension {
     constructor(zigbee, mqtt, state, publishEntityState, eventBus) {
         super(zigbee, mqtt, state, publishEntityState, eventBus);
 
@@ -191,4 +191,4 @@ class DeviceAvailability extends Extension {
     }
 }
 
-module.exports = DeviceAvailability;
+module.exports = Availability;
diff --git a/test/deviceAvailability.test.js b/test/deviceAvailability.test.js
index a2165dc4..6dece2c7 100644
--- a/test/deviceAvailability.test.js
+++ b/test/deviceAvailability.test.js
@@ -19,7 +19,7 @@ describe('Device availability', () => {
     let controller;
 
     function getExtension() {
-        return controller.extensions.find((e) => e.constructor.name === 'DeviceAvailability');
+        return controller.extensions.find((e) => e.constructor.name === 'Availability');
     }
 
     beforeEach(async () => {