diff --git a/lib/App.js b/lib/App.js
index 097b2dd..fc3bb8a 100644
--- a/lib/App.js
+++ b/lib/App.js
@@ -20,8 +20,8 @@ class App extends OAuth2App {
     // Sentry logging
     this.homeyLog = new Log({ homey: this.homey });
 
-    // Register event listener
-    this.homey.on('unload', () => this.onUninit());
+    // Register unload event listener
+    this.homey.on('unload', () => this.onOAuth2Uninit());
 
     // Set default data
     this.setDefaults();
@@ -33,7 +33,7 @@ class App extends OAuth2App {
   }
 
   // Application destroyed
-  async onUninit() {
+  async onOAuth2Uninit() {
     // Unregister timer
     this.unregisterTimer();
 
diff --git a/lib/Driver.js b/lib/Driver.js
index c490815..3430970 100644
--- a/lib/Driver.js
+++ b/lib/Driver.js
@@ -14,7 +14,7 @@ class Driver extends OAuth2Driver {
   }
 
   // Driver destroyed
-  async onUninit() {
+  async onOAuth2Uninit() {
     this.log('Destroyed');
   }
 
diff --git a/package-lock.json b/package-lock.json
index 7e075da..b0016b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
       "license": "SEE LICENSE",
       "dependencies": {
         "homey-log": "^2.1.0",
-        "homey-oauth2app": "^3.5.7"
+        "homey-oauth2app": "^3.6.0"
       },
       "devDependencies": {
         "@types/homey": "npm:homey-apps-sdk-v3-types@^0.3.5",
@@ -2152,9 +2152,9 @@
       }
     },
     "node_modules/homey-oauth2app": {
-      "version": "3.5.7",
-      "resolved": "https://registry.npmjs.org/homey-oauth2app/-/homey-oauth2app-3.5.7.tgz",
-      "integrity": "sha512-ZgI34ZZU8B2bIiLOUcOpOMb5nkLQ73ys9ylPk6JMqZVpNPTw7EPaPs0/nahrPKYdL3fXBvBmpt4h6YRohZh0XA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/homey-oauth2app/-/homey-oauth2app-3.6.0.tgz",
+      "integrity": "sha512-SNMfscVAV/QcstR26sqr2cR5WY25zPyP3qyMWwB+xcGaRjv4BiCvLtGeC1YsE5n3UbUg7UJ67edfYWbmWaH4gA==",
       "dependencies": {
         "node-fetch": "^2.3.0"
       }
diff --git a/package.json b/package.json
index 2b96610..d2d4767 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "homey-log": "^2.1.0",
-    "homey-oauth2app": "^3.5.7"
+    "homey-oauth2app": "^3.6.0"
   },
   "devDependencies": {
     "@types/homey": "npm:homey-apps-sdk-v3-types@^0.3.5",