diff --git a/packages/kata-for-gabriel/src/cast-die.ts b/packages/kata-for-gabriel/src/cast-die.injectable.ts
similarity index 100%
rename from packages/kata-for-gabriel/src/cast-die.ts
rename to packages/kata-for-gabriel/src/cast-die.injectable.ts
diff --git a/packages/kata-for-gabriel/src/handle-attack-on-monster-for.ts b/packages/kata-for-gabriel/src/handle-attack-on-monster.injectable.ts
similarity index 84%
rename from packages/kata-for-gabriel/src/handle-attack-on-monster-for.ts
rename to packages/kata-for-gabriel/src/handle-attack-on-monster.injectable.ts
index 715e52868d..090d410019 100644
--- a/packages/kata-for-gabriel/src/handle-attack-on-monster-for.ts
+++ b/packages/kata-for-gabriel/src/handle-attack-on-monster.injectable.ts
@@ -1,8 +1,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
-import messageToPlayerInjectable from "./message-to-player";
-import castDieInjectable from "./cast-die";
-import monsterInjectable from "./monster";
-import handleLandedHitOnMonsterInjectable from "./handle-landed-hit-on-monster-for";
+import messageToPlayerInjectable from "./message-to-player.injectable";
+import castDieInjectable from "./cast-die.injectable";
+import monsterInjectable from "./monster.injectable";
+import handleLandedHitOnMonsterInjectable from "./handle-landed-hit-on-monster.injectable";
 
 const handleAttackOnMonsterInjectable = getInjectable({
   id: "handle-attack-on-monster",
diff --git a/packages/kata-for-gabriel/src/handle-attacking-the-monster-again-for.ts b/packages/kata-for-gabriel/src/handle-attacking-the-monster-again.injectable.ts
similarity index 85%
rename from packages/kata-for-gabriel/src/handle-attacking-the-monster-again-for.ts
rename to packages/kata-for-gabriel/src/handle-attacking-the-monster-again.injectable.ts
index 7a90fe5a03..7b20dd2454 100644
--- a/packages/kata-for-gabriel/src/handle-attacking-the-monster-again-for.ts
+++ b/packages/kata-for-gabriel/src/handle-attacking-the-monster-again.injectable.ts
@@ -1,6 +1,6 @@
 import { getInjectable } from "@ogre-tools/injectable";
-import questionToPlayerInjectable from "./question-to-player";
-import messageToPlayerInjectable from "./message-to-player";
+import questionToPlayerInjectable from "./question-to-player.injectable";
+import messageToPlayerInjectable from "./message-to-player.injectable";
 
 const handleAttackingTheMonsterAgainInjectable = getInjectable({
   id: "handle-attacking-the-monster-again",
diff --git a/packages/kata-for-gabriel/src/handle-initial-monster-encounter-for.ts b/packages/kata-for-gabriel/src/handle-initial-monster-encounter.injectable.ts
similarity index 82%
rename from packages/kata-for-gabriel/src/handle-initial-monster-encounter-for.ts
rename to packages/kata-for-gabriel/src/handle-initial-monster-encounter.injectable.ts
index c6c63a56ac..1368a32c44 100644
--- a/packages/kata-for-gabriel/src/handle-initial-monster-encounter-for.ts
+++ b/packages/kata-for-gabriel/src/handle-initial-monster-encounter.injectable.ts
@@ -1,7 +1,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
-import messageToPlayerInjectable from "./message-to-player";
-import questionToPlayerInjectable from "./question-to-player";
-import monsterInjectable from "./monster";
+import messageToPlayerInjectable from "./message-to-player.injectable";
+import questionToPlayerInjectable from "./question-to-player.injectable";
+import monsterInjectable from "./monster.injectable";
 
 const handleInitialMonsterEncounterInjectable = getInjectable({
   id: "handle-initial-monster-encounter",
diff --git a/packages/kata-for-gabriel/src/handle-landed-hit-on-monster-for.ts b/packages/kata-for-gabriel/src/handle-landed-hit-on-monster.injectable.ts
similarity index 87%
rename from packages/kata-for-gabriel/src/handle-landed-hit-on-monster-for.ts
rename to packages/kata-for-gabriel/src/handle-landed-hit-on-monster.injectable.ts
index dede30aa16..6523e8a812 100644
--- a/packages/kata-for-gabriel/src/handle-landed-hit-on-monster-for.ts
+++ b/packages/kata-for-gabriel/src/handle-landed-hit-on-monster.injectable.ts
@@ -1,6 +1,6 @@
 import { getInjectable } from "@ogre-tools/injectable";
-import monsterInjectable from "./monster";
-import messageToPlayerInjectable from "./message-to-player";
+import monsterInjectable from "./monster.injectable";
+import messageToPlayerInjectable from "./message-to-player.injectable";
 
 const handleLandedHitOnMonsterInjectable = getInjectable({
   id: "handle-landed-hit-on-monster",
diff --git a/packages/kata-for-gabriel/src/message-to-player.ts b/packages/kata-for-gabriel/src/message-to-player.injectable.ts
similarity index 100%
rename from packages/kata-for-gabriel/src/message-to-player.ts
rename to packages/kata-for-gabriel/src/message-to-player.injectable.ts
diff --git a/packages/kata-for-gabriel/src/monster-beatdown.ts b/packages/kata-for-gabriel/src/monster-beatdown.injectable.ts
similarity index 93%
rename from packages/kata-for-gabriel/src/monster-beatdown.ts
rename to packages/kata-for-gabriel/src/monster-beatdown.injectable.ts
index 21b7519864..7d6334eae8 100644
--- a/packages/kata-for-gabriel/src/monster-beatdown.ts
+++ b/packages/kata-for-gabriel/src/monster-beatdown.injectable.ts
@@ -1,7 +1,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
-import handleInitialMonsterEncounterInjectable from "./handle-initial-monster-encounter-for";
-import handleAttackOnMonsterInjectable from "./handle-attack-on-monster-for";
-import handleAttackingTheMonsterAgainInjectable from "./handle-attacking-the-monster-again-for";
+import handleInitialMonsterEncounterInjectable from "./handle-initial-monster-encounter.injectable";
+import handleAttackOnMonsterInjectable from "./handle-attack-on-monster.injectable";
+import handleAttackingTheMonsterAgainInjectable from "./handle-attacking-the-monster-again.injectable";
 
 export type Dependencies = {
   messageToPlayer: (message: string) => void;
diff --git a/packages/kata-for-gabriel/src/monster-beatdown.test.ts b/packages/kata-for-gabriel/src/monster-beatdown.test.ts
index 0df9457da2..4869fa72ac 100644
--- a/packages/kata-for-gabriel/src/monster-beatdown.test.ts
+++ b/packages/kata-for-gabriel/src/monster-beatdown.test.ts
@@ -1,15 +1,12 @@
-import { Dependencies, gameInjectable } from "./monster-beatdown";
+import { Dependencies, gameInjectable } from "./monster-beatdown.injectable";
 import asyncFn, { AsyncFnMock } from "@async-fn/jest";
 import { getPromiseStatus } from "@k8slens/test-utils";
 import { createContainer } from "@ogre-tools/injectable";
-import messageToPlayerInjectable from "./message-to-player";
-import castDieInjectable from "./cast-die";
-import questionToPlayerInjectable from "./question-to-player";
-import handleInitialMonsterEncounterInjectable from "./handle-initial-monster-encounter-for";
-import monsterInjectable from "./monster";
-import handleAttackOnMonsterInjectable from "./handle-attack-on-monster-for";
-import handleLandedHitOnMonsterInjectable from "./handle-landed-hit-on-monster-for";
-import handleAttackingTheMonsterAgainInjectable from "./handle-attacking-the-monster-again-for";
+import messageToPlayerInjectable from "./message-to-player.injectable";
+import castDieInjectable from "./cast-die.injectable";
+import questionToPlayerInjectable from "./question-to-player.injectable";
+import { registerFeature } from "@k8slens/feature-core";
+import { gabrielFeature } from "./feature";
 
 describe("monster-beatdown", () => {
   let game: { start: () => Promise<void> };
@@ -21,17 +18,7 @@ describe("monster-beatdown", () => {
   beforeEach(() => {
     const di = createContainer("monster-beatdown");
 
-    di.register(
-      castDieInjectable,
-      gameInjectable,
-      handleAttackOnMonsterInjectable,
-      handleAttackingTheMonsterAgainInjectable,
-      handleInitialMonsterEncounterInjectable,
-      handleLandedHitOnMonsterInjectable,
-      messageToPlayerInjectable,
-      monsterInjectable,
-      questionToPlayerInjectable,
-    );
+    registerFeature(di, gabrielFeature);
 
     messageToPlayerMock = jest.fn();
     di.override(messageToPlayerInjectable, () => messageToPlayerMock);
diff --git a/packages/kata-for-gabriel/src/monster.ts b/packages/kata-for-gabriel/src/monster.injectable.ts
similarity index 100%
rename from packages/kata-for-gabriel/src/monster.ts
rename to packages/kata-for-gabriel/src/monster.injectable.ts
diff --git a/packages/kata-for-gabriel/src/question-to-player.ts b/packages/kata-for-gabriel/src/question-to-player.injectable.ts
similarity index 100%
rename from packages/kata-for-gabriel/src/question-to-player.ts
rename to packages/kata-for-gabriel/src/question-to-player.injectable.ts