diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c
index ee620ef090b..71910bb2e74 100644
--- a/reactos/win32ss/gdi/eng/engwindow.c
+++ b/reactos/win32ss/gdi/eng/engwindow.c
@@ -208,7 +208,7 @@ EngCreateWnd(
     Clip->PixelFormat = iPixelFormat;
 
     /* associate object with window */
-    IntSetProp(Window, AtomWndObj, Clip);
+    UserSetProp(Window, AtomWndObj, Clip);
     ++gcountPWO;
 
     TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser);
@@ -253,7 +253,7 @@ EngDeleteWnd(
     else
     {
         /* Remove object from window */
-        IntRemoveProp(Window, AtomWndObj);
+        UserRemoveProp(Window, AtomWndObj);
     }
     --gcountPWO;
 
diff --git a/reactos/win32ss/user/ntuser/dde.c b/reactos/win32ss/user/ntuser/dde.c
index 5a3be1ea256..3850bd9d2ee 100644
--- a/reactos/win32ss/user/ntuser/dde.c
+++ b/reactos/win32ss/user/ntuser/dde.c
@@ -348,7 +348,7 @@ IntDdeGetMessageHook(PMSG pMsg, LONG_PTR ExtraInfo)
             ERR("DDE Get Client WM_DDE_TERMINATE\n");
          }
 
-         IntRemoveProp(pWnd, AtomDDETrack);
+         UserRemoveProp(pWnd, AtomDDETrack);
          ExFreePoolWithTag(pddeProp, USERTAG_DDE1);
       }
       return TRUE;
@@ -419,7 +419,7 @@ IntDdeSendMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
       pddeProp->spwnd        = pWndServer;
       pddeProp->spwndPartner = pWnd;
 
-      IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp);
+      UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp);
    }
    return TRUE;
 }
diff --git a/reactos/win32ss/user/ntuser/defwnd.c b/reactos/win32ss/user/ntuser/defwnd.c
index 987dbb822ce..044d6f6c92e 100644
--- a/reactos/win32ss/user/ntuser/defwnd.c
+++ b/reactos/win32ss/user/ntuser/defwnd.c
@@ -460,8 +460,8 @@ DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
             break;
     }
 
-    IntSetProp(pWnd, gpsi->atomIconProp, hIcon);
-    IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall);
+    UserSetProp(pWnd, gpsi->atomIconProp, hIcon);
+    UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall);
 
     if ((pWnd->style & WS_CAPTION ) == WS_CAPTION)
        UserPaintCaption(pWnd, DC_ICON);
diff --git a/reactos/win32ss/user/ntuser/layered.c b/reactos/win32ss/user/ntuser/layered.c
index 47cd3e8bfdb..ff927e84566 100644
--- a/reactos/win32ss/user/ntuser/layered.c
+++ b/reactos/win32ss/user/ntuser/layered.c
@@ -68,7 +68,7 @@ IntSetLayeredWindowAttributes(PWND pWnd,
          return FALSE;
       }
       RtlZeroMemory(pLrdProp, sizeof(LRD_PROP));
-      IntSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp);
+      UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp);
    }
 
    if (pLrdProp)
diff --git a/reactos/win32ss/user/ntuser/painting.c b/reactos/win32ss/user/ntuser/painting.c
index 1a8d63bfac2..f5d82fda247 100644
--- a/reactos/win32ss/user/ntuser/painting.c
+++ b/reactos/win32ss/user/ntuser/painting.c
@@ -1267,7 +1267,7 @@ IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi)
          IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE);
       }
 
-      IntRemoveProp(pWnd, AtomFlashWndState);
+      UserRemoveProp(pWnd, AtomFlashWndState);
    }
    else
    {  // Have a count and started, set timer.
@@ -1305,7 +1305,7 @@ IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi)
          FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER);
       }
       FlashState = MAKELONG(LOWORD(FlashState),uCount);
-      IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState);
+      UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState);
    }
    return Ret;
 }
diff --git a/reactos/win32ss/user/ntuser/prop.c b/reactos/win32ss/user/ntuser/prop.c
index cf5b1cc84cd..4429dbe9789 100644
--- a/reactos/win32ss/user/ntuser/prop.c
+++ b/reactos/win32ss/user/ntuser/prop.c
@@ -60,7 +60,7 @@ UserGetProp(
 _Success_(return)
 HANDLE
 FASTCALL
-IntRemoveProp(
+UserRemoveProp(
     _In_ PWND Window,
     _In_ ATOM Atom)
 {
@@ -84,7 +84,7 @@ IntRemoveProp(
 _Success_(return)
 BOOL
 FASTCALL
-IntSetProp(
+UserSetProp(
     _In_ PWND Window,
     _In_ ATOM Atom,
     _In_ HANDLE Data)
@@ -111,7 +111,7 @@ IntSetProp(
 
 VOID
 FASTCALL
-IntRemoveWindowProp(
+UserRemoveWindowProps(
     _In_ PWND Window)
 {
     PLIST_ENTRY ListEntry;
@@ -228,7 +228,7 @@ NtUserRemoveProp(
         goto Exit;
     }
 
-    Data = IntRemoveProp(Window, Atom);
+    Data = UserRemoveProp(Window, Atom);
 
 Exit:
     TRACE("Leave NtUserRemoveProp, ret=%p\n", Data);
@@ -257,7 +257,7 @@ NtUserSetProp(
         goto Exit;
     }
 
-    Ret = IntSetProp(Window, Atom, Data);
+    Ret = UserSetProp(Window, Atom, Data);
 
 Exit:
     TRACE("Leave NtUserSetProp, ret=%i\n", Ret);
diff --git a/reactos/win32ss/user/ntuser/prop.h b/reactos/win32ss/user/ntuser/prop.h
index bd100405bef..8d832748b05 100644
--- a/reactos/win32ss/user/ntuser/prop.h
+++ b/reactos/win32ss/user/ntuser/prop.h
@@ -8,19 +8,19 @@ UserGetProp(
 
 HANDLE
 FASTCALL
-IntRemoveProp(
+UserRemoveProp(
     _In_ PWND Window,
     _In_ ATOM Atom);
 
 _Success_(return)
 BOOL
 FASTCALL
-IntSetProp(
+UserSetProp(
     _In_ PWND Window,
     _In_ ATOM Atom,
     _In_ HANDLE Data);
 
 VOID
 FASTCALL
-IntRemoveWindowProp(
+UserRemoveWindowProps(
     _In_ PWND Window);
diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
index e5e73da80cf..7fef2c7961b 100644
--- a/reactos/win32ss/user/ntuser/simplecall.c
+++ b/reactos/win32ss/user/ntuser/simplecall.c
@@ -666,9 +666,9 @@ NtUserCallHwndParam(
          }
 
          if ( Param )
-            IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param);
+            UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param);
          else
-            IntRemoveProp(Window, gpsi->atomContextHelpIdProp);
+            UserRemoveProp(Window, gpsi->atomContextHelpIdProp);
 
          UserLeave();
          return TRUE;
diff --git a/reactos/win32ss/user/ntuser/window.c b/reactos/win32ss/user/ntuser/window.c
index 8857b7c9467..46baca6d7fd 100644
--- a/reactos/win32ss/user/ntuser/window.c
+++ b/reactos/win32ss/user/ntuser/window.c
@@ -630,7 +630,7 @@ LRESULT co_UserFreeWindow(PWND Window,
 
    if (Window->PropListItems)
    {
-      IntRemoveWindowProp(Window);
+      UserRemoveWindowProps(Window);
       TRACE("Window->PropListItems %lu\n",Window->PropListItems);
       ASSERT(Window->PropListItems==0);
    }