diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h
index 172cb90a0..231f2f5af 100644
--- a/renderdoc/core/core.h
+++ b/renderdoc/core/core.h
@@ -231,7 +231,7 @@ class RenderDoc
 		void TriggerCapture() { m_Cap = true; }
 
 		uint32_t GetOverlayBits() { return m_Overlay; }
-		void MaskOverlayBits(uint32_t and, uint32_t or) { m_Overlay = (m_Overlay & and) | or; }
+		void MaskOverlayBits(uint32_t And, uint32_t Or) { m_Overlay = (m_Overlay & And) | Or; }
 
 		void QueueCapture(uint32_t frameNumber) { m_QueuedFrameCaptures.insert(frameNumber); }
 
diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp
index e2a728f28..42072ab25 100644
--- a/renderdoc/replay/entry_points.cpp
+++ b/renderdoc/replay/entry_points.cpp
@@ -231,9 +231,9 @@ uint32_t RENDERDOC_CC RENDERDOC_GetOverlayBits()
 }
 
 extern "C" RENDERDOC_API
-void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t and, uint32_t or)
+void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t And, uint32_t Or)
 {
-	RenderDoc::Inst().MaskOverlayBits(and, or);
+	RenderDoc::Inst().MaskOverlayBits(And, Or);
 }
 
 extern "C" RENDERDOC_API
diff --git a/renderdoc/replay/renderdoc.h b/renderdoc/replay/renderdoc.h
index c754c939f..6af0a23f8 100644
--- a/renderdoc/replay/renderdoc.h
+++ b/renderdoc/replay/renderdoc.h
@@ -244,8 +244,8 @@ typedef bool (RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(void *wndHandle);
 extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetOverlayBits();
 typedef uint32_t (RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
 
-extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t and, uint32_t or);
-typedef void (RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t and, uint32_t or);
+extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t And, uint32_t Or);
+typedef void (RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
 
 //////////////////////////////////////////////////////////////////////////
 // Remote access and control