diff --git a/migrations/20190503170326-settings-get-license.js b/migrations/20190503170326-settings-get-license.js
index 0f28b9ef5..d4dff1771 100644
--- a/migrations/20190503170326-settings-get-license.js
+++ b/migrations/20190503170326-settings-get-license.js
@@ -23,12 +23,12 @@ exports.up = function(db, callback) {
         console.log('Downloading license');
 
         superagent.get(`${config.apiServerOrigin}/api/v1/cloudron_license`)
-            .query({ token: config.token })
+            .query({ accessToken: config.token })
             .timeout(30 * 1000).end(function (error, result) {
                 if (error && !error.response) return callback(new Error('Network error getting license:' + error.message));
                 if (result.statusCode !== 200) return callback(new Error(`Bad status getting license: ${result.status} ${result.text}`));
 
-                if (!result.body.cloudronId || !result.body.licenseKey || !result.body.token) return callback(new Error(`Bad response getting license:  ${result.text}`));
+                if (!result.body.cloudronId || !result.body.licenseKey || !result.body.cloudronToken) return callback(new Error(`Bad response getting license:  ${result.text}`));
 
                 console.log('Adding license', result.body);
 
@@ -36,7 +36,7 @@ exports.up = function(db, callback) {
                     db.runSql.bind(db, 'START TRANSACTION;'),
                     db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'cloudron_id', JSON.stringify(result.body.cloudronId) ]),
                     db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'license_key', JSON.stringify(result.body.licenseKey) ]),
-                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'appstore_token', JSON.stringify(result.body.token) ]),
+                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'cloudron_token', JSON.stringify(result.body.cloudronToken) ]),
                     // db.runSql.bind(db, 'DELETE FROM settings WHERE name=?', [ 'appstore_config' ]),
                     db.runSql.bind(db, 'COMMIT')
                 ], callback);
diff --git a/src/appstore.js b/src/appstore.js
index 774aca225..094346029 100644
--- a/src/appstore.js
+++ b/src/appstore.js
@@ -71,10 +71,10 @@ function getAppstoreConfig(callback) {
     });
 }
 
-function getAppstoreToken(callback) {
+function getCloudronToken(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    settings.getAppstoreToken(function (error, token) {
+    settings.getCloudronToken(function (error, token) {
         if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
         if (!token) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
 
@@ -112,7 +112,7 @@ function purchase(data, callback) {
     assert.strictEqual(typeof data.appId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    getAppstoreToken(function (error, token) {
+    getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
         const url = `${config.apiServerOrigin()}/api/v1/cloudronapps`;
@@ -135,7 +135,7 @@ function unpurchase(appId, data, callback) {
     assert(data.appstoreId || data.manifestId);
     assert.strictEqual(typeof callback, 'function');
 
-    getAppstoreToken(function (error, token) {
+    getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
         const url = `${config.apiServerOrigin()}/api/v1/cloudronapps/${appId}`;
@@ -228,7 +228,7 @@ function sendAliveStatus(callback) {
             }
         };
 
-        getAppstoreToken(function (error, token) {
+        getCloudronToken(function (error, token) {
             if (error) return callback(error);
 
             const url = `${config.apiServerOrigin()}/api/v1/alive`;
@@ -246,7 +246,7 @@ function sendAliveStatus(callback) {
 function getBoxUpdate(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    getAppstoreToken(function (error, token) {
+    getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
         const url = `${config.apiServerOrigin()}/api/v1/boxupdate`;
@@ -279,7 +279,7 @@ function getAppUpdate(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    getAppstoreToken(function (error, token) {
+    getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
         const url = `${config.apiServerOrigin()}/api/v1/appupdate`;
@@ -342,7 +342,7 @@ function sendFeedback(info, callback) {
         apps.get(info.appId, callback);
     }
 
-    getAppstoreToken(function (error, token) {
+    getCloudronToken(function (error, token) {
         if (error) return callback(error);
 
         collectAppInfoIfNeeded(function (error, result) {
diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js
index d29b10ba2..52ee36a77 100644
--- a/src/routes/test/apps-test.js
+++ b/src/routes/test/apps-test.js
@@ -471,7 +471,7 @@ describe('App API', function () {
         settings.setAppstoreConfig({ userId: user_1_id, token: USER_1_APPSTORE_TOKEN }, function (error) {
             if (error) return done(error);
 
-            settingsdb.set(settings.APPSTORE_TOKEN_KEY, USER_1_APPSTORE_TOKEN, function (error) {
+            settingsdb.set(settings.CLOUDRON_TOKEN_KEY, USER_1_APPSTORE_TOKEN, function (error) {
                 if (error) return done(error);
 
                 expect(fake1.isDone()).to.be.ok();
@@ -666,7 +666,7 @@ describe('App installation', function () {
                 settings.setAppstoreConfig({ userId: user_1_id, token: USER_1_APPSTORE_TOKEN }, function (error) {
                     if (error) return callback(error);
 
-                    settingsdb.set(settings.APPSTORE_TOKEN_KEY, USER_1_APPSTORE_TOKEN, function (error) {
+                    settingsdb.set(settings.CLOUDRON_TOKEN_KEY, USER_1_APPSTORE_TOKEN, function (error) {
                         if (error) return callback(error);
 
                         expect(fake1.isDone()).to.be.ok();
diff --git a/src/routes/test/support-test.js b/src/routes/test/support-test.js
index cd06ba6a3..e8027c797 100644
--- a/src/routes/test/support-test.js
+++ b/src/routes/test/support-test.js
@@ -50,7 +50,7 @@ function setup(done) {
         },
 
         settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'USER_ID', cloudronId: 'CLOUDRON_ID', token: 'ACCESS_TOKEN' })),
-        settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'CLOUDRON_TOKEN')
+        settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'CLOUDRON_TOKEN')
     ], done);
 }
 
diff --git a/src/settings.js b/src/settings.js
index 34e766fd7..1f401407a 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -40,7 +40,7 @@ exports = module.exports = {
 
     getLicenseKey: getLicenseKey,
     getCloudronId: getCloudronId,
-    getAppstoreToken: getAppstoreToken,
+    getCloudronToken: getCloudronToken,
 
     get: get,
     getAll: getAll,
@@ -63,7 +63,7 @@ exports = module.exports = {
     CLOUDRON_NAME_KEY: 'cloudron_name',
     LICENSE_KEY: 'license_key',
     CLOUDRON_ID_KEY: 'cloudron_id',
-    APPSTORE_TOKEN_KEY: 'appstore_token',
+    CLOUDRON_TOKEN_KEY: 'cloudron_token',
 
     // blobs
     CLOUDRON_AVATAR_KEY: 'cloudron_avatar', // not stored in db but can be used for locked flag
@@ -97,7 +97,7 @@ var gDefaults = (function () {
     result[exports.UNSTABLE_APPS_KEY] = false;
     result[exports.LICENSE_KEY] = '';
     result[exports.CLOUDRON_ID_KEY] = '';
-    result[exports.APPSTORE_TOKEN_KEY] = '';
+    result[exports.CLOUDRON_TOKEN_KEY] = '';
     result[exports.BACKUP_CONFIG_KEY] = {
         provider: 'filesystem',
         key: '',
@@ -463,11 +463,11 @@ function getCloudronId(callback) {
     });
 }
 
-function getAppstoreToken(callback) {
+function getCloudronToken(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    settingsdb.get(exports.APPSTORE_TOKEN_KEY, function (error, value) {
-        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, gDefaults[exports.APPSTORE_TOKEN_KEY]);
+    settingsdb.get(exports.CLOUDRON_TOKEN_KEY, function (error, value) {
+        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, gDefaults[exports.CLOUDRON_TOKEN_KEY]);
         if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
 
         callback(null, value);
diff --git a/src/test/appstore-test.js b/src/test/appstore-test.js
index a66dff7ce..72a767969 100644
--- a/src/test/appstore-test.js
+++ b/src/test/appstore-test.js
@@ -67,7 +67,7 @@ describe('Appstore', function () {
             expect(error).to.not.be.ok();
             expect(scope.isDone()).to.be.ok();
 
-            settingsdb.set(settings.APPSTORE_TOKEN_KEY, APPSTORE_TOKEN, done);
+            settingsdb.set(settings.CLOUDRON_TOKEN_KEY, APPSTORE_TOKEN, done);
         });
     });
 
diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js
index 5386f07aa..a0cff95e8 100644
--- a/src/test/updatechecker-test.js
+++ b/src/test/updatechecker-test.js
@@ -87,7 +87,7 @@ describe('updatechecker - box - manual (email)', function () {
             users.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settings.setBoxAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });
 
@@ -161,7 +161,7 @@ describe('updatechecker - box - automatic (no email)', function () {
             mail.addDomain.bind(null, DOMAIN_0.domain),
             users.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });
 
@@ -201,7 +201,7 @@ describe('updatechecker - box - automatic free (email)', function () {
             mail.addDomain.bind(null, DOMAIN_0.domain),
             users.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });
 
@@ -276,7 +276,7 @@ describe('updatechecker - app - manual (email)', function () {
             },
             settings.setAppAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });
 
@@ -401,7 +401,7 @@ describe('updatechecker - app - automatic (no email)', function () {
             },
             settings.setAppAutoupdatePattern.bind(null, '00 00 1,3,5,23 * * *'),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });
 
@@ -476,7 +476,7 @@ describe('updatechecker - app - automatic free (email)', function () {
             },
             settings.setAppAutoupdatePattern.bind(null, '00 00 1,3,5,23 * * *'),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
-            settingsdb.set.bind(null, settings.APPSTORE_TOKEN_KEY, 'atoken'),
+            settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, 'atoken'),
         ], done);
     });