3 files changed, 6 insertions, 6 deletions

diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index 0bc5df92f..4ecabac77 100644
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -15,8 +15,8 @@ const checker = {
 // Check the config files
 function checkConfig () {
   const required = [ 'listen.port',
-    'webserver.https', 'webserver.host', 'webserver.port',
-    'database.host', 'database.port', 'database.suffix',
+    'webserver.https', 'webserver.hostname', 'webserver.port',
+    'database.hostname', 'database.port', 'database.suffix',
     'storage.certs', 'storage.videos', 'storage.logs', 'storage.thumbnails'
   ]
   const miss = []
diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index 8a8d5c1ce..5ccd42773 100644
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -32,7 +32,7 @@ const OAUTH_LIFETIME = {
 const CONFIG = {
   DATABASE: {
     DBNAME: 'peertube' + config.get('database.suffix'),
-    HOST: config.get('database.host'),
+    HOSTNAME: config.get('database.hostname'),
     PORT: config.get('database.port')
   },
   STORAGE: {
@@ -45,11 +45,11 @@ const CONFIG = {
   WEBSERVER: {
     SCHEME: config.get('webserver.https') === true ? 'https' : 'http',
     WS: config.get('webserver.https') === true ? 'wss' : 'ws',
-    HOST: config.get('webserver.host'),
+    HOSTNAME: config.get('webserver.hostname'),
     PORT: config.get('webserver.port')
   }
 }
-CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOST + ':' + CONFIG.WEBSERVER.PORT
+CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/initializers/database.js b/server/initializers/database.js
index 632040b81..0564e4e77 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -22,7 +22,7 @@ const database = {
 
 function connect () {
   mongoose.Promise = global.Promise
-  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOST + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
+  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
   mongoose.connection.on('error', function () {
     throw new Error('Mongodb connection error.')
   })