diff --git a/lib/src/interfaceConnectionObject.ts b/lib/src/abstractConnectionObject.ts
similarity index 98%
rename from lib/src/interfaceConnectionObject.ts
rename to lib/src/abstractConnectionObject.ts
index 435f7b6..3763a5f 100644
--- a/lib/src/interfaceConnectionObject.ts
+++ b/lib/src/abstractConnectionObject.ts
@@ -12,7 +12,7 @@ export type OnEventCallback = (response: any) => void
  * This should be used as base class for your own connectors.
  * @public
  */
-export default abstract class InterfaceConnectionObject<ConfigInterface> {
+export default abstract class AbstractConnectionObject<ConfigInterface> {
     /**
      * A name for your connector.
      * @public
diff --git a/lib/src/server.ts b/lib/src/abstractInterfaceServer.ts
similarity index 96%
rename from lib/src/server.ts
rename to lib/src/abstractInterfaceServer.ts
index 17d4c45..2e86094 100644
--- a/lib/src/server.ts
+++ b/lib/src/abstractInterfaceServer.ts
@@ -8,7 +8,7 @@ import type { OnRequestCallback } from "./types/requests";
  * @typeParam ConfigInterface - The config interface for your interface server.
  * @public
  */
-export default abstract class AASInterfaceServer<ConfigInterface> {
+export default abstract class AbstractInterfaceServer<ConfigInterface> {
     /**
      * A name for your interface server.
      * @remarks
diff --git a/lib/src/index.ts b/lib/src/index.ts
index 57cf9b2..ef897d5 100644
--- a/lib/src/index.ts
+++ b/lib/src/index.ts
@@ -1,6 +1,6 @@
 export { default as MultiMessageBroker } from "./multimessageBroker";
-export { default as AbstractConnectionObject } from "./interfaceConnectionObject";
-export { default as AbstractInterfaceServer } from "./server";
+export { default as AbstractConnectionObject } from "./abstractConnectionObject";
+export { default as AbstractInterfaceServer } from "./abstractInterfaceServer";
 export { default as AIMCMapper } from "./AIMCMapper";
 
 export * as Types from "./types";
diff --git a/lib/src/multimessageBroker.ts b/lib/src/multimessageBroker.ts
index 7f30540..e1aff27 100644
--- a/lib/src/multimessageBroker.ts
+++ b/lib/src/multimessageBroker.ts
@@ -1,7 +1,7 @@
 import { types } from "@aas-core-works/aas-core3.0-typescript";
-import type AASInterfaceServer from "./server";
+import type AbstractInterfaceServer from "./abstractInterfaceServer";
 import type { Request } from "./types/requests";
-import type InterfaceConnectionObject from "interfaceConnectionObject";
+import type AbstractConnectionObject from "./abstractConnectionObject";
 import AIMCMapper from "./AIMCMapper";
 import AIDParser from "./parser/AIDParser";
 import { EndpointMetadata } from "types/aidConf";
@@ -12,18 +12,18 @@ type AASRegistration = {
 }
 
 type AASRegistrationPrepared = AASRegistration & {
-    serverInstances: AASInterfaceServer<any>[];
-    connectorInterfaces: InterfaceConnectionObject<any>[];
+    serverInstances: AbstractInterfaceServer<any>[];
+    connectorInterfaces: AbstractConnectionObject<any>[];
     mappingConfiguration: AIMCMapper;
 }
 
 type ServerInterfaceEntry<ConfigInterface> = {
-    serverInterface: typeof AASInterfaceServer<ConfigInterface>,
+    serverInterface: typeof AbstractInterfaceServer<ConfigInterface>,
     config: ConfigInterface
 }
 
 type InterfaceConnectionEntry<ConfigInterface> = {
-    interfaceConnection: typeof InterfaceConnectionObject<ConfigInterface>,
+    interfaceConnection: typeof AbstractConnectionObject<ConfigInterface>,
     config: ConfigInterface
 }
 
@@ -99,7 +99,7 @@ export default class MultiMessageBroker {
     /**
      * Prepare the broker.
      * @remarks
-     * This will create instances of the {@link AASInterfaceServer} and {@link InterfaceConnectionObject} classes.
+     * This will create instances of the {@link AbstractInterfaceServer} and {@link AbstractConnectionObject} classes.
      */
     public prepare(): void {
         for (const registration of this.aasRegistrations) {