diff --git a/server.js b/server.js
index 8f262ee..5bebb29 100644
--- a/server.js
+++ b/server.js
@@ -2,13 +2,14 @@
 const fs = require('fs');
 const express = require('express');
 const app = express();
-const http = require('http') //.Server(app);
-const https = require('https'); //.Server(app);
+const http = require('http');
+const https = require('https'); 
 const webserver = https.createServer({
   key: fs.readFileSync('./misc/server.key', 'utf8'),
   cert: fs.readFileSync('./misc/server.cert', 'utf8')
 }, app);
 const io = require('socket.io').listen(webserver);
+const io_api = require('socket.io-client');
 const async = require('async');
 const path = require('path');
 const favicon = require('serve-favicon');
@@ -39,9 +40,9 @@ app.use(bodyParser.urlencoded({
 // Scripte einbinden
 var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg);
 var sql = require('./server/sql_qry')(sql_cfg, uuidv4, turf, app_cfg);
-var tw = require('./server/twitter')(twit, uuidv4, app_cfg);
-var waip = require('./server/waip')(io, sql, tw, async, app_cfg);
-var socket = require('./server/socket')(io, sql, app_cfg, waip);
+var brk = require('./server/broker')(twit, uuidv4, app_cfg);
+var waip = require('./server/waip')(io, sql, brk, async, app_cfg);
+var socket = require('./server/socket')(io, io_api, sql, app_cfg, waip);
 var udp = require('./server/udp')(app_cfg, waip, sql);
 var auth = require('./server/auth')(app, app_cfg, sql_cfg, async, bcrypt, passport, io);
 var routes = require('./server/routing')(app, sql, uuidv4, app_cfg, passport, auth, waip, udp);
diff --git a/server/twitter.js b/server/broker.js
similarity index 100%
rename from server/twitter.js
rename to server/broker.js
diff --git a/server/socket.js b/server/socket.js
index dab829b..2851749 100755
--- a/server/socket.js
+++ b/server/socket.js
@@ -1,8 +1,8 @@
-module.exports = function (io, sql, app_cfg, waip) {
+module.exports = function (io, io_api, sql, app_cfg, waip) {
 
   // Module laden
   //client.js
-  var io_api = require('socket.io-client');
+
   var socket_api = io_api.connect(app_cfg.global.remoteapi, {
     reconnect: true
   });
diff --git a/server/waip.js b/server/waip.js
index 022f8b1..a877355 100755
--- a/server/waip.js
+++ b/server/waip.js
@@ -1,4 +1,4 @@
-module.exports = function (io, sql, tw, async, app_cfg) {
+module.exports = function (io, sql, brk, async, app_cfg) {
 
   // Einsatzmeldung in Datenbank speichern
   function einsatz_speichern(einsatz_rohdaten) {
@@ -29,9 +29,9 @@ module.exports = function (io, sql, tw, async, app_cfg) {
       sql.db_get_vmtl_list(waip_id, function (vmtl_data) {
         if (vmtl_data) {
           if (app_cfg.global.development) {
-            console.log('Daten Twitter: ' + JSON.stringify(vmtl_data));
+            console.log('Daten Vermittlung: ' + JSON.stringify(vmtl_data));
           };                                                                                     
-          tw.alert_vmtl_list(vmtl_data, function (result) {
+          brk.alert_vmtl_list(vmtl_data, function (result) {
             if (!result) {
               sql.db_log('VMTL', 'Link zur Einsatz-Rückmeldung erfolgreichen an Vermittler-Liste gesendet. ' + result);
             } else {
@@ -341,7 +341,7 @@ module.exports = function (io, sql, tw, async, app_cfg) {
             delete einsatzdaten.wgs84_y;
           };
           socket.emit('io.Einsatz', einsatzdaten);
-          sql.db_log('DBRD', 'Einsatzdaten für Dashboard' + dbrd_uuid + ' an Socket ' + socket.id + ' gesendet');
+          sql.db_log('DBRD', 'Einsatzdaten für Dashboard ' + dbrd_uuid + ' an Socket ' + socket.id + ' gesendet');
           sql.db_update_client_status(socket, dbrd_uuid);
         });
       } else {