diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp
index 040c63479..66e9ca464 100644
--- a/Source/Project64-video/Main.cpp
+++ b/Source/Project64-video/Main.cpp
@@ -687,7 +687,7 @@ void CALL ReadScreen(void **dest, int *width, int *height)
 
     GrLfbInfo_t info;
     info.size = sizeof(GrLfbInfo_t);
-    if (grLfbLock(GR_LFB_READ_ONLY,
+    if (gfxLfbLock(GR_LFB_READ_ONLY,
         GR_BUFFER_FRONTBUFFER,
         GR_LFBWRITEMODE_565,
         GR_ORIGIN_UPPER_LEFT,
@@ -739,7 +739,7 @@ void CALL ReadScreen(void **dest, int *width, int *height)
             }
         }
         // Unlock the frontbuffer
-        grLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_FRONTBUFFER);
+        gfxLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_FRONTBUFFER);
     }
     WriteTrace(TraceGlide64, TraceDebug, "Success");
 }
@@ -1350,7 +1350,7 @@ void newSwapBuffers()
 
         GrLfbInfo_t info;
         info.size = sizeof(GrLfbInfo_t);
-        if (grLfbLock(GR_LFB_READ_ONLY, GR_BUFFER_BACKBUFFER, GR_LFBWRITEMODE_565, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info))
+        if (gfxLfbLock(GR_LFB_READ_ONLY, GR_BUFFER_BACKBUFFER, GR_LFBWRITEMODE_565, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info))
         {
             AUTO_PTR<uint8_t> ssimg_buffer(new uint8_t[image_width * image_height * 3]);
             uint8_t * ssimg = ssimg_buffer.get();
@@ -1393,7 +1393,7 @@ void newSwapBuffers()
                 }
             }
             // Unlock the backbuffer
-            grLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_BACKBUFFER);
+            gfxLfbUnlock(GR_LFB_READ_ONLY, GR_BUFFER_BACKBUFFER);
             write_png_file(path, image_width, image_height, ssimg);
             g_capture_screen = false;
         }
diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
index de8783fc0..0a02cfc2d 100644
--- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp
@@ -1460,13 +1460,12 @@ FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode,
     return FXTRUE;
 }
 
-FX_ENTRY FxBool FX_CALL
-grLfbUnlock(GrLock_t type, GrBuffer_t buffer)
+FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer)
 {
     WriteTrace(TraceGlitch, TraceDebug, "type: %d, buffer: %d", type, buffer);
     if (type == GR_LFB_WRITE_ONLY)
     {
-        WriteTrace(TraceGlitch, TraceWarning, "grLfbUnlock : write only");
+        WriteTrace(TraceGlitch, TraceWarning, "gfxLfbUnlock : write only");
     }
     return FXTRUE;
 }
diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp
index e3d17eee8..6ca1074c7 100644
--- a/Source/Project64-video/Renderer/OGLglitchmain.cpp
+++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp
@@ -1722,13 +1722,12 @@ FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode,
     return FXTRUE;
 }
 
-FX_ENTRY FxBool FX_CALL
-grLfbUnlock(GrLock_t type, GrBuffer_t buffer)
+FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer)
 {
     WriteTrace(TraceGlitch, TraceDebug, "type: %d, buffer: %d", type, buffer);
     if (type == GR_LFB_WRITE_ONLY)
     {
-        WriteTrace(TraceGlitch, TraceWarning, "grLfbUnlock : write only");
+        WriteTrace(TraceGlitch, TraceWarning, "gfxLfbUnlock : write only");
     }
     return FXTRUE;
 }
diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h
index aceb32bb2..4700f7529 100644
--- a/Source/Project64-video/Renderer/Renderer.h
+++ b/Source/Project64-video/Renderer/Renderer.h
@@ -60,6 +60,7 @@ void gfxRenderBuffer(GrBuffer_t buffer);
 void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth);
 void gfxBufferSwap(FxU32 swap_interval);
 FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info);
+FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer);
 
 extern uint32_t nbTextureUnits;
 extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;
diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp
index a532a24d2..b6cf9c139 100644
--- a/Source/Project64-video/rdp.cpp
+++ b/Source/Project64-video/rdp.cpp
@@ -702,7 +702,7 @@ static void CopyFrameBuffer(GrBuffer_t buffer = GR_BUFFER_BACKBUFFER)
                 }
 
                 // Unlock the backbuffer
-                grLfbUnlock(GR_LFB_READ_ONLY, buffer);
+                gfxLfbUnlock(GR_LFB_READ_ONLY, buffer);
                 WriteTrace(TraceRDP, TraceDebug, "LfbLock.  Framebuffer copy complete.");
             }
             else