diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 7921eb9927f..86cac7eaded 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -193,34 +193,34 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
-#define IDirect3DRMObject_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirect3DRMObject_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirect3DRMObject_Release(p)                   (p)->lpVtbl->Release(p)
+#define IDirect3DRMObject2_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DRMObject2_AddRef(p)                    (p)->lpVtbl->AddRef(p)
+#define IDirect3DRMObject2_Release(p)                   (p)->lpVtbl->Release(p)
 /*** IDirect3DRMObject2 methods ***/
-#define IDirect3DRMObject_AddDestroyCallback(p,a,b)    (p)->lpVtbl->AddDestroyCallback(p,a,b)
-#define IDirect3DRMObject_Clone(p,a,b,c)               (p)->lpVtbl->Clone(p,a,b,c)
-#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
-#define IDirect3DRMObject_GetClientData(p,a,b)         (p)->lpVtbl->SetClientData(p,a,b)
-#define IDirect3DRMObject_GetDirect3DRM(p,a)           (p)->lpVtbl->GetDirect3DRM(p,a)
-#define IDirect3DRMObject_GetName(p,a,b)               (p)->lpVtbl->GetName(p,a,b)
-#define IDirect3DRMObject_SetClientData(p,a,b,c)       (p)->lpVtbl->SetClientData(p,a,b,c)
-#define IDirect3DRMObject_SetName(p,a)                 (p)->lpVtbl->SetName(p,a)
-#define IDirect3DRMObject_GetAge(p,a,b)                (p)->lpVtbl->GetAge(p,a,b)
+#define IDirect3DRMObject2_AddDestroyCallback(p,a,b)    (p)->lpVtbl->AddDestroyCallback(p,a,b)
+#define IDirect3DRMObject2_Clone(p,a,b,c)               (p)->lpVtbl->Clone(p,a,b,c)
+#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b)
+#define IDirect3DRMObject2_GetClientData(p,a,b)         (p)->lpVtbl->SetClientData(p,a,b)
+#define IDirect3DRMObject2_GetDirect3DRM(p,a)           (p)->lpVtbl->GetDirect3DRM(p,a)
+#define IDirect3DRMObject2_GetName(p,a,b)               (p)->lpVtbl->GetName(p,a,b)
+#define IDirect3DRMObject2_SetClientData(p,a,b,c)       (p)->lpVtbl->SetClientData(p,a,b,c)
+#define IDirect3DRMObject2_SetName(p,a)                 (p)->lpVtbl->SetName(p,a)
+#define IDirect3DRMObject2_GetAge(p,a,b)                (p)->lpVtbl->GetAge(p,a,b)
 #else
 /*** IUnknown methods ***/
-#define IDirect3DRMObject_QueryInterface(p,a,b)        (p)->QueryInterface(a,b)
-#define IDirect3DRMObject_AddRef(p)                    (p)->AddRef()
-#define IDirect3DRMObject_Release(p)                   (p)->Release()
+#define IDirect3DRMObject2_QueryInterface(p,a,b)        (p)->QueryInterface(a,b)
+#define IDirect3DRMObject2_AddRef(p)                    (p)->AddRef()
+#define IDirect3DRMObject2_Release(p)                   (p)->Release()
 /*** IDirect3DRMObject2 methods ***/
-#define IDirect3DRMObject_AddDestroyCallback(p,a,b)    (p)->AddDestroyCallback(a,b)
-#define IDirect3DRMObject_Clone(p,a,b,c)               (p)->Clone(a,b,c)
-#define IDirect3DRMObject_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)
-#define IDirect3DRMObject_GetClientData(p,a,b)         (p)->SetClientData(a,b)
-#define IDirect3DRMObject_GetDirect3DRM(p,a)           (p)->GetDirect3DRM(a)
-#define IDirect3DRMObject_GetName(p,a,b)               (p)->GetName(a,b)
-#define IDirect3DRMObject_SetClientData(p,a,b,c)       (p)->SetClientData(a,b,c)
-#define IDirect3DRMObject_SetName(p,a)                 (p)->SetName(a)
-#define IDirect3DRMObject_GetAge(p,a,b)                (p)->GetAge(a,b)
+#define IDirect3DRMObject2_AddDestroyCallback(p,a,b)    (p)->AddDestroyCallback(a,b)
+#define IDirect3DRMObject2_Clone(p,a,b,c)               (p)->Clone(a,b,c)
+#define IDirect3DRMObject2_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b)
+#define IDirect3DRMObject2_GetClientData(p,a,b)         (p)->SetClientData(a,b)
+#define IDirect3DRMObject2_GetDirect3DRM(p,a)           (p)->GetDirect3DRM(a)
+#define IDirect3DRMObject2_GetName(p,a,b)               (p)->GetName(a,b)
+#define IDirect3DRMObject2_SetClientData(p,a,b,c)       (p)->SetClientData(a,b,c)
+#define IDirect3DRMObject2_SetName(p,a)                 (p)->SetName(a)
+#define IDirect3DRMObject2_GetAge(p,a,b)                (p)->GetAge(a,b)
 #endif
 
 /*****************************************************************************