diff --git a/migrations/20180121061357-maildb-create-table.js b/migrations/20180121061357-mail-create-table.js
similarity index 85%
rename from migrations/20180121061357-maildb-create-table.js
rename to migrations/20180121061357-mail-create-table.js
index 3d300c2e5..7ad51c89b 100644
--- a/migrations/20180121061357-maildb-create-table.js
+++ b/migrations/20180121061357-mail-create-table.js
@@ -1,7 +1,7 @@
 'use strict';
 
 exports.up = function(db, callback) {
-    var cmd = 'CREATE TABLE IF NOT EXISTS maildb(' +
+    var cmd = 'CREATE TABLE IF NOT EXISTS mail(' +
                 'domain VARCHAR(128) NOT NULL UNIQUE,' +
                 'enabled BOOLEAN DEFAULT 0,' +
                 'mailFromValidation BOOLEAN DEFAULT 1,' +
@@ -17,7 +17,7 @@ exports.up = function(db, callback) {
 };
 
 exports.down = function(db, callback) {
-    db.runSql('DROP TABLE mailboxes', function (error) {
+    db.runSql('DROP TABLE mail', function (error) {
         if (error) console.error(error);
         callback(error);
     });
diff --git a/migrations/20180121062945-maildb-migrate-settings.js b/migrations/20180121062945-mail-migrate-settings.js
similarity index 90%
rename from migrations/20180121062945-maildb-migrate-settings.js
rename to migrations/20180121062945-mail-migrate-settings.js
index 6fba66251..003886fb9 100644
--- a/migrations/20180121062945-maildb-migrate-settings.js
+++ b/migrations/20180121062945-mail-migrate-settings.js
@@ -23,7 +23,7 @@ exports.up = function(db, callback) {
                 }
             });
 
-            db.runSql('INSERT INTO maildb (domain, enabled, mailFromValidation, catchAllJson, relayJson) VALUES (?, ?, ?, ?, ?)',
+            db.runSql('INSERT INTO mail (domain, enabled, mailFromValidation, catchAllJson, relayJson) VALUES (?, ?, ?, ?, ?)',
                 [ domains[0].domain, mailEnabled, mailFromValidation, JSON.stringify(catchAll), JSON.stringify(relay) ], callback);
         });
     });
diff --git a/migrations/20180121124206-users-add-fallbackEmail.js b/migrations/20180121124206-users-add-fallbackEmail.js
index 0de2c1724..1cc1ced78 100644
--- a/migrations/20180121124206-users-add-fallbackEmail.js
+++ b/migrations/20180121124206-users-add-fallbackEmail.js
@@ -6,7 +6,7 @@ exports.up = function(db, callback) {
     db.all('SELECT * FROM users', [ ], function (error, users) {
         if (error) return callback(error);
 
-        db.all('SELECT * FROM maildb WHERE enabled=1', [ ], function (error, mailDomains) {
+        db.all('SELECT * FROM mail WHERE enabled=1', [ ], function (error, mailDomains) {
             if (error) return callback(error);
 
             async.series([
diff --git a/migrations/schema.sql b/migrations/schema.sql
index 30bfb8a66..ca8df2551 100644
--- a/migrations/schema.sql
+++ b/migrations/schema.sql
@@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS domains(
     /* the default db collation is utf8mb4_unicode_ci but for the app table domain constraint we have to use the old one */
     CHARACTER SET utf8 COLLATE utf8_bin;
 
-CREATE TABLE IF NOT EXISTS maildb(
+CREATE TABLE IF NOT EXISTS mail(
     domain VARCHAR(128) NOT NULL UNIQUE,
 
     enabled BOOLEAN DEFAULT 0, /* MDA enabled */
diff --git a/src/domaindb.js b/src/domaindb.js
index 62bb4a21a..5c14da92a 100644
--- a/src/domaindb.js
+++ b/src/domaindb.js
@@ -62,7 +62,7 @@ function add(name, domain, callback) {
 
     var queries = [];
     queries.push({ query: 'INSERT INTO domains (domain, zoneName, provider, configJson) VALUES (?, ?, ?, ?)', args: [ name, domain.zoneName, domain.provider, JSON.stringify(domain.config) ] });
-    queries.push({ query: 'INSERT INTO maildb (domain) VALUES (?)', args: [ name ] });
+    queries.push({ query: 'INSERT INTO mail (domain) VALUES (?)', args: [ name ] });
 
     database.transaction(queries, function (error, result) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
@@ -102,7 +102,7 @@ function del(domain, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     var queries = [];
-    queries.push({ query: 'DELETE FROM maildb WHERE domain=?', args: [ domain ] });
+    queries.push({ query: 'DELETE FROM mail WHERE domain=?', args: [ domain ] });
     queries.push({ query: 'DELETE FROM domains WHERE domain=?', args: [ domain ] });
 
     database.transaction(queries, function (error, result) {
diff --git a/src/maildb.js b/src/maildb.js
index 5fb64b3f8..f827ae6e7 100644
--- a/src/maildb.js
+++ b/src/maildb.js
@@ -39,7 +39,7 @@ function postProcess(data) {
 function add(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
 
-    database.query('INSERT INTO maildb (domain) VALUES (?)', [ domain ], function (error) {
+    database.query('INSERT INTO mail (domain) VALUES (?)', [ domain ], function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, 'mail domain already exists'));
         if (error && error.code === 'ER_NO_REFERENCED_ROW_2') return callback(new DatabaseError(DatabaseError.NOT_FOUND), 'no such domain');
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
@@ -51,7 +51,7 @@ function add(domain, callback) {
 function clear(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('TRUNCATE TABLE maildb', [], function (error) {
+    database.query('TRUNCATE TABLE mail', [], function (error) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         callback(null);
     });
@@ -62,7 +62,7 @@ function del(domain, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     // deletes aliases as well
-    database.query('DELETE FROM maildb WHERE domain=?', [ domain ], function (error, result) {
+    database.query('DELETE FROM mail WHERE domain=?', [ domain ], function (error, result) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -74,7 +74,7 @@ function get(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    database.query('SELECT ' + MAILDB_FIELDS + ' FROM maildb WHERE domain = ?', [ domain ], function (error, results) {
+    database.query('SELECT ' + MAILDB_FIELDS + ' FROM mail WHERE domain = ?', [ domain ], function (error, results) {
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
         if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
 
@@ -103,7 +103,7 @@ function update(domain, data, callback) {
     }
     args.push(domain);
 
-    database.query('UPDATE maildb SET ' + fields.join(', ') + ' WHERE domain=?', args, function (error) {
+    database.query('UPDATE mail SET ' + fields.join(', ') + ' WHERE domain=?', args, function (error) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));