diff --git a/server/sql_cfg.js b/server/sql_cfg.js
index a7d0e19..684be9d 100644
--- a/server/sql_cfg.js
+++ b/server/sql_cfg.js
@@ -125,7 +125,7 @@ module.exports = function (fs, bcrypt, app_cfg) {
         einsatzmittel_typ TEXT,
         einsatzmittel_rufname TEXT)`);
       // Twitter-Account-Tabelle erstellen
-      db.run(`CREATE TABLE waip_twitter_accounts (
+      db.run(`CREATE TABLE waip_tw_accounts (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
         tw_screen_name TEXT,
         tw_consumer_key TEXT,
@@ -134,14 +134,14 @@ module.exports = function (fs, bcrypt, app_cfg) {
         tw_access_token_secret TEXT)`);
       // Vermittlungs-Tabelle erstellen
       // TODO Umbauen in allgemine Vermittler-Liste -> mit Typ
-      db.run(`CREATE TABLE waip_vmtl_tw_wachen (
+      db.run(`CREATE TABLE waip_vmtl_wachen (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
         waip_wachen_id INTEGER,
-        tw_account_id INTEGER,
-        tw_account_list TEXT,
+        vmtl_typ TEXT,
+        vmlt_account_name TEXT,
+        vmlt_account_list TEXT,
         bkp_recipient TEXT,
-        FOREIGN KEY(waip_wachen_id) REFERENCES waip_wachen(id),
-        FOREIGN KEY(tw_account_id) REFERENCES waip_twitter_accounts(id))`);
+        FOREIGN KEY(waip_wachen_id) REFERENCES waip_wachen(id))`);
       // Log erstellen
       db.run(`CREATE TABLE waip_log (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 8901319..e33b02b 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -807,13 +807,13 @@ module.exports = function (db, uuidv4, app_cfg) {
 
   function db_vmtl_get_list(waip_id, callback) {
     // Pruefen ob fuer eine Wache im Einsatz ein Verteilerliste hinterlegt ist
-    db.get(`select t.waip_wachen_id, t.tw_account_id, t.tw_account_list from waip_vmtl_tw_wachen t 
+    db.get(`select t.waip_wachen_id, t.tw_account_id, t.tw_account_list from waip_vmtl_wachen t 
       where waip_wachen_id = (select distinct w.id wachen_id from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache 
       where em.waip_einsaetze_ID = ?)`, [waip_id], function (err, twitter_liste) {
       if (err == null && twitter_liste) {
         // Falls Account und Liste hinterlegt sind, die Account-Zugangsdaten, Einsatz-UUID, Einsatzart und Wachenname auslesen
         db.get(`select tw.tw_screen_name, tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, wa.name_wache 
-        from waip_twitter_accounts tw, waip_einsaetze we, waip_wachen wa
+        from waip_tw_accounts tw, waip_einsaetze we, waip_wachen wa
         where tw.id = ? AND we.id = ? AND wa.id = ?`, [twitter_liste.tw_account_id, waip_id, twitter_liste.waip_wachen_id], function (err, vmtl_daten) {
           if (err == null && vmtl_daten) {
             // Listen-Name zur Daten hinzufuegen