diff --git a/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md
index 6661ba3f5a..f63727b2a4 100644
--- a/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md
+++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md
@@ -60,8 +60,8 @@ ms.date: 08/01/2022
 - [MixedReality/FallbackDiagnostics](./policy-csp-mixedreality.md#mixedreality-fallbackdiagnostics) <sup>9</sup>
 - [MixedReality/HeadTrackingMode](policy-csp-mixedreality.md#mixedreality-headtrackingmode) <sup>9</sup>
 - [MixedReality/MicrophoneDisabled](./policy-csp-mixedreality.md#mixedreality-microphonedisabled) <sup>9</sup>
-- [MixedReality/SkipCalibrationDuringFirstExperience](./policy-csp-mixedreality.md#mixedreality-skipcalibrationduringfirstexperience) <sup>Insider</sup>
-- [MixedReality/SkipTrainingDuringFirstExperience](./policy-csp-mixedreality.md#mixedreality-skiptrainingduringfirstexperience) <sup>Insider</sup>
+- [MixedReality/SkipCalibrationDuringSetup](./policy-csp-mixedreality.md#mixedreality-skipcalibrationduringsetup) <sup>Insider</sup>
+- [MixedReality/SkipTrainingDuringSetup](./policy-csp-mixedreality.md#mixedreality-skiptrainingduringsetup) <sup>Insider</sup>
 - [MixedReality/VisitorAutoLogon](policy-csp-mixedreality.md#mixedreality-visitorautologon) <sup>10</sup>
 - [MixedReality/VolumeButtonDisabled](./policy-csp-mixedreality.md#mixedreality-volumebuttondisabled) <sup>9</sup>
 - [Power/DisplayOffTimeoutOnBattery](./policy-csp-power.md#power-displayofftimeoutonbattery) <sup>9</sup>
diff --git a/windows/client-management/mdm/policy-csp-mixedreality.md b/windows/client-management/mdm/policy-csp-mixedreality.md
index 20da373209..901555820c 100644
--- a/windows/client-management/mdm/policy-csp-mixedreality.md
+++ b/windows/client-management/mdm/policy-csp-mixedreality.md
@@ -47,10 +47,10 @@ manager: dansimp
     <a href="#mixedreality-microphonedisabled">MixedReality/MicrophoneDisabled</a>
   </dd>
   <dd>
-    <a href="#mixedreality-skipcalibrationduringfirstexperience">MixedReality/SkipCalibrationDuringFirstExperience</a>
+    <a href="#mixedreality-skipcalibrationduringsetup">MixedReality/SkipCalibrationDuringSetup</a>
   </dd>
   <dd>
-    <a href="#mixedreality-skiptrainingduringfirstexperience">MixedReality/SkipTrainingDuringFirstExperience</a>
+    <a href="#mixedreality-skiptrainingduringsetup">MixedReality/SkipTrainingDuringSetup</a>
   </dd>
   <dd>
     <a href="#mixedreality-visitorautologon">MixedReality/VisitorAutoLogon</a>
@@ -436,7 +436,7 @@ The following list shows the supported values:
 <hr/>
 
 <!--Policy-->
-<a href="" id="mixedreality-skipcalibrationduringfirstexperience"></a>**MixedReality/SkipCalibrationDuringFirstExperience**  
+<a href="" id="mixedreality-skipcalibrationduringsetup"></a>**MixedReality/SkipCalibrationDuringSetup**  
 
 <!--SupportedSKUs-->
 
@@ -462,7 +462,7 @@ The following list shows the supported values:
 <!--Description-->
 Skips the calibration experience on HoloLens 2 devices when setting up a new user in the Out of Box Experience (OOBE) or when adding a new user to the device. The user will still be able to calibrate their device from the Settings app.
 
-The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/SkipCalibrationDuringFirstExperience`
+The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/SkipCalibrationDuringSetup`
 
 - Bool value
 
@@ -472,7 +472,7 @@ The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/Skip
 <hr/>
 
 <!--Policy-->
-<a href="" id="mixedreality-skiptrainingduringfirstexperience"></a>**MixedReality/SkipTrainingDuringFirstExperience**  
+<a href="" id="mixedreality-skiptrainingduringsetup"></a>**MixedReality/SkipTrainingDuringSetup**  
 
 <!--SupportedSKUs-->
 
@@ -498,7 +498,7 @@ The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/Skip
 <!--Description-->
 On HoloLens 2 devices, skips the training experience of interactions with the humming bird and start menu training when setting up a new user in the Out of Box Experience (OOBE) or when adding a new user to the device. The user will still be able to learn these movement controls from the Tips app.
 
-The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/SkipTrainingDuringFirstExperience`
+The OMA-URI of new policy: `./Device/Vendor/MSFT/Policy/Config/MixedReality/SkipTrainingDuringSetup`
 
 - Bool value