diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 14e89edda..16fd5f52f 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -968,8 +968,8 @@ namespace bgfx
 
 		_frame->m_uniformEnd = _frame->m_uniformBuffer->getPos();
 
-		m_compute.m_matrix = m_draw.m_matrix;
-		m_compute.m_num    = m_draw.m_num;
+		m_compute.m_startMatrix = m_draw.m_startMatrix;
+		m_compute.m_numMatrices = m_draw.m_numMatrices;
 		m_compute.m_numX   = bx::uint32_max(_numX, 1);
 		m_compute.m_numY   = bx::uint32_max(_numY, 1);
 		m_compute.m_numZ   = bx::uint32_max(_numZ, 1);
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 7484e323b..674133701 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -1409,7 +1409,7 @@ namespace bgfx
 			m_stateFlags   = BGFX_STATE_DEFAULT;
 			m_stencil      = packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT);
 			m_rgba         = 0;
-			m_matrix       = 0;
+			m_startMatrix  = 0;
 			m_startIndex   = 0;
 			m_numIndices   = UINT32_MAX;
 			m_numVertices  = UINT32_MAX;
@@ -1418,7 +1418,7 @@ namespace bgfx
 			m_numInstances       = 1;
 			m_startIndirect = 0;
 			m_numIndirect   = UINT16_MAX;
-			m_num           = 1;
+			m_numMatrices   = 1;
 			m_submitFlags   = BGFX_SUBMIT_EYE_FIRST;
 			m_scissor       = UINT16_MAX;
 			m_streamMask    = 0;
@@ -1444,7 +1444,7 @@ namespace bgfx
 		uint32_t m_rgba;
 		uint32_t m_uniformBegin;
 		uint32_t m_uniformEnd;
-		uint32_t m_matrix;
+		uint32_t m_startMatrix;
 		uint32_t m_startIndex;
 		uint32_t m_numIndices;
 		uint32_t m_numVertices;
@@ -1453,7 +1453,7 @@ namespace bgfx
 		uint16_t m_instanceDataStride;
 		uint16_t m_startIndirect;
 		uint16_t m_numIndirect;
-		uint16_t m_num;
+		uint16_t m_numMatrices;
 		uint16_t m_scissor;
 		uint8_t  m_submitFlags;
 		uint8_t  m_streamMask;
@@ -1468,14 +1468,14 @@ namespace bgfx
 	{
 		void clear()
 		{
-			m_uniformBegin  = 0;
-			m_uniformEnd    = 0;
-			m_matrix      = 0;
-			m_numX        = 0;
-			m_numY        = 0;
-			m_numZ        = 0;
-			m_num         = 0;
-			m_submitFlags = BGFX_SUBMIT_EYE_FIRST;
+			m_uniformBegin = 0;
+			m_uniformEnd   = 0;
+			m_startMatrix  = 0;
+			m_numX         = 0;
+			m_numY         = 0;
+			m_numZ         = 0;
+			m_numMatrices  = 0;
+			m_submitFlags  = BGFX_SUBMIT_EYE_FIRST;
 
 			m_indirectBuffer.idx = kInvalidHandle;
 			m_startIndirect      = 0;
@@ -1484,7 +1484,7 @@ namespace bgfx
 
 		uint32_t m_uniformBegin;
 		uint32_t m_uniformEnd;
-		uint32_t m_matrix;
+		uint32_t m_startMatrix;
 		IndirectBufferHandle m_indirectBuffer;
 
 		uint32_t m_numX;
@@ -1492,7 +1492,7 @@ namespace bgfx
 		uint32_t m_numZ;
 		uint16_t m_startIndirect;
 		uint16_t m_numIndirect;
-		uint16_t m_num;
+		uint16_t m_numMatrices;
 		uint8_t  m_submitFlags;
 	};
 
@@ -1931,10 +1931,10 @@ namespace bgfx
 
 		uint32_t setTransform(FrameCache& _frameCache, const void* _mtx, uint16_t _num)
 		{
-			m_draw.m_matrix = _frameCache.m_matrixCache.add(_mtx, _num);
-			m_draw.m_num    = _num;
+			m_draw.m_startMatrix = _frameCache.m_matrixCache.add(_mtx, _num);
+			m_draw.m_numMatrices = _num;
 
-			return m_draw.m_matrix;
+			return m_draw.m_startMatrix;
 		}
 
 		uint32_t allocTransform(FrameCache& _frameCache, Transform* _transform, uint16_t _num)
@@ -1952,8 +1952,8 @@ namespace bgfx
 				, _cache
 				, BGFX_CONFIG_MAX_MATRIX_CACHE
 				);
-			m_draw.m_matrix = _cache;
-			m_draw.m_num    = uint16_t(bx::uint32_min(_cache+_num, BGFX_CONFIG_MAX_MATRIX_CACHE-1) - _cache);
+			m_draw.m_startMatrix = _cache;
+			m_draw.m_numMatrices = uint16_t(bx::uint32_min(_cache+_num, BGFX_CONFIG_MAX_MATRIX_CACHE-1) - _cache);
 		}
 
 		void setIndexBuffer(IndexBufferHandle _handle, uint32_t _firstIndex, uint32_t _numIndices)
diff --git a/src/renderer.h b/src/renderer.h
index eb670319f..1e8cda0f0 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -236,11 +236,11 @@ namespace bgfx
 
 				case PredefinedUniform::Model:
 					{
-						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_matrix];
+						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_startMatrix];
 						_renderer->setShaderUniform4x4f(flags
 							, predefined.m_loc
 							, model.un.val
-							, bx::uint32_min(_draw.m_num*mtxRegs, predefined.m_count)
+							, bx::uint32_min(_draw.m_numMatrices*mtxRegs, predefined.m_count)
 							);
 					}
 					break;
@@ -248,7 +248,7 @@ namespace bgfx
 				case PredefinedUniform::ModelView:
 					{
 						Matrix4 modelView;
-						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_matrix];
+						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_startMatrix];
 						bx::float4x4_mul(&modelView.un.f4x4
 							, &model.un.f4x4
 							, &m_view[_eye][_view].un.f4x4
@@ -264,7 +264,7 @@ namespace bgfx
 				case PredefinedUniform::ModelViewProj:
 					{
 						Matrix4 modelViewProj;
-						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_matrix];
+						const Matrix4& model = frameCache.m_matrixCache.m_cache[_draw.m_startMatrix];
 						bx::float4x4_mul(&modelViewProj.un.f4x4
 							, &model.un.f4x4
 							, &m_viewProj[_eye][_view].un.f4x4