diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index f910412942..cc51db6dfb 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -1960,16 +1960,16 @@ declare namespace Xrm {
              *
              * @remarks Values returned are: "next" or "previous"
              */
-            getDirection(): Xrm.Page.StageChangeDirection;
+            getDirection(): StageChangeDirection;
 
             /**
              * Gets the destionation stage object
              *
              * @return  The stage object
-             * 
+             *
              * @remarks For switching between entities, returns the previous stage object
              */
-            getStage(): Xrm.Page.Stage;
+            getStage(): Stage;
         }
 
         /**
@@ -1978,10 +1978,10 @@ declare namespace Xrm {
         interface StageSelectedEventArguments {
             /**
              * Gets the selected stage object
-             *              
+             *
              * @return  The stage object
              */
-            getStage(): Xrm.Page.Stage;
+            getStage(): Stage;
         }
 
         /**
diff --git a/types/xrm/xrm-tests.ts b/types/xrm/xrm-tests.ts
index 9d5173c5f7..182afa1450 100644
--- a/types/xrm/xrm-tests.ts
+++ b/types/xrm/xrm-tests.ts
@@ -83,7 +83,7 @@ Xrm.Page.ui.tabs.forEach((tab) => {
 
 /// Demonstrate OnSave event context.
 
-Xrm.Page.data.entity.addOnSave((context : Xrm.Page.SaveEventContext) => {
+Xrm.Page.data.entity.addOnSave((context: Xrm.Page.SaveEventContext) => {
     const eventArgs = context.getEventArgs();
 
     if (eventArgs.getSaveMode() === XrmEnum.SaveMode.AutoSave || eventArgs.getSaveMode() === XrmEnum.SaveMode.SaveAndClose)