diff --git a/Source/Project64-video/Combine.cpp b/Source/Project64-video/Combine.cpp
index c8f7e18e4..1d01dfb25 100644
--- a/Source/Project64-video/Combine.cpp
+++ b/Source/Project64-video/Combine.cpp
@@ -15662,11 +15662,11 @@ void Combine()
             else
             {
                 gfxChromakeyValue(0);
-                gfxChromakeyMode(GR_CHROMAKEY_ENABLE);
+                gfxChromakeyMode(GFX_CHROMAKEY_ENABLE);
             }
         }
         else
-            gfxChromakeyMode(GR_CHROMAKEY_DISABLE);
+            gfxChromakeyMode(GFX_CHROMAKEY_DISABLE);
 
         if (aTBuff[0] && aTBuff[0]->info.format == GFX_TEXFMT_ALPHA_INTENSITY_88)
         {
@@ -15699,7 +15699,7 @@ void Combine()
         }
     }
     else
-        gfxChromakeyMode(GR_CHROMAKEY_DISABLE);
+        gfxChromakeyMode(GFX_CHROMAKEY_DISABLE);
     cmb.shade_mod_hash = (rdp.cmb_flags + rdp.cmb_flags_2) * (rdp.prim_color + rdp.env_color + rdp.K5);
 
     WriteTrace(TraceRDP, TraceDebug, " | + Combine end");
diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp
index 867a793fd..d1df95128 100644
--- a/Source/Project64-video/Renderer/OGLEScombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp
@@ -1622,15 +1622,15 @@ void gfxFogColorValue(gfxColor_t fogcolor)
 }
 
 // chroma
-void gfxChromakeyMode(GrChromakeyMode_t mode)
+void gfxChromakeyMode(gfxChromakeyMode_t mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
     switch (mode)
     {
-    case GR_CHROMAKEY_DISABLE:
+    case GFX_CHROMAKEY_DISABLE:
         g_chroma_enabled = false;
         break;
-    case GR_CHROMAKEY_ENABLE:
+    case GFX_CHROMAKEY_ENABLE:
         g_chroma_enabled = true;
         break;
     default:
diff --git a/Source/Project64-video/Renderer/OGLcombiner.cpp b/Source/Project64-video/Renderer/OGLcombiner.cpp
index 3a3a9848c..bc0b6d376 100644
--- a/Source/Project64-video/Renderer/OGLcombiner.cpp
+++ b/Source/Project64-video/Renderer/OGLcombiner.cpp
@@ -1576,15 +1576,15 @@ void gfxFogColorValue(gfxColor_t fogcolor)
 }
 
 // chroma
-void gfxChromakeyMode(GrChromakeyMode_t mode)
+void gfxChromakeyMode(gfxChromakeyMode_t mode)
 {
     WriteTrace(TraceGlitch, TraceDebug, "mode: %d", mode);
     switch (mode)
     {
-    case GR_CHROMAKEY_DISABLE:
+    case GFX_CHROMAKEY_DISABLE:
         chroma_enabled = 0;
         break;
-    case GR_CHROMAKEY_ENABLE:
+    case GFX_CHROMAKEY_ENABLE:
         chroma_enabled = 1;
         break;
     default:
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index 31da8fa82..3a991407f 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -32,7 +32,7 @@ void gfxAlphaTestFunction(gfxCmpFnc_t function);
 void gfxFogMode(gfxFogMode_t mode);
 void gfxFogGenerateLinear(float nearZ, float farZ);
 void gfxFogColorValue(gfxColor_t fogcolor);
-void gfxChromakeyMode(GrChromakeyMode_t mode);
+void gfxChromakeyMode(gfxChromakeyMode_t mode);
 void gfxChromakeyValue(gfxColor_t value);
 void gfxStippleMode(GrStippleMode_t mode);
 void gfxColorCombineExt(gfxCCUColor_t a, gfxCombineMode_t a_mode, gfxCCUColor_t b, gfxCombineMode_t b_mode, gfxCCUColor_t c, bool c_invert, gfxCCUColor_t d, bool d_invert, uint32_t shift, bool invert);
diff --git a/Source/Project64-video/Renderer/types.h b/Source/Project64-video/Renderer/types.h
index 842eb593a..76949e5cc 100644
--- a/Source/Project64-video/Renderer/types.h
+++ b/Source/Project64-video/Renderer/types.h
@@ -238,6 +238,12 @@ enum gfxChipID_t
     GFX_TMU2 = 0x2,
 };
 
+enum gfxChromakeyMode_t
+{
+    GFX_CHROMAKEY_DISABLE = 0x0,
+    GFX_CHROMAKEY_ENABLE = 0x1,
+};
+
 typedef struct
 {
     gfxLOD_t           smallLodLog2;