diff --git a/wadsrc/static/filter/nam/rmapinfo.spawnclasses b/wadsrc/static/filter/nam/rmapinfo.spawnclasses
new file mode 100644
index 000000000..d58c66a1e
--- /dev/null
+++ b/wadsrc/static/filter/nam/rmapinfo.spawnclasses
@@ -0,0 +1,7 @@
+spawnclasses
+{
+	2556 = NamShrinker
+	2533 = NamShell, noskill
+	2535 = NamShotgunShell, noskill
+}
+
diff --git a/wadsrc/static/filter/ww2gi/rmapinfo.spawnclasses b/wadsrc/static/filter/ww2gi/rmapinfo.spawnclasses
index 258767dee..be42b3af7 100644
--- a/wadsrc/static/filter/ww2gi/rmapinfo.spawnclasses
+++ b/wadsrc/static/filter/ww2gi/rmapinfo.spawnclasses
@@ -1,5 +1,8 @@
 spawnclasses
 {
+	2556 = NamShrinker
+	2533 = NamShell, noskill
+	2535 = NamShotgunShell, noskill
 	2595 = WW2GIShotSpark, noskill
 	2613 = WW2GIShotgunShot, noskill
 	2536 = WW2GIChaingunShot, noskill
diff --git a/wadsrc/static/zscript/games/duke/actors/shell.zs b/wadsrc/static/zscript/games/duke/actors/shell.zs
index dada063c4..49a930ee7 100644
--- a/wadsrc/static/zscript/games/duke/actors/shell.zs
+++ b/wadsrc/static/zscript/games/duke/actors/shell.zs
@@ -53,7 +53,7 @@ class DukeShell : DukeActor
 	
 	override void Initialize()
 	{
-		initshell(true, Raze.isNamWW2GI()? 1.875 : -1.25);
+		initshell(true, -1.25);
 	}
 
 	override void Tick()
@@ -112,15 +112,26 @@ class DukeShell : DukeActor
 	}
 }
 
+class NamShell : DukeShell
+{
+	override void Initialize()
+	{
+		initshell(true, 1.875);
+	}
+}
+
 class DukeShotgunShell : DukeShell
 {
 	default
 	{
 		spriteset "SHOTGUNSHELL";
 	}
-	
-	override void Initialize()
+}
+
+class NamShotgunShell : NamShell
+{
+	default
 	{
-		initshell(false, Raze.isNamWW2GI()? 1.875 : -1.25);
+		spriteset "SHOTGUNSHELL";
 	}
 }