ole32: Rename identifiers to remove false implications of type

[Andrew Talbot]

Changelog:
    ole32: Rename identifiers to remove false implications of type.

diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c
index 9610dbe..1577db1 100644
--- a/dlls/ole32/enumx.c
+++ b/dlls/ole32/enumx.c
@@ -37,7 +37,7 @@ typedef struct tagEnumSTATPROPSETSTG_impl
     struct list elements;
     struct list *current;
     ULONG elem_size;
-    GUID riid;
+    GUID iid;
 } enumx_impl;
 
 /************************************************************************
@@ -54,7 +54,7 @@ HRESULT WINAPI enumx_QueryInterface(
     *ppvObject = 0;
 
     if (IsEqualGUID(&IID_IUnknown, riid) ||
-        IsEqualGUID(&This->riid, riid))
+        IsEqualGUID(&This->iid, riid))
     {
         IUnknown_AddRef(((IUnknown*)This));
         *ppvObject = This;
@@ -177,7 +177,7 @@ enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size)
         enumx->ref = 1;
         enumx->current = NULL;
         enumx->elem_size = elem_size;
-        memcpy(&enumx->riid, riid, sizeof *riid);
+        memcpy(&enumx->iid, riid, sizeof *riid);
         list_init(&enumx->elements);
     }
 
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index 20d9ec3..da2262a 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -877,17 +877,17 @@ static HRESULT WINAPI IPropertyStorage_fnSetTimes(
  */
 static HRESULT WINAPI IPropertyStorage_fnSetClass(
     IPropertyStorage* iface,
-    REFCLSID clsid)
+    REFCLSID pclsid)
 {
     PropertyStorage_impl *This = (PropertyStorage_impl *)iface;
 
-    TRACE("%p, %s\n", iface, debugstr_guid(clsid));
+    TRACE("%p, %s\n", iface, debugstr_guid(pclsid));
 
-    if (!clsid)
+    if (!pclsid)
         return E_INVALIDARG;
     if (!(This->grfMode & STGM_READWRITE))
         return STG_E_ACCESSDENIED;
-    memcpy(&This->clsid, clsid, sizeof(This->clsid));
+    memcpy(&This->clsid, pclsid, sizeof(This->clsid));
     This->dirty = TRUE;
     if (This->grfFlags & PROPSETFLAG_UNBUFFERED)
         IPropertyStorage_Commit(iface, STGC_DEFAULT);