diff --git a/lib/dispatcher/ConnectivityManager/StatusManager.spec.ts b/lib/dispatcher/ConnectivityManager/ConnectivityManager.spec.ts
similarity index 100%
rename from lib/dispatcher/ConnectivityManager/StatusManager.spec.ts
rename to lib/dispatcher/ConnectivityManager/ConnectivityManager.spec.ts
diff --git a/lib/dispatcher/ConnectivityManager/StatusManager.ts b/lib/dispatcher/ConnectivityManager/ConnectivityManager.ts
similarity index 91%
rename from lib/dispatcher/ConnectivityManager/StatusManager.ts
rename to lib/dispatcher/ConnectivityManager/ConnectivityManager.ts
index 123ee3f..1714aba 100644
--- a/lib/dispatcher/ConnectivityManager/StatusManager.ts
+++ b/lib/dispatcher/ConnectivityManager/ConnectivityManager.ts
@@ -15,10 +15,9 @@ import { RUNNINGINNODE } from "../../helpers/runtimeMethods";
 import { defineNopeLogger } from "../../logger/getLogger";
 import {
   ENopeDispatcherStatus,
-  ICommunicationBridge, IMapBasedMergeData,
-  INopeObservable, INopeStatusInfo, INopeStatusManager,
-  INopeStatusManagerOptions,
-  INopeStatusManagerTimeOptions
+  ICommunicationBridge, IMapBasedMergeData, INopeConnectivityManager,
+  INopeINopeConnectivityOptions,
+  INopeINopeConnectivityTimeOptions, INopeObservable, INopeStatusInfo
 } from "../../types/nope";
 
 // Chached Moduls, which will be loaded in nodejs
@@ -32,18 +31,19 @@ let cpus = null;
  *
  * @author M.Karkowski
  * @export
- * @class NopeStatusManager
- * @implements {INopeStatusManager}
+ * @class NopeConnectivityManager
+ * @implements {INopeConnectivityManager}
  */
-export class NopeStatusManager implements INopeStatusManager {
+export class NopeConnectivityManager implements INopeConnectivityManager {
   protected _logger: ILogger;
   protected _deltaTime = 0;
+  protected _isMaster: string = null;
 
   /**
    * The used Communication interface
    *
    * @type {ICommunicationBridge}
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected readonly _communicator: ICommunicationBridge;
 
@@ -54,7 +54,7 @@ export class NopeStatusManager implements INopeStatusManager {
    *
    * @protected
    * @type {Map<string, INopeStatusInfo>}
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected _externalDispatchers: Map<string, INopeStatusInfo>;
 
@@ -63,10 +63,10 @@ export class NopeStatusManager implements INopeStatusManager {
    *
    * @author M.Karkowski
    * @protected
-   * @type {INopeStatusManagerTimeOptions}
-   * @memberof NopeStatusManager
+   * @type {INopeINopeConnectivityTimeOptions}
+   * @memberof NopeConnectivityManager
    */
-  protected _timeouts: INopeStatusManagerTimeOptions;
+  protected _timeouts: INopeINopeConnectivityTimeOptions;
 
   protected _checkInterval: any = null; // Timer to check the status
   protected _sendInterval: any = null;  // Timer to send the status
@@ -77,7 +77,7 @@ export class NopeStatusManager implements INopeStatusManager {
    *
    * @author M.Karkowski
    * @protected
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected _cpuLoad = -1;
 
@@ -94,7 +94,7 @@ export class NopeStatusManager implements INopeStatusManager {
    * @author M.Karkowski
    * @protected
    * @return {*}  {IDispatcherInfo} The current status of our dispatcher.
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   public get info(): INopeStatusInfo {
     if (RUNNINGINNODE) {
@@ -170,10 +170,10 @@ export class NopeStatusManager implements INopeStatusManager {
    * Creates an instance of nopeDispatcher.
    * @param {nopeRpcDispatcherOptions} options The Options, used by the Dispatcher.
    * @param {() => INopeObservable<IExternalEventMsg>} _generateObservable A Helper, to generate Observables.
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   constructor(
-    public options: INopeStatusManagerOptions,
+    public options: INopeINopeConnectivityOptions,
     protected _generateObservable: <T>() => INopeObservable<T>,
     public readonly id: string = null
   ) {
@@ -220,7 +220,7 @@ export class NopeStatusManager implements INopeStatusManager {
    * It subscribes to the "Messages" of the communicator.
    *
    * @protected
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected async _init(): Promise<void> {
     const _this = this;
@@ -275,7 +275,7 @@ export class NopeStatusManager implements INopeStatusManager {
    *
    * @author M.Karkowski
    * @protected
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected _checkDispatcherHealth(): void {
     const currentTime = Date.now();
@@ -333,7 +333,7 @@ export class NopeStatusManager implements INopeStatusManager {
    * @protected
    * @param {string} dispatcher
    * @param {boolean} [quite=false]
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   protected _removeDispatcher(dispatcher: string, quite = false): void {
     // Delete the Generators of the Instances.
@@ -366,7 +366,7 @@ export class NopeStatusManager implements INopeStatusManager {
    * @author M.Karkowski
    * @param {number} timestamp The UTC-Timestamp
    * @param {number} [delay=0] The Delay, since the Timestamp has been generated
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   public syncTime(timestamp: number, delay = 0) {
     const _internalTimestamp = Date.now();
@@ -381,7 +381,7 @@ export class NopeStatusManager implements INopeStatusManager {
    * Helper Function to manually emit a Bonjour!
    *
    * @return {*}  {Promise<void>}
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   public async emitBonjour(): Promise<void> {
     // Emit the Bonjour Message.
@@ -391,7 +391,7 @@ export class NopeStatusManager implements INopeStatusManager {
   /**
    * Function to reset the Dispatcher.
    *
-   * @memberof NopeStatusManager
+   * @memberof NopeConnectivityManager
    */
   public reset(): void {
     this._externalDispatchers.clear();
@@ -403,10 +403,10 @@ export class NopeStatusManager implements INopeStatusManager {
    * Timers etc.
    *
    * @author M.Karkowski
-   * @param {Partial<INopeStatusManagerTimeOptions>} options
-   * @memberof NopeStatusManager
+   * @param {Partial<INopeINopeConnectivityTimeOptions>} options
+   * @memberof NopeConnectivityManager
    */
-  public setTimings(options: Partial<INopeStatusManagerTimeOptions>): void {
+  public setTimings(options: Partial<INopeINopeConnectivityTimeOptions>): void {
     // Clear all Intervals etc.
     this.dispose(true);