diff --git a/src/common/channel/channel-injection-token.ts b/src/common/channel/channel-injection-token.ts
index eb5ec40167..586f5eeb35 100644
--- a/src/common/channel/channel-injection-token.ts
+++ b/src/common/channel/channel-injection-token.ts
@@ -5,9 +5,9 @@
 
 import { getInjectionToken } from "@ogre-tools/injectable";
 
-export interface Channel<TInstance> {
+export interface Channel<MessageTemplate> {
   id: string;
-  _template?: TInstance;
+  _messageTemplate?: MessageTemplate;
 }
 
 export const channelInjectionToken = getInjectionToken<Channel<any>>({
diff --git a/src/common/channel/channel-listener-injection-token.ts b/src/common/channel/channel-listener-injection-token.ts
index 29307be1db..df7219c634 100644
--- a/src/common/channel/channel-listener-injection-token.ts
+++ b/src/common/channel/channel-listener-injection-token.ts
@@ -7,7 +7,7 @@ import type { Channel } from "./channel-injection-token";
 
 export interface ChannelListener<TChannel extends Channel<any>> {
   channel: TChannel;
-  handler: (value: TChannel["_template"]) => void;
+  handler: (value: TChannel["_messageTemplate"]) => void;
 }
 
 export const channelListenerInjectionToken = getInjectionToken<ChannelListener<Channel<any>>>(
diff --git a/src/common/channel/enlist-channel-listener-injection-token.ts b/src/common/channel/enlist-channel-listener-injection-token.ts
index 6b72ca4ac1..718bf923a5 100644
--- a/src/common/channel/enlist-channel-listener-injection-token.ts
+++ b/src/common/channel/enlist-channel-listener-injection-token.ts
@@ -7,7 +7,7 @@ import type { Channel } from "./channel-injection-token";
 
 export type EnlistChannelListener = <TChannel extends Channel<unknown>>(
   channel: TChannel,
-  handler: (value: TChannel["_template"]) => void
+  handler: (value: TChannel["_messageTemplate"]) => void
 ) => () => void;
 
 export const enlistChannelListenerInjectionToken =
diff --git a/src/common/channel/send-to-agnostic-channel-injection-token.ts b/src/common/channel/send-to-agnostic-channel-injection-token.ts
index 901e51b94b..ffb5719c32 100644
--- a/src/common/channel/send-to-agnostic-channel-injection-token.ts
+++ b/src/common/channel/send-to-agnostic-channel-injection-token.ts
@@ -7,7 +7,7 @@ import type { Channel } from "./channel-injection-token";
 
 export type SendToAgnosticChannel = <TChannel extends Channel<unknown>>(
   channel: TChannel,
-  message: TChannel["_template"]
+  message: TChannel["_messageTemplate"]
 ) => void;
 
 export const sendToAgnosticChannelInjectionToken =