diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 64c5791e7..14e89edda 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -909,9 +909,9 @@ namespace bgfx
 		_frame->m_sortKeys[numRenderItems]   = key;
 		_frame->m_sortValues[numRenderItems] = numRenderItems;
 
-		m_draw.m_constBegin = _frame->m_uniformBegin;
-		m_draw.m_constEnd   = _frame->m_uniformEnd;
-		m_draw.m_stateFlags |= m_stateFlags;
+		m_draw.m_uniformBegin = _frame->m_uniformBegin;
+		m_draw.m_uniformEnd   = _frame->m_uniformEnd;
+		m_draw.m_stateFlags  |= m_stateFlags;
 
 		uint32_t numVertices = UINT32_MAX;
 		for (uint32_t idx = 0, streamMask = m_draw.m_streamMask, ntz = bx::uint32_cnttz(streamMask)
@@ -986,8 +986,8 @@ namespace bgfx
 		_frame->m_sortKeys[numRenderItems]   = key;
 		_frame->m_sortValues[numRenderItems] = numRenderItems;
 
-		m_compute.m_constBegin = _frame->m_uniformBegin;
-		m_compute.m_constEnd   = _frame->m_uniformEnd;
+		m_compute.m_uniformBegin = _frame->m_uniformBegin;
+		m_compute.m_uniformEnd   = _frame->m_uniformEnd;
 		_frame->m_renderItem[numRenderItems].compute = m_compute;
 		_frame->m_renderItemBind[numRenderItems]     = m_bind;
 
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index d6d09db77..7484e323b 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -1404,15 +1404,15 @@ namespace bgfx
 	{
 		void clear()
 		{
-			m_constBegin  = 0;
-			m_constEnd    = 0;
-			m_stateFlags  = BGFX_STATE_DEFAULT;
-			m_stencil     = packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT);
-			m_rgba        = 0;
-			m_matrix      = 0;
-			m_startIndex  = 0;
-			m_numIndices  = UINT32_MAX;
-			m_numVertices = UINT32_MAX;
+			m_uniformBegin = 0;
+			m_uniformEnd   = 0;
+			m_stateFlags   = BGFX_STATE_DEFAULT;
+			m_stencil      = packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT);
+			m_rgba         = 0;
+			m_matrix       = 0;
+			m_startIndex   = 0;
+			m_numIndices   = UINT32_MAX;
+			m_numVertices  = UINT32_MAX;
 			m_instanceDataOffset = 0;
 			m_instanceDataStride = 0;
 			m_numInstances       = 1;
@@ -1442,8 +1442,8 @@ namespace bgfx
 		uint64_t m_stateFlags;
 		uint64_t m_stencil;
 		uint32_t m_rgba;
-		uint32_t m_constBegin;
-		uint32_t m_constEnd;
+		uint32_t m_uniformBegin;
+		uint32_t m_uniformEnd;
 		uint32_t m_matrix;
 		uint32_t m_startIndex;
 		uint32_t m_numIndices;
@@ -1468,8 +1468,8 @@ namespace bgfx
 	{
 		void clear()
 		{
-			m_constBegin  = 0;
-			m_constEnd    = 0;
+			m_uniformBegin  = 0;
+			m_uniformEnd    = 0;
 			m_matrix      = 0;
 			m_numX        = 0;
 			m_numY        = 0;
@@ -1482,8 +1482,8 @@ namespace bgfx
 			m_numIndirect        = UINT16_MAX;
 		}
 
-		uint32_t m_constBegin;
-		uint32_t m_constEnd;
+		uint32_t m_uniformBegin;
+		uint32_t m_uniformEnd;
 		uint32_t m_matrix;
 		IndirectBufferHandle m_indirectBuffer;
 
diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp
index 07e24f4fb..7eb514651 100644
--- a/src/renderer_d3d11.cpp
+++ b/src/renderer_d3d11.cpp
@@ -5806,8 +5806,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 					}
 
 					bool programChanged = false;
-					bool constantsChanged = compute.m_constBegin < compute.m_constEnd;
-					rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
+					bool constantsChanged = compute.m_uniformBegin < compute.m_uniformEnd;
+					rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
 
 					if (key.m_program != programIdx)
 					{
@@ -6075,8 +6075,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 				}
 
 				bool programChanged = false;
-				bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (key.m_program != programIdx)
 				{
diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index 3c225a7be..9e8ace721 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -5315,10 +5315,10 @@ data.NumQualityLevels = 0;
 					}
 
 					bool constantsChanged = false;
-					if (compute.m_constBegin < compute.m_constEnd
+					if (compute.m_uniformBegin < compute.m_uniformEnd
 					||  currentProgramIdx != key.m_program)
 					{
-						rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
+						rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
 
 						currentProgramIdx = key.m_program;
 						ProgramD3D12& program = m_program[currentProgramIdx];
@@ -5432,7 +5432,7 @@ data.NumQualityLevels = 0;
 					primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
 				}
 
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (isValid(draw.m_stream[0].m_handle) )
 				{
@@ -5634,7 +5634,7 @@ data.NumQualityLevels = 0;
 					}
 
 					bool constantsChanged = false;
-					if (draw.m_constBegin < draw.m_constEnd
+					if (draw.m_uniformBegin < draw.m_uniformEnd
 					||  currentProgramIdx != key.m_program
 					||  BGFX_STATE_ALPHA_REF_MASK & changedFlags)
 					{
diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp
index c2e6163f0..8378506fd 100644
--- a/src/renderer_d3d9.cpp
+++ b/src/renderer_d3d9.cpp
@@ -4082,8 +4082,8 @@ namespace bgfx { namespace d3d9
 				}
 
 				bool programChanged = false;
-				bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (key.m_program != programIdx)
 				{
diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 5df567f6e..c290e3576 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -6826,8 +6826,8 @@ namespace bgfx { namespace gl
 
 						if (0 != barrier)
 						{
-							bool constantsChanged = compute.m_constBegin < compute.m_constEnd;
-							rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
+							bool constantsChanged = compute.m_uniformBegin < compute.m_uniformEnd;
+							rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
 
 							if (constantsChanged
 							&&  NULL != program.m_constantBuffer)
@@ -7240,9 +7240,9 @@ namespace bgfx { namespace gl
 				}
 
 				bool programChanged = false;
-				bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
+				bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
 				bool bindAttribs = false;
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (key.m_program != programIdx)
 				{
diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm
index 1f5cc64af..31795b312 100644
--- a/src/renderer_mtl.mm
+++ b/src/renderer_mtl.mm
@@ -3639,8 +3639,8 @@ namespace bgfx { namespace mtl
 				}
 
 				bool programChanged = false;
-				bool constantsChanged = draw.m_constBegin < draw.m_constEnd;
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				bool constantsChanged = draw.m_uniformBegin < draw.m_uniformEnd;
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (key.m_program != programIdx
 				|| (BGFX_STATE_BLEND_MASK|BGFX_STATE_BLEND_EQUATION_MASK|BGFX_STATE_ALPHA_WRITE|BGFX_STATE_RGB_WRITE|BGFX_STATE_BLEND_INDEPENDENT|BGFX_STATE_MSAA|BGFX_STATE_BLEND_ALPHA_TO_COVERAGE) & changedFlags
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index 3141f5ef1..a0de3331b 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -3958,10 +3958,10 @@ BX_UNUSED(currentSamplerStateIdx);
 //					}
 
 					bool constantsChanged = false;
-					if (compute.m_constBegin < compute.m_constEnd
+					if (compute.m_uniformBegin < compute.m_uniformEnd
 					||  currentProgramIdx != key.m_program)
 					{
-						rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_constBegin, compute.m_constEnd);
+						rendererUpdateUniforms(this, _render->m_uniformBuffer, compute.m_uniformBegin, compute.m_uniformEnd);
 
 						currentProgramIdx = key.m_program;
 						ProgramVK& program = m_program[currentProgramIdx];
@@ -4073,7 +4073,7 @@ BX_UNUSED(currentSamplerStateIdx);
 					primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
 				}
 
-				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_constBegin, draw.m_constEnd);
+				rendererUpdateUniforms(this, _render->m_uniformBuffer, draw.m_uniformBegin, draw.m_uniformEnd);
 
 				if (isValid(draw.m_stream[0].m_handle) )
 				{
@@ -4244,7 +4244,7 @@ BX_UNUSED(currentSamplerStateIdx);
 					}
 
 					bool constantsChanged = false;
-					if (draw.m_constBegin < draw.m_constEnd
+					if (draw.m_uniformBegin < draw.m_uniformEnd
 					||  currentProgramIdx != key.m_program
 					||  BGFX_STATE_ALPHA_REF_MASK & changedFlags)
 					{