diff --git a/testing/web-platform/tests/pointerevents/deviceproperties/get-device-properties-uniqueid-from-pointer-event.tentative.html b/testing/web-platform/tests/pointerevents/persistentDeviceId/get-persistendeviceid-from-pointer-event.tentative.html
similarity index 94%
rename from testing/web-platform/tests/pointerevents/deviceproperties/get-device-properties-uniqueid-from-pointer-event.tentative.html
rename to testing/web-platform/tests/pointerevents/persistentDeviceId/get-persistendeviceid-from-pointer-event.tentative.html
index 7a58edde3e522..515f2018f6ff8 100644
--- a/testing/web-platform/tests/pointerevents/deviceproperties/get-device-properties-uniqueid-from-pointer-event.tentative.html
+++ b/testing/web-platform/tests/pointerevents/persistentDeviceId/get-persistendeviceid-from-pointer-event.tentative.html
@@ -184,9 +184,7 @@
 that
 pointerEvent
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 is
 0
 by
@@ -234,9 +232,7 @@
 (
 event
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 0
 "
 deviceId
@@ -342,9 +338,7 @@
 '
 PointerEvent
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 '
 )
 ;
diff --git a/testing/web-platform/tests/pointerevents/deviceproperties/unique-id-is-unique-manual.tentative.html b/testing/web-platform/tests/pointerevents/persistentDeviceId/persistentdeviceid-is-unique-manual.tentative.html
similarity index 94%
rename from testing/web-platform/tests/pointerevents/deviceproperties/unique-id-is-unique-manual.tentative.html
rename to testing/web-platform/tests/pointerevents/persistentDeviceId/persistentdeviceid-is-unique-manual.tentative.html
index 00ae154c1de20..2e3f8b4a22b23 100644
--- a/testing/web-platform/tests/pointerevents/deviceproperties/unique-id-is-unique-manual.tentative.html
+++ b/testing/web-platform/tests/pointerevents/persistentDeviceId/persistentdeviceid-is-unique-manual.tentative.html
@@ -38,9 +38,7 @@
 of
 PointerEvent
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 .
 Specifically
 this
@@ -111,9 +109,7 @@
 <
 title
 >
-DeviceProperties
-.
-uniqueId
+persistentDeviceId
 is
 unique
 for
@@ -659,44 +655,33 @@
 (
 event
 .
-deviceProperties
+persistentDeviceId
 )
 {
 const
-uniqueId
+persistentDeviceId
 =
 event
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 ;
 currentuniqueid
 .
 innerText
 =
-uniqueId
+persistentDeviceId
 ?
-uniqueId
+persistentDeviceId
 :
 "
 Unknown
 "
 ;
-if
-(
-!
-uniqueId
-)
-{
-return
-;
-}
 list
 .
 push
 (
-uniqueId
+persistentDeviceId
 )
 ;
 }
@@ -768,7 +753,7 @@
 Device
 1
 have
-uniqueIds
+deviceIds
 .
 "
 )
@@ -785,14 +770,14 @@
 has
 a
 consistent
-uniqueId
+deviceId
 .
 "
 )
 ;
 }
 "
-uniqueId
+deviceId
 is
 consistent
 for
@@ -819,7 +804,7 @@
 Device
 2
 have
-uniqueIds
+deviceIds
 .
 "
 )
@@ -836,14 +821,14 @@
 has
 a
 consistent
-uniqueId
+deviceId
 .
 "
 )
 ;
 }
 "
-uniqueId
+deviceId
 is
 consistent
 for
@@ -885,14 +870,14 @@
 2
 have
 different
-uniqueIds
+deviceIds
 .
 "
 )
 ;
 }
 "
-uniqueId
+deviceId
 is
 unique
 to
diff --git a/testing/web-platform/tests/pointerevents/deviceproperties/pointer-event-has-device-properties-uniqueid-from-pointer-event-init.tentative.html b/testing/web-platform/tests/pointerevents/persistentDeviceId/pointer-event-has-persistentdeviceid-from-pointer-event-init.tentative.html
similarity index 65%
rename from testing/web-platform/tests/pointerevents/deviceproperties/pointer-event-has-device-properties-uniqueid-from-pointer-event-init.tentative.html
rename to testing/web-platform/tests/pointerevents/persistentDeviceId/pointer-event-has-persistentdeviceid-from-pointer-event-init.tentative.html
index b35a67e1850fd..8e022f68d1867 100644
--- a/testing/web-platform/tests/pointerevents/deviceproperties/pointer-event-has-device-properties-uniqueid-from-pointer-event-init.tentative.html
+++ b/testing/web-platform/tests/pointerevents/persistentDeviceId/pointer-event-has-persistentdeviceid-from-pointer-event-init.tentative.html
@@ -88,9 +88,7 @@
 that
 pointerEvent
 .
-deviceProperties
-.
-uniqueId
+persistentDeviceId
 can
 be
 set
@@ -104,12 +102,12 @@
 script
 >
 const
-UNIQUE_ID
+PERSISTENT_ID
 =
 1001
 ;
 const
-INVALID_UNIQUE_ID
+INVALID_PERSISTENT_ID
 =
 0
 ;
@@ -117,19 +115,17 @@
 CheckDeviceId
 (
 event
-uniqueId
+persistentDeviceId
 )
 {
 assert_equals
 (
 event
 .
-deviceProperties
-.
-uniqueId
-uniqueId
+persistentDeviceId
+persistentDeviceId
 "
-uniqueId
+persistentDeviceId
 is
 populated
 "
@@ -154,17 +150,9 @@
 return
 ;
 var
-deviceProps
+deviceId
 =
-new
-DeviceProperties
-(
-{
-uniqueId
-:
-1001
-}
-)
+PERSISTENT_ID
 ;
 var
 downEvent
@@ -199,16 +187,16 @@
 isPrimary
 :
 true
-deviceProperties
+persistentDeviceId
 :
-deviceProps
+deviceId
 }
 )
 ;
 CheckDeviceId
 (
 downEvent
-UNIQUE_ID
+PERSISTENT_ID
 )
 ;
 var
@@ -244,16 +232,16 @@
 isPrimary
 :
 true
-deviceProperties
+persistentDeviceId
 :
-deviceProps
+deviceId
 }
 )
 ;
 CheckDeviceId
 (
 moveEvent
-UNIQUE_ID
+PERSISTENT_ID
 )
 ;
 var
@@ -289,108 +277,25 @@
 isPrimary
 :
 true
-deviceProperties
+persistentDeviceId
 :
-deviceProps
+deviceId
 }
 )
 ;
 CheckDeviceId
 (
 upEvent
-UNIQUE_ID
+PERSISTENT_ID
 )
 ;
 }
 '
 PointerEvent
 .
-deviceProperties
+persistentDeviceId
 via
-DevicePropertiesInit
-'
-)
-;
-promise_test
-(
-async
-(
-)
-=
->
-{
-if
-(
-!
-window
-.
-internals
-)
-return
-;
-var
-emptyDeviceProps
-=
-new
-DeviceProperties
-(
-{
-}
-)
-;
-var
-downEventEmptyProps
-=
-new
-PointerEvent
-(
-"
-pointerdown
-"
-{
-pointerId
-:
-1
-bubbles
-:
-true
-cancelable
-:
-true
-pointerType
-:
-"
-pen
-"
-width
-:
-100
-height
-:
-100
-isPrimary
-:
-true
-deviceProperties
-:
-emptyDeviceProps
-}
-)
-;
-CheckDeviceId
-(
-downEventEmptyProps
-INVALID_UNIQUE_ID
-)
-;
-}
-'
-PointerEvent
-.
-deviceProperties
-via
-empty
-DevicePropertiesInit
+PointerEventInit
 '
 )
 ;
@@ -451,14 +356,14 @@
 (
 downEventEmptyProps
 .
-deviceProperties
-null
+persistentDeviceId
+INVALID_PERSISTENT_ID
 )
 ;
 }
 '
 No
-deviceProperties
+persistentDeviceId
 in
 PointerEventInit
 '