diff --git a/renderdoc/driver/metal/metal_command_buffer.cpp b/renderdoc/driver/metal/metal_command_buffer.cpp
index a04642cd9..48f9cb2cd 100644
--- a/renderdoc/driver/metal/metal_command_buffer.cpp
+++ b/renderdoc/driver/metal/metal_command_buffer.cpp
@@ -31,7 +31,7 @@ WrappedMTLCommandBuffer::WrappedMTLCommandBuffer(MTL::CommandBuffer *realMTLComm
                                                  ResourceId objId, WrappedMTLDevice *wrappedMTLDevice)
     : WrappedMTLObject(realMTLCommandBuffer, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
 {
-  objcBridge = AllocateObjCBridge(this);
+  m_ObjcBridge = AllocateObjCBridge(this);
 }
 
 template <typename SerialiserType>
@@ -104,7 +104,7 @@ void WrappedMTLCommandBuffer::commit()
     bool capframe = IsActiveCapturing(m_State);
     if(capframe)
     {
-      record->AddRef();
+      bufferRecord->AddRef();
       bufferRecord->MarkResourceFrameReferenced(GetResID(m_WrappedMTLCommandQueue), eFrameRef_Read);
       // pull in frame refs from this command buffer
       bufferRecord->AddResourceReferences(GetResourceManager());
diff --git a/renderdoc/driver/metal/metal_command_queue.cpp b/renderdoc/driver/metal/metal_command_queue.cpp
index 7c08fd5d9..c04af2f59 100644
--- a/renderdoc/driver/metal/metal_command_queue.cpp
+++ b/renderdoc/driver/metal/metal_command_queue.cpp
@@ -30,7 +30,7 @@ WrappedMTLCommandQueue::WrappedMTLCommandQueue(MTL::CommandQueue *realMTLCommand
                                                ResourceId objId, WrappedMTLDevice *wrappedMTLDevice)
     : WrappedMTLObject(realMTLCommandQueue, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
 {
-  objcBridge = AllocateObjCBridge(this);
+  m_ObjcBridge = AllocateObjCBridge(this);
 }
 
 template <typename SerialiserType>
diff --git a/renderdoc/driver/metal/metal_device.cpp b/renderdoc/driver/metal/metal_device.cpp
index f075fa882..30da35e5f 100644
--- a/renderdoc/driver/metal/metal_device.cpp
+++ b/renderdoc/driver/metal/metal_device.cpp
@@ -31,7 +31,7 @@
 WrappedMTLDevice::WrappedMTLDevice(MTL::Device *realMTLDevice, ResourceId objId)
     : WrappedMTLObject(realMTLDevice, objId, this, GetStateRef())
 {
-  objcBridge = AllocateObjCBridge(this);
+  m_ObjcBridge = AllocateObjCBridge(this);
   m_WrappedMTLDevice = this;
   threadSerialiserTLSSlot = Threading::AllocateTLSSlot();
 
diff --git a/renderdoc/driver/metal/metal_function.cpp b/renderdoc/driver/metal/metal_function.cpp
index 6bcbc56a8..be5f68756 100644
--- a/renderdoc/driver/metal/metal_function.cpp
+++ b/renderdoc/driver/metal/metal_function.cpp
@@ -29,5 +29,5 @@ WrappedMTLFunction::WrappedMTLFunction(MTL::Function *realMTLFunction, ResourceI
                                        WrappedMTLDevice *wrappedMTLDevice)
     : WrappedMTLObject(realMTLFunction, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
 {
-  objcBridge = AllocateObjCBridge(this);
+  m_ObjcBridge = AllocateObjCBridge(this);
 }
diff --git a/renderdoc/driver/metal/metal_init_state.cpp b/renderdoc/driver/metal/metal_init_state.cpp
index 80754b92b..0e2d27f0f 100644
--- a/renderdoc/driver/metal/metal_init_state.cpp
+++ b/renderdoc/driver/metal/metal_init_state.cpp
@@ -29,7 +29,7 @@ bool WrappedMTLDevice::Prepare_InitialState(WrappedMTLObject *res)
 {
   ResourceId id = GetResourceManager()->GetID(res);
 
-  MetalResourceType type = res->record->resType;
+  MetalResourceType type = res->m_Record->m_Type;
   {
     RDCERR("Unhandled resource type %d", type);
   }
diff --git a/renderdoc/driver/metal/metal_library.cpp b/renderdoc/driver/metal/metal_library.cpp
index 364809d9a..e3b33559c 100644
--- a/renderdoc/driver/metal/metal_library.cpp
+++ b/renderdoc/driver/metal/metal_library.cpp
@@ -30,7 +30,7 @@ WrappedMTLLibrary::WrappedMTLLibrary(MTL::Library *realMTLLibrary, ResourceId ob
                                      WrappedMTLDevice *wrappedMTLDevice)
     : WrappedMTLObject(realMTLLibrary, objId, wrappedMTLDevice, wrappedMTLDevice->GetStateRef())
 {
-  objcBridge = AllocateObjCBridge(this);
+  m_ObjcBridge = AllocateObjCBridge(this);
 }
 
 template <typename SerialiserType>
diff --git a/renderdoc/driver/metal/metal_manager.h b/renderdoc/driver/metal/metal_manager.h
index b8d88d9cd..d3c77b8a4 100644
--- a/renderdoc/driver/metal/metal_manager.h
+++ b/renderdoc/driver/metal/metal_manager.h
@@ -95,7 +95,7 @@ public:
     if(res == NULL)
       return ResourceId();
 
-    return res->id;
+    return res->m_ID;
   }
   // ResourceManager interface
 
@@ -108,7 +108,7 @@ public:
     ResourceId id = ResourceIDGen::GetNewUniqueID();
     using WrappedType = typename UnwrapHelper<realtype>::Outer;
     wrapped = new WrappedType(obj, id, m_WrappedMTLDevice);
-    wrapped->real = obj;
+    wrapped->m_Real = obj;
     AddCurrentResource(id, wrapped);
 
     // TODO: implement RD MTL replay
@@ -122,10 +122,10 @@ public:
   template <typename wrappedtype>
   MetalResourceRecord *AddResourceRecord(wrappedtype *wrapped)
   {
-    MetalResourceRecord *ret = wrapped->record = ResourceManager::AddResourceRecord(wrapped->id);
+    MetalResourceRecord *ret = wrapped->m_Record = ResourceManager::AddResourceRecord(wrapped->m_ID);
 
-    ret->Resource = (WrappedMTLObject *)wrapped;
-    ret->resType = (MetalResourceType)wrappedtype::TypeEnum;
+    ret->m_Resource = (WrappedMTLObject *)wrapped;
+    ret->m_Type = (MetalResourceType)wrappedtype::TypeEnum;
     return ret;
   }
 
diff --git a/renderdoc/driver/metal/metal_resources.cpp b/renderdoc/driver/metal/metal_resources.cpp
index 2a4a30719..fcc24d80c 100644
--- a/renderdoc/driver/metal/metal_resources.cpp
+++ b/renderdoc/driver/metal/metal_resources.cpp
@@ -34,7 +34,7 @@ ResourceId GetResID(WrappedMTLObject *obj)
   if(obj == NULL)
     return ResourceId();
 
-  return obj->id;
+  return obj->m_ID;
 }
 
 #define IMPLEMENT_WRAPPED_TYPE_HELPERS(CPPTYPE)                                          \
@@ -64,6 +64,6 @@ MTL::Device *WrappedMTLObject::GetObjCBridgeMTLDevice()
 
 MetalResourceRecord::~MetalResourceRecord()
 {
-  if(resType == eResCommandBuffer)
+  if(m_Type == eResCommandBuffer)
     SAFE_DELETE(cmdInfo);
 }
diff --git a/renderdoc/driver/metal/metal_resources.h b/renderdoc/driver/metal/metal_resources.h
index 369c9498d..0a70d15c3 100644
--- a/renderdoc/driver/metal/metal_resources.h
+++ b/renderdoc/driver/metal/metal_resources.h
@@ -48,19 +48,19 @@ struct WrappedMTLObject
 {
   WrappedMTLObject() = delete;
   WrappedMTLObject(WrappedMTLDevice *wrappedMTLDevice, CaptureState &captureState)
-      : objcBridge(NULL),
-        real(NULL),
-        record(NULL),
+      : m_ObjcBridge(NULL),
+        m_Real(NULL),
+        m_Record(NULL),
         m_WrappedMTLDevice(wrappedMTLDevice),
         m_State(captureState)
   {
   }
   WrappedMTLObject(void *mtlObject, ResourceId objId, WrappedMTLDevice *wrappedMTLDevice,
                    CaptureState &captureState)
-      : objcBridge(NULL),
-        real(mtlObject),
-        id(objId),
-        record(NULL),
+      : m_ObjcBridge(NULL),
+        m_Real(mtlObject),
+        m_ID(objId),
+        m_Record(NULL),
         m_WrappedMTLDevice(wrappedMTLDevice),
         m_State(captureState)
   {
@@ -73,10 +73,10 @@ struct WrappedMTLObject
 
   MetalResourceManager *GetResourceManager();
 
-  void *objcBridge;
-  void *real;
-  ResourceId id;
-  MetalResourceRecord *record;
+  void *m_ObjcBridge;
+  void *m_Real;
+  ResourceId m_ID;
+  MetalResourceRecord *m_Record;
   WrappedMTLDevice *m_WrappedMTLDevice;
   CaptureState &m_State;
 };
@@ -89,7 +89,7 @@ MetalResourceRecord *GetRecord(WrappedType *obj)
   if(obj == NULL)
     return NULL;
 
-  return obj->record;
+  return obj->m_Record;
 }
 
 template <typename RealType>
@@ -98,7 +98,7 @@ RealType Unwrap(WrappedMTLObject *obj)
   if(obj == NULL)
     return RealType();
 
-  return (RealType)obj->real;
+  return (RealType)obj->m_Real;
 }
 
 template <typename RealType>
@@ -107,7 +107,7 @@ RealType GetObjCBridge(WrappedMTLObject *obj)
   if(obj == NULL)
     return RealType();
 
-  return (RealType)obj->objcBridge;
+  return (RealType)obj->m_ObjcBridge;
 }
 
 // template magic voodoo to unwrap types
@@ -158,12 +158,12 @@ public:
   };
 
   MetalResourceRecord(ResourceId id)
-      : ResourceRecord(id, true), Resource(NULL), resType(eResUnknown), ptrUnion(NULL)
+      : ResourceRecord(id, true), m_Resource(NULL), m_Type(eResUnknown), ptrUnion(NULL)
   {
   }
   ~MetalResourceRecord();
-  WrappedMTLObject *Resource;
-  MetalResourceType resType;
+  WrappedMTLObject *m_Resource;
+  MetalResourceType m_Type;
 
   // Each entry is only used by specific record types
   union
diff --git a/renderdoc/driver/metal/metal_types_bridge.mm b/renderdoc/driver/metal/metal_types_bridge.mm
index 6d6645bcf..20b8ca813 100644
--- a/renderdoc/driver/metal/metal_types_bridge.mm
+++ b/renderdoc/driver/metal/metal_types_bridge.mm
@@ -67,7 +67,7 @@
     {                                                                              \
       return ResourceId();                                                         \
     }                                                                              \
-    return wrappedCPP->id;                                                         \
+    return wrappedCPP->m_ID;                                                       \
   }                                                                                \
                                                                                    \
   MTL::CPPTYPE *AllocateObjCBridge(WrappedMTL##CPPTYPE *wrappedCPP)                \