diff --git a/ext/src/shim/framework/classes/CastContext.ts b/ext/src/shim/framework/classes/CastContext.ts
index 0f2f0cb..814f40d 100644
--- a/ext/src/shim/framework/classes/CastContext.ts
+++ b/ext/src/shim/framework/classes/CastContext.ts
@@ -10,7 +10,7 @@ type EventHandler = (eventData:
         CastStateEventData
       | SessionStateEventData) => void;
 
-export default class ApplicationMetadata {
+export default class CastContext {
     public addEventListener (type: string, handler: EventHandler): void {
         console.info("STUB :: CastContext#addEventListener");
     }
diff --git a/ext/src/shim/framework/classes/CastStateEventData.ts b/ext/src/shim/framework/classes/CastStateEventData.ts
index 8ff1eca..8e98c2a 100644
--- a/ext/src/shim/framework/classes/CastStateEventData.ts
+++ b/ext/src/shim/framework/classes/CastStateEventData.ts
@@ -5,7 +5,7 @@ import EventData from "./EventData";
 import { CastContextEventType } from "../enums";
 
 
-export default class ApplicationStatusEventData extends EventData {
+export default class CastStateEventData extends EventData {
     constructor (
             public castState: string) {
 
diff --git a/ext/src/shim/framework/classes/MediaSessionEventData.ts b/ext/src/shim/framework/classes/MediaSessionEventData.ts
index 84610ce..f81816f 100644
--- a/ext/src/shim/framework/classes/MediaSessionEventData.ts
+++ b/ext/src/shim/framework/classes/MediaSessionEventData.ts
@@ -7,7 +7,7 @@ import EventData from "./EventData";
 import { SessionEventType } from "../enums";
 
 
-export default class ApplicationStatusEventData extends EventData {
+export default class MediaSessionEventData extends EventData {
     constructor (
             public mediaSession: cast.media.Media) {
 
diff --git a/ext/src/shim/framework/classes/SessionStateEventData.ts b/ext/src/shim/framework/classes/SessionStateEventData.ts
index d8c81dd..800350c 100644
--- a/ext/src/shim/framework/classes/SessionStateEventData.ts
+++ b/ext/src/shim/framework/classes/SessionStateEventData.ts
@@ -6,7 +6,7 @@ import EventData from "./EventData";
 import { SessionEventType } from "../enums";
 
 
-export default class ApplicationStatusEventData extends EventData {
+export default class SessionStateEventData extends EventData {
     constructor (
             public session: CastSession
           , public sessionState: string
diff --git a/ext/src/shim/framework/classes/VolumeEventData.ts b/ext/src/shim/framework/classes/VolumeEventData.ts
index 1959a9b..c4f5982 100644
--- a/ext/src/shim/framework/classes/VolumeEventData.ts
+++ b/ext/src/shim/framework/classes/VolumeEventData.ts
@@ -3,7 +3,7 @@
 import { SessionEventType } from "../enums";
 
 
-export default class ApplicationStatusEventData {
+export default class VolumeEventData {
     public type = SessionEventType.VOLUME_CHANGED;
 
     constructor (