diff --git a/sc2/src/sc2code/ships/druuge/druuge.c b/sc2/src/sc2code/ships/druuge/druuge.c
index 7bc8d3401..abb5a4454 100644
--- a/sc2/src/sc2code/ships/druuge/druuge.c
+++ b/sc2/src/sc2code/ships/druuge/druuge.c
@@ -72,9 +72,9 @@ static RACE_DESC druuge_desc =
 			(FRAME)DRUUGE_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)CANNON_BIG_MASK_PMAP_ANIM,
-			(FRAME)CANNON_MED_MASK_PMAP_ANIM,
-			(FRAME)CANNON_SML_MASK_PMAP_ANIM,
+			(FRAME)DRUUGE_CANNON_BIG_MASK_PMAP_ANIM,
+			(FRAME)DRUUGE_CANNON_MED_MASK_PMAP_ANIM,
+			(FRAME)DRUUGE_CANNON_SML_MASK_PMAP_ANIM,
 		},
 		{
 			(FRAME)0,
diff --git a/sc2/src/sc2code/ships/druuge/druuge.res b/sc2/src/sc2code/ships/druuge/druuge.res
index c5022eef4..39bb86dc2 100644
--- a/sc2/src/sc2code/ships/druuge/druuge.res
+++ b/sc2/src/sc2code/ships/druuge/druuge.res
@@ -12,9 +12,9 @@ PACKAGE	DRUUGE_PACKAGE	druuge.shp
 	GFXRES		DRUUGE_BIG_MASK_PMAP_ANIM	druuge.big
 	GFXRES		DRUUGE_MED_MASK_PMAP_ANIM	druuge.med
 	GFXRES		DRUUGE_SML_MASK_PMAP_ANIM	druuge.sml
-	GFXRES		CANNON_BIG_MASK_PMAP_ANIM	canbig.ani
-	GFXRES		CANNON_MED_MASK_PMAP_ANIM	canmed.ani
-	GFXRES		CANNON_SML_MASK_PMAP_ANIM	cansml.ani
+	GFXRES		DRUUGE_CANNON_BIG_MASK_PMAP_ANIM	canbig.ani
+	GFXRES		DRUUGE_CANNON_MED_MASK_PMAP_ANIM	canmed.ani
+	GFXRES		DRUUGE_CANNON_SML_MASK_PMAP_ANIM	cansml.ani
 
 	GFXRES		DRUUGE_CAPT_MASK_PMAP_ANIM	drucap.ani
 	SNDRES		DRUUGE_SHIP_SOUNDS		drusound.snd
diff --git a/sc2/src/sc2code/ships/druuge/igfxres.h b/sc2/src/sc2code/ships/druuge/igfxres.h
index efb3c435f..64b49d289 100644
--- a/sc2/src/sc2code/ships/druuge/igfxres.h
+++ b/sc2/src/sc2code/ships/druuge/igfxres.h
@@ -3,9 +3,9 @@
 #define DRUUGE_BIG_MASK_PMAP_ANIM 0x00400202L
 #define DRUUGE_MED_MASK_PMAP_ANIM 0x00400302L
 #define DRUUGE_SML_MASK_PMAP_ANIM 0x00400402L
-#define CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
-#define CANNON_MED_MASK_PMAP_ANIM 0x00400602L
-#define CANNON_SML_MASK_PMAP_ANIM 0x00400702L
+#define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
+#define DRUUGE_CANNON_MED_MASK_PMAP_ANIM 0x00400602L
+#define DRUUGE_CANNON_SML_MASK_PMAP_ANIM 0x00400702L
 #define DRUUGE_CAPT_MASK_PMAP_ANIM 0x00400802L
 
 
diff --git a/sc2/src/sc2code/ships/yehat/igfxres.h b/sc2/src/sc2code/ships/yehat/igfxres.h
index 42c7eed71..5a0e8fe89 100644
--- a/sc2/src/sc2code/ships/yehat/igfxres.h
+++ b/sc2/src/sc2code/ships/yehat/igfxres.h
@@ -3,9 +3,9 @@
 #define YEHAT_BIG_MASK_PMAP_ANIM 0x00400202L
 #define YEHAT_MED_MASK_PMAP_ANIM 0x00400302L
 #define YEHAT_SML_MASK_PMAP_ANIM 0x00400402L
-#define CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
-#define CANNON_MED_MASK_PMAP_ANIM 0x00400602L
-#define CANNON_SML_MASK_PMAP_ANIM 0x00400702L
+#define YEHAT_CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
+#define YEHAT_CANNON_MED_MASK_PMAP_ANIM 0x00400602L
+#define YEHAT_CANNON_SML_MASK_PMAP_ANIM 0x00400702L
 #define SHIELD_BIG_MASK_ANIM 0x00400802L
 #define SHIELD_MED_MASK_ANIM 0x00400902L
 #define SHIELD_SML_MASK_ANIM 0x00400a02L
diff --git a/sc2/src/sc2code/ships/yehat/yehat.c b/sc2/src/sc2code/ships/yehat/yehat.c
index 2617743a5..e1d913df7 100644
--- a/sc2/src/sc2code/ships/yehat/yehat.c
+++ b/sc2/src/sc2code/ships/yehat/yehat.c
@@ -74,9 +74,9 @@ static RACE_DESC yehat_desc =
 			(FRAME)YEHAT_SML_MASK_PMAP_ANIM,
 		},
 		{
-			(FRAME)CANNON_BIG_MASK_PMAP_ANIM,
-			(FRAME)CANNON_MED_MASK_PMAP_ANIM,
-			(FRAME)CANNON_SML_MASK_PMAP_ANIM,
+			(FRAME)YEHAT_CANNON_BIG_MASK_PMAP_ANIM,
+			(FRAME)YEHAT_CANNON_MED_MASK_PMAP_ANIM,
+			(FRAME)YEHAT_CANNON_SML_MASK_PMAP_ANIM,
 		},
 		{
 			(FRAME)SHIELD_BIG_MASK_ANIM,
diff --git a/sc2/src/sc2code/ships/yehat/yehat.res b/sc2/src/sc2code/ships/yehat/yehat.res
index 728a70e0c..2ad3b60d3 100644
--- a/sc2/src/sc2code/ships/yehat/yehat.res
+++ b/sc2/src/sc2code/ships/yehat/yehat.res
@@ -12,9 +12,9 @@ PACKAGE	YEHAT_PACKAGE		yehat.shp
 	GFXRES		YEHAT_BIG_MASK_PMAP_ANIM	yehat.big
 	GFXRES		YEHAT_MED_MASK_PMAP_ANIM	yehat.med
 	GFXRES		YEHAT_SML_MASK_PMAP_ANIM	yehat.sml
-	GFXRES		CANNON_BIG_MASK_PMAP_ANIM	missile.big
-	GFXRES		CANNON_MED_MASK_PMAP_ANIM	missile.med
-	GFXRES		CANNON_SML_MASK_PMAP_ANIM	missile.sml
+	GFXRES		YEHAT_CANNON_BIG_MASK_PMAP_ANIM	missile.big
+	GFXRES		YEHAT_CANNON_MED_MASK_PMAP_ANIM	missile.med
+	GFXRES		YEHAT_CANNON_SML_MASK_PMAP_ANIM	missile.sml
 	GFXRES		SHIELD_BIG_MASK_ANIM		shield.big
 	GFXRES		SHIELD_MED_MASK_ANIM		shield.med
 	GFXRES		SHIELD_SML_MASK_ANIM		shield.sml