diff --git a/package.json b/package.json
index 281437e..a95e787 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "react-teamspeak-remote-app-api-types",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "Types for the TeamSpeak 5/6 Remote App API",
 	"license": "ISC",
 	"type": "commonjs",
diff --git a/src/types/entities.ts b/src/types/entities.ts
index b883413..d64dba8 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -1,4 +1,4 @@
-export interface AuthOutgoing {
+export interface IAuthOutgoing {
   type: string;
   payload: {
     identifier: string;
@@ -11,23 +11,23 @@ export interface AuthOutgoing {
   };
 }
 
-export interface Channel {
+export interface IChannel {
   id: string;
   order: string;
   parentId: string;
-  properties: ChannelProperties;
+  properties: IChannelProperties;
 }
 
-export interface Connection {
-  channelInfos: ChannelInfos;
+export interface IConnection {
+  channelInfos: IChannelInfos;
   clientId: number;
-  clientInfos: Client[];
+  clientInfos: IClient[];
   id: number;
   status: number;
-  properties: ServerProperties;
+  properties: IServerProperties;
 }
 
-export interface ChannelProperties {
+export interface IChannelProperties {
   bannerGfxUrl: string;
   bannerMode: number;
   codec: number;
@@ -58,20 +58,20 @@ export interface ChannelProperties {
   uniqueIdentifier: string;
 }
 
-export interface ChannelInfos {
-  rootChannels: Channel[];
+export interface IChannelInfos {
+  rootChannels: IChannel[];
   subChannels: {
-    [key: string]: Channel[];
+    [key: string]: IChannel[];
   };
 }
 
-export interface Client {
+export interface IClient {
   channelId: string;
   id: number;
-  properties: ClientProperties;
+  properties: IClientProperties;
 }
 
-export interface ClientProperties {
+export interface IClientProperties {
   away: boolean;
   awayMessage: string;
   badges: string;
@@ -128,7 +128,7 @@ export interface ClientProperties {
   volumeModificator: number;
 }
 
-export interface ServerProperties {
+export interface IServerProperties {
   antiFloodPointsNeededCommandBlock: number;
   antiFloodPointsNeededIpBlock: number;
   antiFloodPointsNeededPluginBlock: number;
@@ -203,7 +203,7 @@ export interface ServerProperties {
   volumeModificator: number;
 }
 
-export interface AuthIncoming {
+export interface IAuthIncoming {
   status: {
     code: number;
     message: string;
@@ -211,11 +211,11 @@ export interface AuthIncoming {
   type: string;
   payload: {
     apiKey: string;
-    connections: Connection[];
+    connections: IConnection[];
   };
 }
 
-export interface Invoker {
+export interface IInvoker {
   id: number;
   name: string;
   uniqueIdentifier: string;
diff --git a/src/types/events.ts b/src/types/events.ts
index c742bf8..3d4551f 100644
--- a/src/types/events.ts
+++ b/src/types/events.ts
@@ -1,6 +1,6 @@
-import { ChannelProperties, ClientProperties, Invoker } from "../index";
+import { IChannelProperties, IClientProperties, IInvoker } from "../index";
 
-export interface LogEvent {
+export interface ILogEvent {
   type: string;
   payload: {
     channel: string;
@@ -12,7 +12,7 @@ export interface LogEvent {
   };
 }
 
-export interface TalkStatusChangedEvent {
+export interface ITalkStatusChangedEvent {
   type: string;
   payload: {
     clientId: number;
@@ -22,16 +22,16 @@ export interface TalkStatusChangedEvent {
   };
 }
 
-export interface ChannelPropertiesUpdatedEvent {
+export interface IChannelPropertiesUpdatedEvent {
   type: string;
   payload: {
     channelId: string;
     connectionId: number;
-    properties: ChannelProperties;
+    properties: IChannelProperties;
   };
 }
 
-export interface ClientMovedEvent {
+export interface IClientMovedEvent {
   type: string;
   payload: {
     clientId: number;
@@ -39,30 +39,30 @@ export interface ClientMovedEvent {
     hotReload: boolean;
     newChannelId: string;
     oldChannelId: string;
-    properties: ClientProperties;
+    properties: IClientProperties;
   };
 }
 
-export interface ChannelEditedEvent {
+export interface IChannelEditedEvent {
   type: string;
   payload: {
     channelId: string;
     connectionId: number;
-    invoker: Invoker;
-    properties: ChannelProperties;
+    invoker: IInvoker;
+    properties: IChannelProperties;
   };
 }
 
-export interface ClientPropertiesUpdatedEvent {
+export interface IClientPropertiesUpdatedEvent {
   type: string;
   payload: {
     clientId: number;
     connectionId: number;
-    properties: ClientProperties;
+    properties: IClientProperties;
   };
 }
 
-export interface ClientSelfPropertiesUpdatedEvent {
+export interface IClientSelfPropertiesUpdatedEvent {
   type: string;
   payload: {
     connectionId: number;