Rename CUICDMSlideHandle to Qt3DSDMSlideHandle

Task-number: QT3DS-18
Change-Id: Idc37208a981ab8ab03cc1db31a45ab19e602a5aa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

105 files changed, 1088 insertions, 1092 deletions

diff --git a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
index c083f232..1aa3b711 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
@@ -38,7 +38,7 @@
 
 #include <QObject>
 
-CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlideHandle)
+CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlideHandle)
     : m_Doc(inDoc)
     , m_SlideHandle(inSlideHandle)
     , m_ForceRefresh(true)
@@ -52,7 +52,7 @@ CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle
     CClientDataModelBridge *theBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
     qt3dsdm::ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = theBridge->GetGUID(inInstance);
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     m_SlideHandle = theSlideSystem->GetActiveSlide(theMasterSlide);
 }
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
index 02ce3219..e0a56097 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
@@ -39,13 +39,13 @@ class CDoc;
 
 namespace qt3dsdm {
 class ISlideSystem;
-class CUICDMSlideHandle;
+class Qt3DSDMSlideHandle;
 };
 
 class CCmdActivateSlide : public CNonModifyingCmd
 {
 public:
-    CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlideHandle);
+    CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlideHandle);
     CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     virtual ~CCmdActivateSlide();
 
@@ -58,7 +58,7 @@ public:
 
 protected:
     CDoc *m_Doc;
-    qt3dsdm::CUICDMSlideHandle m_SlideHandle;
+    qt3dsdm::Qt3DSDMSlideHandle m_SlideHandle;
     bool m_ForceRefresh;
 };
 #endif // INCLUDED_CMD_ACTIVATE_SLIDE_H
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
index 50f01cf2..7b1670ae 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
@@ -44,7 +44,7 @@ struct SApplicationState
 {
     bool m_Dirty;
     qt3dsdm::Qt3DSDMInstanceHandle m_SelectedInstance;
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlide;
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide;
     qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer;
 
     SApplicationState()
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelActionSetValue.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelActionSetValue.h
index 200f22cf..b9808413 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelActionSetValue.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelActionSetValue.h
@@ -284,10 +284,10 @@ class CCmdDataModelActionSetEyeball : public CCmdDataModelActionSetValue
 {
 protected: // Members
     bool m_Value;
-    CUICDMSlideHandle m_ActiveSlide;
+    Qt3DSDMSlideHandle m_ActiveSlide;
 
 public: // Construction
-    CCmdDataModelActionSetEyeball(CDoc *inDoc, CUICDMSlideHandle inActiveSlide,
+    CCmdDataModelActionSetEyeball(CDoc *inDoc, Qt3DSDMSlideHandle inActiveSlide,
                                   CUICDMActionHandle inAction, bool inValue)
         : CCmdDataModelActionSetValue(inDoc, inAction, "Set Action Eyeball")
         , m_Value(inValue)
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
index 734e94ec..c3230639 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
@@ -111,7 +111,7 @@ public: // Construction
         if (!ConsumerExists()) {
             SetConsumer();
             qt3dsdm::ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
-            qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetSlideByInstance(m_Instance);
+            qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetSlideByInstance(m_Instance);
             theSlideSystem->DeleteSlideByIndex(theSlide, 0);
 
             ReleaseConsumer();
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
index fda9827e..e3336ce7 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
@@ -120,7 +120,7 @@ void CCmdLocateReference::LocateReference()
          theIter != theInstances.end(); ++theIter) {
         // Check if the instance is in master slide and if the property is unlinked.
         // This will determine how we should update the value.
-        CUICDMSlideHandle theSlide = m_SlideSystem->GetAssociatedSlide(*theIter);
+        Qt3DSDMSlideHandle theSlide = m_SlideSystem->GetAssociatedSlide(*theIter);
         if (theSlide.Valid() && m_SlideSystem->IsMasterSlide(theSlide)
             && !m_SlideSystem->IsPropertyLinked(*theIter, m_Bridge->GetSourcePathProperty())) {
             // If the instance is in master slide and the property is unlinked, we need to update
@@ -128,7 +128,7 @@ void CCmdLocateReference::LocateReference()
             size_t theSlideCount =
                 m_SlideSystem->GetSlideCount(m_SlideSystem->GetAssociatedSlide(*theIter));
             for (size_t theSlideIndex = 0; theSlideIndex < theSlideCount; ++theSlideIndex) {
-                CUICDMSlideHandle theSpecificSlide =
+                Qt3DSDMSlideHandle theSpecificSlide =
                     m_SlideSystem->GetSlideByIndex(theSlide, theSlideIndex);
                 UpdateSourcePath(*theIter, theSpecificSlide);
             }
@@ -146,7 +146,7 @@ void CCmdLocateReference::LocateReference()
  * @param inSpecificSlide	the slide to update, if valid
  */
 void CCmdLocateReference::UpdateSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                                           qt3dsdm::CUICDMSlideHandle inSpecificSlide)
+                                           qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide)
 {
     // Get the sourcepath value
     Q3DStudio::CFilePath thePath;
@@ -169,7 +169,7 @@ void CCmdLocateReference::UpdateSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInst
  * @param outIdentifier		the identifier
  */
 void CCmdLocateReference::GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                                        qt3dsdm::CUICDMSlideHandle inSpecificSlide,
+                                        qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide,
                                         Q3DStudio::CFilePath &outPath,
                                         Q3DStudio::CString &outIdentifier)
 {
@@ -209,7 +209,7 @@ void CCmdLocateReference::GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstanc
  * @param inIdentifier		the identifier
  */
 void CCmdLocateReference::SetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                                        qt3dsdm::CUICDMSlideHandle inSpecificSlide,
+                                        qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide,
                                         const Q3DStudio::CFilePath &inPath,
                                         const Q3DStudio::CString &inIdentifier)
 {
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h
index 0a0e500e..a5925ca5 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h
@@ -90,12 +90,12 @@ public:
 protected:
     void LocateReference();
     void UpdateSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                          qt3dsdm::CUICDMSlideHandle inSpecificSlide = 0);
+                          qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide = 0);
     void GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                       qt3dsdm::CUICDMSlideHandle inSpecificSlide, Q3DStudio::CFilePath &outPath,
+                       qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide, Q3DStudio::CFilePath &outPath,
                        Q3DStudio::CString &outIdentifier);
     void SetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                       qt3dsdm::CUICDMSlideHandle inSpecificSlide, const Q3DStudio::CFilePath &inPath,
+                       qt3dsdm::Qt3DSDMSlideHandle inSpecificSlide, const Q3DStudio::CFilePath &inPath,
                        const Q3DStudio::CString &inIdentifier);
 
     // subclasses should implement the following methods
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
index faa9be46..2efcd3b3 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
@@ -106,7 +106,7 @@ CClientDataModelBridge::~CClientDataModelBridge()
 {
 }
 
-CUICDMSlideHandle CClientDataModelBridge::CreateNonMasterSlide(CUICDMSlideHandle inMasterSlide,
+Qt3DSDMSlideHandle CClientDataModelBridge::CreateNonMasterSlide(Qt3DSDMSlideHandle inMasterSlide,
                                                                Q3DStudio::CId inGuid,
                                                                const Q3DStudio::CString &inName)
 {
@@ -115,7 +115,7 @@ CUICDMSlideHandle CClientDataModelBridge::CreateNonMasterSlide(CUICDMSlideHandle
     m_DataCore->SetInstancePropertyValue(theInstance, m_SlideItem.m_ComponentId,
                                          GuidToLong4(inGuid));
     SetName(theInstance, inName);
-    CUICDMSlideHandle theSlide = m_SlideCore->CreateSlide(theInstance);
+    Qt3DSDMSlideHandle theSlide = m_SlideCore->CreateSlide(theInstance);
     m_SlideCore->DeriveSlide(theSlide, inMasterSlide);
     return theSlide;
 }
@@ -157,7 +157,7 @@ CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstan
         // There is an implicit assumption here that the slide graph is one level deep, i.e. only
         // the
         // root has children.
-        CUICDMSlideHandle theSlide = m_SlideCore->GetSlideByInstance(existing);
+        Qt3DSDMSlideHandle theSlide = m_SlideCore->GetSlideByInstance(existing);
         if (m_SlideCore->GetParentSlide(theSlide).Valid())
             theSlide = m_SlideCore->GetParentSlide(theSlide);
         return m_SlideGraphCore->GetSlideGraph(theSlide);
@@ -168,9 +168,9 @@ CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstan
     m_DataCore->SetInstancePropertyValue(rootInstance, m_SlideItem.m_ComponentId,
                                          GuidToLong4(theGuid));
     SetName(rootInstance, Q3DStudio::CString::fromQString(QObject::tr("Master Slide")));
-    CUICDMSlideHandle masterSlide = m_SlideCore->CreateSlide(rootInstance);
+    Qt3DSDMSlideHandle masterSlide = m_SlideCore->CreateSlide(rootInstance);
     CUICDMSlideGraphHandle retval(m_SlideGraphCore->CreateSlideGraph(masterSlide));
-    CUICDMSlideHandle theSlide1Handle =
+    Qt3DSDMSlideHandle theSlide1Handle =
         CreateNonMasterSlide(masterSlide, theGuid, Q3DStudio::CString::fromQString(QObject::tr("Slide1")));
 
     // always activate slide 1 on create
@@ -179,16 +179,16 @@ CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstan
     return retval;
 }
 
-CUICDMSlideHandle
+Qt3DSDMSlideHandle
 CClientDataModelBridge::GetOrCreateGraphRoot(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     return m_SlideGraphCore->GetGraphRoot(GetOrCreateGraph(inInstance));
 }
 
-CUICDMSlideHandle GetSlideByIndex(CUICDMSlideGraphHandle inGraph, int inIndex,
+Qt3DSDMSlideHandle GetSlideByIndex(CUICDMSlideGraphHandle inGraph, int inIndex,
                                   ISlideCore &inSlideCore, ISlideGraphCore &inSlideGraphCore)
 {
-    CUICDMSlideHandle theRoot = inSlideGraphCore.GetGraphRoot(inGraph);
+    Qt3DSDMSlideHandle theRoot = inSlideGraphCore.GetGraphRoot(inGraph);
     if (inIndex == 0)
         return theRoot;
     --inIndex;
@@ -339,7 +339,7 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandl
         return {};
 
     // get the slide this instance is in
-    CUICDMSlideHandle theSlideHandle =
+    Qt3DSDMSlideHandle theSlideHandle =
         m_SlideGraphCore->GetAssociatedGraph(inInstanceHandle).second;
     if (!theSlideHandle.Valid())
         return {};
@@ -350,7 +350,7 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandl
 // Find the owning component of the Slide Handle
 // Returns NULL if can't find one.
 qt3dsdm::Qt3DSDMInstanceHandle
-CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle,
+CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle,
                                                    int &outSlideIndex)
 {
     SLong4 theComponentGuid = GetComponentGuid(inSlideHandle);
@@ -367,20 +367,20 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle in
 // Find the owning component of the Slide Handle
 // Returns NULL if can't find one.
 qt3dsdm::Qt3DSDMInstanceHandle
-CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle)
+CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle)
 {
     int theSlideIndex;
     return GetOwningComponentInstance(inSlideHandle, theSlideIndex);
 }
 
 // Find the component Guid of the Slide Handle
-SLong4 CClientDataModelBridge::GetComponentGuid(qt3dsdm::CUICDMSlideHandle inSlideHandle)
+SLong4 CClientDataModelBridge::GetComponentGuid(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle)
 {
     qt3dsdm::SLong4 theComponentGuid;
 
     // get the master slide (because only master knows which component instance)
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
-    CUICDMSlideHandle theMasterSlideHandle = theSlideSystem->GetMasterSlide(inSlideHandle);
+    Qt3DSDMSlideHandle theMasterSlideHandle = theSlideSystem->GetMasterSlide(inSlideHandle);
     if (!theMasterSlideHandle.Valid())
         return theComponentGuid;
 
@@ -434,22 +434,22 @@ bool CClientDataModelBridge::IsActive(qt3dsdm::Qt3DSDMInstanceHandle inInstanceH
  *	Get the active slide index of this component (or scene)
  *	@param	inAsset		the controlling component (component or scene)
  */
-qt3dsdm::CUICDMSlideHandle
+qt3dsdm::Qt3DSDMSlideHandle
 CClientDataModelBridge::GetComponentActiveSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent)
 {
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = GetGUID(inComponent);
-    CUICDMSlideHandle theMasterSlide =
+    Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     return theSlideSystem->GetActiveSlide(theMasterSlide);
 }
 
-qt3dsdm::CUICDMSlideHandle
+qt3dsdm::Qt3DSDMSlideHandle
 CClientDataModelBridge::GetComponentSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent, long inIndex)
 {
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = GetGUID(inComponent);
-    CUICDMSlideHandle theMasterSlide =
+    Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     return theSlideSystem->GetSlideByIndex(theMasterSlide, inIndex);
 }
@@ -459,7 +459,7 @@ void CClientDataModelBridge::SetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHa
                                      const Q3DStudio::CString &inName)
 {
     TDataStrPtr theName(new CDataStr(inName));
-    CUICDMSlideHandle theAssociatedSlide =
+    Qt3DSDMSlideHandle theAssociatedSlide =
         m_Doc->GetStudioSystem()->GetFullSystem()->GetSlideSystem()->GetAssociatedSlide(
             inInstanceHandle);
     if (theAssociatedSlide.Valid())
@@ -492,7 +492,7 @@ bool CClientDataModelBridge::IsActiveComponent(qt3dsdm::Qt3DSDMInstanceHandle in
     using namespace Q3DStudio;
     CDoc &theDoc(*m_Doc);
     Qt3DSDMInstanceHandle theInstance = inInstance;
-    CUICDMSlideHandle theSlide = theDoc.GetActiveSlide();
+    Qt3DSDMSlideHandle theSlide = theDoc.GetActiveSlide();
     SLong4 theGuid = GetComponentGuid(theSlide);
     CId theActiveComponentId(theGuid.m_Longs[0], theGuid.m_Longs[1], theGuid.m_Longs[2],
                              theGuid.m_Longs[3]);
@@ -880,7 +880,7 @@ qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstance(qt3dsdm::Qt3D
 std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
 CClientDataModelBridge::CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
                                             Qt3DSDMPropertyHandle inSlot,
-                                            CUICDMSlideHandle inUICDMSlide)
+                                            Qt3DSDMSlideHandle inUICDMSlide)
 {
     Qt3DSDMInstanceHandle theNewInstance =
         m_Doc->GetStudioSystem()
@@ -1138,7 +1138,7 @@ void CClientDataModelBridge::GetValueListFromAllSlides(Qt3DSDMInstanceHandle inI
 
     // Check if the instance is in master slide and if the property is unlinked.
     // This will determine how we should query the value.
-    qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
+    qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
     if (theSlide.Valid() && theSlideSystem->IsMasterSlide(theSlide)
         && !theSlideSystem->IsPropertyLinked(inInstance, inProperty)) {
         // If the instance is in master slide and the property is unlinked, we need to query the
@@ -1147,7 +1147,7 @@ void CClientDataModelBridge::GetValueListFromAllSlides(Qt3DSDMInstanceHandle inI
             theSlideSystem->GetSlideCount(theSlideSystem->GetAssociatedSlide(inInstance));
         for (size_t theSlideIndex = 0; theSlideIndex < theSlideCount; ++theSlideIndex) {
             qt3dsdm::SValue theValue;
-            CUICDMSlideHandle theSpecificSlide =
+            Qt3DSDMSlideHandle theSpecificSlide =
                 theSlideSystem->GetSlideByIndex(theSlide, theSlideIndex);
             if (theSlideCore->GetSpecificInstancePropertyValue(theSpecificSlide, inInstance,
                                                                inProperty, theValue)
@@ -1405,7 +1405,7 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance
         if (IsMaster(inInstance)) {
             qt3dsdm::ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
             qt3dsdm::TInstanceHandleList theInstanceList;
-            qt3dsdm::CUICDMSlideHandle theMasterSlide =
+            qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
                 theSlideSystem->GetAssociatedSlide(inInstance);
             theSlideSystem->GetAssociatedInstances(theMasterSlide, theInstanceList);
             long theMasterLayerCount = 0;
@@ -1440,7 +1440,7 @@ bool CClientDataModelBridge::IsMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         return true;
     else {
         ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(inInstance);
+        qt3dsdm::Qt3DSDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(inInstance);
         return theSlideSystem->IsMasterSlide(theSlideHandle);
     }
 }
@@ -1993,14 +1993,14 @@ void CClientDataModelBridge::GetSlideNamesOfAction(qt3dsdm::CUICDMActionHandle i
     Q3DStudio::CId theTargetId = GetGUID(theTargetInstance);
 
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
-    CUICDMSlideHandle theMasterSlide =
+    Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theTargetId));
     size_t theSlideCount = theSlideSystem->GetSlideCount(theMasterSlide);
 
     for (size_t theSlideIndex = 1; theSlideIndex < theSlideCount;
          ++theSlideIndex) // Index 0 refers to Master Slide, so start from index 1
     {
-        CUICDMSlideHandle theSlideHandle =
+        Qt3DSDMSlideHandle theSlideHandle =
             theSlideSystem->GetSlideByIndex(theMasterSlide, theSlideIndex);
         Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theSlideHandle);
         outSlideNames.push_back(GetName(theInstanceHandle));
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
index b47eaed4..96d1288b 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
@@ -176,7 +176,7 @@ public:
     virtual qt3dsdm::Qt3DSDMInstanceHandle CreateAssetInstance(Q3DStudio::CId &inId,
                                                             EStudioObjectType inObjectType);
     virtual qt3dsdm::CUICDMSlideGraphHandle GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
-    virtual qt3dsdm::CUICDMSlideHandle GetOrCreateGraphRoot(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    virtual qt3dsdm::Qt3DSDMSlideHandle GetOrCreateGraphRoot(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     virtual qt3dsdm::Qt3DSDMInstanceHandle GetSlideInstance();
     virtual qt3dsdm::Qt3DSDMPropertyHandle GetSlideComponentIdProperty();
     virtual qt3dsdm::Qt3DSDMPropertyHandle GetNameProperty();
@@ -203,16 +203,16 @@ public:
     virtual qt3dsdm::Qt3DSDMInstanceHandle
     GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, int &outSlideIndex);
     virtual qt3dsdm::Qt3DSDMInstanceHandle
-    GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle, int &outSlideIndex);
+    GetOwningComponentInstance(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle, int &outSlideIndex);
     virtual qt3dsdm::Qt3DSDMInstanceHandle
-    GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle);
-    virtual qt3dsdm::SLong4 GetComponentGuid(qt3dsdm::CUICDMSlideHandle inSlideHandle);
+    GetOwningComponentInstance(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle);
+    virtual qt3dsdm::SLong4 GetComponentGuid(qt3dsdm::Qt3DSDMSlideHandle inSlideHandle);
 
     virtual bool IsActive(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, long inCurrentTime);
 
-    virtual qt3dsdm::CUICDMSlideHandle
+    virtual qt3dsdm::Qt3DSDMSlideHandle
     GetComponentActiveSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent);
-    virtual qt3dsdm::CUICDMSlideHandle GetComponentSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent,
+    virtual qt3dsdm::Qt3DSDMSlideHandle GetComponentSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent,
                                                        long inIndex);
 
     const SDataModelDefaultMaterial &GetDefaultMaterial() const { return m_DefaultMaterial; }
@@ -310,7 +310,7 @@ private:
                                    qt3dsdm::Qt3DSDMPropertyHandle inProperty, qt3dsdm::SLong4 inGuid);
     void ClearCache();
     qt3dsdm::Qt3DSDMInstanceHandle GetSceneOrComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
-    qt3dsdm::CUICDMSlideHandle CreateNonMasterSlide(qt3dsdm::CUICDMSlideHandle inMasterSlide,
+    qt3dsdm::Qt3DSDMSlideHandle CreateNonMasterSlide(qt3dsdm::Qt3DSDMSlideHandle inMasterSlide,
                                                   Q3DStudio::CId inGuid,
                                                   const Q3DStudio::CString &inName);
 
@@ -340,7 +340,7 @@ public: // helpers
 
     std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
     CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
-                        qt3dsdm::Qt3DSDMPropertyHandle inSlot, qt3dsdm::CUICDMSlideHandle inUICDMSlide);
+                        qt3dsdm::Qt3DSDMPropertyHandle inSlot, qt3dsdm::Qt3DSDMSlideHandle inUICDMSlide);
 
     void SetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, const Q3DStudio::CString &inName);
     Q3DStudio::CString GetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
diff --git a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
index eefed4b9..32f168b4 100644
--- a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
@@ -90,7 +90,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
         TImportInstanceMap;
     Qt3DSDMInstanceHandle m_Parent;
     Qt3DSDMInstanceHandle m_Root;
-    CUICDMSlideHandle m_Slide;
+    Qt3DSDMSlideHandle m_Slide;
     Q3DStudio::CString m_TypeBuffer;
     qt3ds::QT3DSI32 m_StartTime;
     Import *m_ImportObj;
@@ -100,7 +100,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
     SComposerImportInterface(
         Q3DStudio::IDocumentEditor &editor, qt3dsdm::CDataModelHandle parent // Parent object
         ,
-        qt3dsdm::CDataModelHandle root, qt3dsdm::CUICDMSlideHandle slide,
+        qt3dsdm::CDataModelHandle root, qt3dsdm::Qt3DSDMSlideHandle slide,
         const Q3DStudio::CFilePath &docPath /// Root directory where the studio file sits.
         ,
         const Q3DStudio::CFilePath &inFullPathToImportFile, long inStartTime,
@@ -319,7 +319,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
 
     struct SSlideInstanceIdMapIterator
     {
-        const vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> *m_CurrentItems;
+        const vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>> *m_CurrentItems;
         size_t m_CurrentTreeIdx;
         size_t m_CurrentTreeEnd;
         TCharPtr m_Id;
@@ -357,7 +357,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
                 ++m_CurrentTreeIdx;
             }
         }
-        CUICDMSlideHandle GetCurrentSlide() { return (*m_CurrentItems)[m_CurrentTreeIdx].first; }
+        Qt3DSDMSlideHandle GetCurrentSlide() { return (*m_CurrentItems)[m_CurrentTreeIdx].first; }
 
         Qt3DSDMInstanceHandle GetCurrentInstance()
         {
@@ -422,7 +422,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
     {
         const wchar_t *theInsertId(m_StringTable.GetWideStr(inImportId));
         pair<TIdMultiMap::iterator, bool> theInserter(m_IdToSlideInstances.insert(
-            make_pair(theInsertId, vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>())));
+            make_pair(theInsertId, vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>>())));
 
         for (SSlideInstanceIdMapIterator theIterator(inParent, m_IdToSlideInstances, m_StringTable);
              theIterator.IsDone() == false; theIterator.Next()) {
@@ -503,7 +503,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
             return;
         size_t numItems = NVMin(theParentList->second.size(), theChildList->second.size());
         for (size_t idx = 0; idx < numItems; ++idx) {
-            CUICDMSlideHandle theParentSlide = theParentList->second[idx].first;
+            Qt3DSDMSlideHandle theParentSlide = theParentList->second[idx].first;
             Qt3DSDMInstanceHandle theParent(theParentList->second[idx].second);
             Qt3DSDMInstanceHandle theChild(theChildList->second[idx].second);
             Qt3DSDMInstanceHandle nextSibling;
@@ -577,7 +577,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
 std::shared_ptr<IComposerEditorInterface> IComposerEditorInterface::CreateEditorInterface(
     Q3DStudio::IDocumentEditor &editor, qt3dsdm::CDataModelHandle parent // Parent object
     ,
-    qt3dsdm::CDataModelHandle root, qt3dsdm::CUICDMSlideHandle slide,
+    qt3dsdm::CDataModelHandle root, qt3dsdm::Qt3DSDMSlideHandle slide,
     const Q3DStudio::CFilePath &docPath, const Q3DStudio::CFilePath &destimportfile,
     long inStartTime, qt3dsdm::IStringTable &inStringTable)
 {
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index 615f8608..f5870b42 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -414,17 +414,17 @@ CCore *CDoc::GetCore()
 
 //=============================================================================
 /**
- *	Calls NotifyActiveSlideChanged( UICDM::CUICDMSlideHandle inNewActiveSlide, bool
+ *	Calls NotifyActiveSlideChanged( UICDM::Qt3DSDMSlideHandle inNewActiveSlide, bool
  *inForceRefresh )
  *	Could not make this on optional param because someone is calling from CGenericCmd that
  *	seems to only allow 1 param.
  */
-void CDoc::NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide)
+void CDoc::NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide)
 {
     NotifyActiveSlideChanged(inNewActiveSlide, false);
 }
 
-void CDoc::SetActiveSlideChange(qt3dsdm::CUICDMSlideHandle inNewActiveSlide)
+void CDoc::SetActiveSlideChange(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide)
 {
     if (!inNewActiveSlide.Valid())
         inNewActiveSlide = GetActiveSlide();
@@ -440,7 +440,7 @@ void CDoc::SetActiveSlideChange(qt3dsdm::CUICDMSlideHandle inNewActiveSlide)
         m_ActiveLayer = 0;
 
         qt3dsdm::ISlideSystem *theSlideSystem = m_StudioSystem->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(inNewActiveSlide);
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(inNewActiveSlide);
 
         long theNewIndex = theSlideSystem->GetSlideIndex(inNewActiveSlide);
         theSlideSystem->SetActiveSlide(theMasterSlide, theNewIndex);
@@ -477,12 +477,12 @@ void CDoc::SetActiveSlideChange(qt3dsdm::CUICDMSlideHandle inNewActiveSlide)
  * was active. E.g. when this would be true is when we are playing through, time should always start
  * from 0 then.
  */
-void CDoc::NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide, bool inForceRefresh,
+void CDoc::NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide, bool inForceRefresh,
                                     bool inIgnoreLastDisplayTime /*= false */)
 {
     using namespace qt3dsdm;
 
-    qt3dsdm::CUICDMSlideHandle theLastActiveSlide = m_ActiveSlide;
+    qt3dsdm::Qt3DSDMSlideHandle theLastActiveSlide = m_ActiveSlide;
 
     // Record the last selected object in that slide
     ISlideSystem *theSlideSystem = GetStudioSystem()->GetSlideSystem();
@@ -506,9 +506,9 @@ void CDoc::NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide,
                     m_StudioSystem->GetSlideSystem()->GetMasterSlide(inNewActiveSlide), 0);
         }
 
-        CUICDMSlideHandle theLastMasterSlide =
+        Qt3DSDMSlideHandle theLastMasterSlide =
             m_StudioSystem->GetSlideSystem()->GetMasterSlide(theLastActiveSlide);
-        CUICDMSlideHandle theNewMasterSlide =
+        Qt3DSDMSlideHandle theNewMasterSlide =
             m_StudioSystem->GetSlideSystem()->GetMasterSlide(inNewActiveSlide);
 
         int theIndex = m_StudioSystem->GetSlideSystem()->GetSlideIndex(inNewActiveSlide);
@@ -581,7 +581,7 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetActiveRootInstance()
  *	Returns the current active slide
  *	The timeline is always displaying the active root.
  */
-qt3dsdm::CUICDMSlideHandle CDoc::GetActiveSlide()
+qt3dsdm::Qt3DSDMSlideHandle CDoc::GetActiveSlide()
 {
     if (m_ActiveSlide.Valid())
         return m_ActiveSlide;
@@ -884,7 +884,7 @@ bool CDoc::SetSelection(Q3DStudio::SSelectedValue inNewSelection)
         if (theNewSelectedInstance.Valid()) {
             // Check if we do not select a SlideInspectable. Refer to
             // CStudioApp::GetInspectableFromSelectable.
-            qt3dsdm::CUICDMSlideHandle theCurrentActiveSlide = GetActiveSlide();
+            qt3dsdm::Qt3DSDMSlideHandle theCurrentActiveSlide = GetActiveSlide();
             if (theNewSelectedInstance
                 != theBridge->GetOwningComponentInstance(theCurrentActiveSlide)) {
                 // If the newly selected object is in the scene then make the layer it belongs to
@@ -938,14 +938,14 @@ struct SReferenceTransaction : public qt3dsdm::ITransaction
     void Undo() override { m_TargetData = m_OldData; }
 };
 
-void CDoc::SetActiveSlideWithTransaction(qt3dsdm::CUICDMSlideHandle inNewActiveSlide)
+void CDoc::SetActiveSlideWithTransaction(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide)
 {
     using namespace qt3dsdm;
-    CUICDMSlideHandle theActiveSlide = m_ActiveSlide;
+    Qt3DSDMSlideHandle theActiveSlide = m_ActiveSlide;
     m_ActiveSlide = inNewActiveSlide;
     TTransactionConsumerPtr theConsumer = m_StudioSystem->GetFullSystem()->GetConsumer();
     if (theConsumer)
-        theConsumer->OnTransaction(std::make_shared<SReferenceTransaction<CUICDMSlideHandle>>(
+        theConsumer->OnTransaction(std::make_shared<SReferenceTransaction<Qt3DSDMSlideHandle>>(
             __FILE__, __LINE__, ref(m_ActiveSlide), theActiveSlide, inNewActiveSlide));
 }
 
@@ -1017,14 +1017,14 @@ Q3DStudio::CString CDoc::GetProjectFontName(const Q3DStudio::CFilePath &inFullPa
     return theFont;
 }
 
-void CDoc::OnSlideDeleted(qt3dsdm::CUICDMSlideHandle inSlide)
+void CDoc::OnSlideDeleted(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     using namespace qt3dsdm;
     if (inSlide == m_ActiveSlide) {
         ISlideSystem &theSlideSystem = *m_StudioSystem->GetFullSystem()->GetSlideSystem();
-        CUICDMSlideHandle theMaster = theSlideSystem.GetMasterSlide(inSlide);
-        CUICDMSlideHandle theFirstSlide = theSlideSystem.GetSlideByIndex(theMaster, 1);
-        CUICDMSlideHandle theNewSlide;
+        Qt3DSDMSlideHandle theMaster = theSlideSystem.GetMasterSlide(inSlide);
+        Qt3DSDMSlideHandle theFirstSlide = theSlideSystem.GetSlideByIndex(theMaster, 1);
+        Qt3DSDMSlideHandle theNewSlide;
         if (theFirstSlide == inSlide)
             theNewSlide = theSlideSystem.GetSlideByIndex(theMaster, 2);
         else
@@ -1046,7 +1046,7 @@ void CDoc::OnInstanceDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     SComposerObjectDefinitions &theDefinitions(theBridge.GetObjectDefinitions());
     IDataCore &theCore(*m_StudioSystem->GetFullSystem()->GetCoreSystem()->GetDataCore());
     if (theCore.IsInstanceOrDerivedFrom(inInstance, theDefinitions.m_SlideOwner.m_Instance)) {
-        CUICDMSlideHandle theSlide = theBridge.GetComponentActiveSlide(inInstance);
+        Qt3DSDMSlideHandle theSlide = theBridge.GetComponentActiveSlide(inInstance);
         if (theSlide == m_ActiveSlide) {
             // empty loop intentional, finding the next component parent.
             Qt3DSDMInstanceHandle theParent;
@@ -1126,13 +1126,13 @@ void CDoc::SelectAndNavigateToUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInsta
         return;
     }
     Q3DStudio::IDocumentReader &theReader(GetDocumentReader());
-    qt3dsdm::CUICDMSlideHandle theAssociatedSlide = theReader.GetAssociatedSlide(inInstanceHandle);
+    qt3dsdm::Qt3DSDMSlideHandle theAssociatedSlide = theReader.GetAssociatedSlide(inInstanceHandle);
     qt3dsdm::Qt3DSDMInstanceHandle theNewComponent =
         theReader.GetComponentForSlide(theAssociatedSlide);
     qt3dsdm::Qt3DSDMInstanceHandle theOldComponent = theReader.GetComponentForSlide(GetActiveSlide());
     if (theNewComponent.Valid() && theNewComponent != theOldComponent) {
         // Get the currently active slide for the new component.
-        qt3dsdm::CUICDMSlideHandle theActiveSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theActiveSlide =
             theReader.GetComponentActiveSlide(theNewComponent);
         NotifyActiveSlideChanged(theActiveSlide, true);
     }
@@ -1195,7 +1195,7 @@ void CDoc::DoNotifyTimeChanged(long inNewTime)
     }
 
     // Update UICDM
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         m_StudioSystem->GetSlideSystem()->GetMasterSlide(GetActiveSlide());
     // TODO: fix precision issue from converting to/from float & long. choose 1 type
     m_StudioSystem->GetSlideSystem()->SetComponentSeconds(theMasterSlide, (float)inNewTime / 1000);
@@ -1502,7 +1502,7 @@ void CDoc::CreateNewDocument()
     CreatePresentation();
 
     // Create the default objects in the scene
-    CUICDMSlideHandle theSlide =
+    Qt3DSDMSlideHandle theSlide =
         m_StudioSystem->GetClientDataModelBridge()->GetOrCreateGraphRoot(m_SceneInstance);
     IDataCore &theDataCore(
         *m_StudioSystem->GetFullSystem()->GetCoreSystem()->GetTransactionlessDataCore());
@@ -1664,12 +1664,12 @@ void CDoc::HandleMasterPaste()
         long theTargetObjectType =
             GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(theSelectedInstance);
         qt3dsdm::ISlideSystem *theSlideSystem = GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theTargetSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theTargetSlide =
             theSlideSystem->GetAssociatedSlide(theSelectedInstance);
 
         if (theTargetObjectType != OBJTYPE_SCENE && theTargetObjectType != OBJTYPE_COMPONENT) {
             if (theTargetSlide && theSlideSystem->IsMasterSlide(theTargetSlide)) {
-                qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+                qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                     theSlideSystem->GetMasterSlide(theTargetSlide);
                 if (theMasterSlideHandle.Valid())
                     theTargetSlide = theMasterSlideHandle;
@@ -1677,7 +1677,7 @@ void CDoc::HandleMasterPaste()
             } else
                 PasteObject(theSelectedInstance);
         } else {
-            qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+            qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                 theSlideSystem->GetMasterSlide(theTargetSlide);
             if (theMasterSlideHandle.Valid())
                 theTargetSlide = theMasterSlideHandle;
@@ -1940,9 +1940,9 @@ void CDoc::LoadPresentationFile(CBufferedInputStream *inInputStream)
 
     // We have a new presentation and a new active time context (scene)
     OnNewPresentation();
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         m_StudioSystem->GetClientDataModelBridge()->GetComponentSlide(m_SceneInstance, 0);
-    qt3dsdm::CUICDMSlideHandle theChildSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theChildSlide =
         m_StudioSystem->GetClientDataModelBridge()->GetComponentSlide(m_SceneInstance, 1);
     m_StudioSystem->GetFullSystem()->GetSignalSender()->SendActiveSlide(theMasterSlide, 1,
                                                                         theChildSlide);
@@ -2572,7 +2572,7 @@ void CDoc::IterateImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                     thePropertySystem->GetAdditionalMetaDataType(theChildInstance, theProperty);
 
                 if (theAdditionalMetaDataType == qt3dsdm::AdditionalMetaDataType::Image) {
-                    qt3dsdm::CUICDMSlideHandle theSlide =
+                    qt3dsdm::Qt3DSDMSlideHandle theSlide =
                         theSlideSystem->GetAssociatedSlide(theChildInstance);
                     bool theIsMaster = theSlideSystem->IsMasterSlide(theSlide);
                     if (!theIsMaster
@@ -2596,7 +2596,7 @@ void CDoc::IterateImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                         }
                     } else {
                         qt3dsdm::SValue theValue;
-                        qt3dsdm::CUICDMSlideHandle theMasterSlide =
+                        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
                             theClientBridge->GetOrCreateGraphRoot(theChildInstance);
 
                         size_t theNumSlides = theSlideSystem->GetSlideCount(theMasterSlide);
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h
index 5b5cd3e7..176d0101 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.h
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.h
@@ -246,7 +246,7 @@ public:
 
     qt3dsdm::Qt3DSDMInstanceHandle GetActiveLayer();
     void SetActiveLayer(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance);
-    qt3dsdm::CUICDMSlideHandle GetActiveSlide();
+    qt3dsdm::Qt3DSDMSlideHandle GetActiveSlide();
     void OnLayerDeleted(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance);
 
     void SetPlayMode(EPlayMode inPlayMode, long inRestoreTime = -1);
@@ -265,8 +265,8 @@ public:
     void NotifyTimeChanged(long inNewTime) override;
     // Notify time changed.
     virtual void DoNotifyTimeChanged(long inNewTime);
-    void NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide) override;
-    void NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide,
+    void NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide) override;
+    void NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide,
                                           bool inForceRefresh,
                                           bool inIgnoreLastDisplayTime = false) override;
     virtual void
@@ -359,7 +359,7 @@ public:
     bool PreUndo() override;
 
     void CheckActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
-    void SetActiveSlideWithTransaction(qt3dsdm::CUICDMSlideHandle inNewActiveSlide);
+    void SetActiveSlideWithTransaction(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide);
 
     void SetSceneGraph(std::shared_ptr<Q3DStudio::IDocSceneGraph> inGraph);
     Q3DStudio::IDocSceneGraph *GetSceneGraph() { return m_SceneGraph.get(); }
@@ -373,8 +373,8 @@ public:
 
 protected:
     // Set the active slide, return true if delving
-    void SetActiveSlideChange(qt3dsdm::CUICDMSlideHandle inNewActiveSlide);
-    void OnSlideDeleted(qt3dsdm::CUICDMSlideHandle inSlide);
+    void SetActiveSlideChange(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide);
+    void OnSlideDeleted(qt3dsdm::Qt3DSDMSlideHandle inSlide);
     void OnInstanceDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     Q3DStudio::SSelectedValue SetupInstanceSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     // Set the selection, but don't send an event.
@@ -417,7 +417,7 @@ protected:
     long m_CurrentViewTime; ///< The current time that is displayed by the playhead, not necessarily
                             ///the client time.
     qt3dsdm::Qt3DSDMInstanceHandle m_SceneInstance; ///< Pointer to the root level Scene object.
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlide; ///< The currently active Slide Handle.
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide; ///< The currently active Slide Handle.
     qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer; ///< The currently active layer.
     CPlaybackClock *m_PlaybackClock; ///< Playback clock. This is used when user clicks "Play"
     CCore *m_Core;
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index bd5ccabe..a05e2ce4 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -265,9 +265,9 @@ public:
             Qt3DSDMInstanceHandle theInstance(inInstance);
             SInstanceSlideInformation theSlideInfo(
                 theSlideSystem.GetInstanceSlideInformation(theInstance));
-            CUICDMSlideHandle theAssociatedSlide = theSlideInfo.m_AssociatedSlide;
-            CUICDMSlideHandle theMaster = theSlideInfo.m_MasterSlide;
-            CUICDMSlideHandle theActiveSlide = theSlideInfo.m_ActiveSlide;
+            Qt3DSDMSlideHandle theAssociatedSlide = theSlideInfo.m_AssociatedSlide;
+            Qt3DSDMSlideHandle theMaster = theSlideInfo.m_MasterSlide;
+            Qt3DSDMSlideHandle theActiveSlide = theSlideInfo.m_ActiveSlide;
             if (theAssociatedSlide == theMaster || theAssociatedSlide == theActiveSlide) {
                 long theViewTime = theSlideInfo.m_ComponentMilliseconds;
                 return eyeballVal && theStart <= theViewTime && theEnd > 0 && theEnd >= theViewTime;
@@ -310,7 +310,7 @@ public:
     TInstanceHandle GetImageInstanceForProperty(TInstanceHandle instance,
                                                         TPropertyHandle inProperty) const override
     {
-        qt3dsdm::CUICDMSlideHandle theAssociatedSlide(m_SlideSystem.GetAssociatedSlide(instance));
+        qt3dsdm::Qt3DSDMSlideHandle theAssociatedSlide(m_SlideSystem.GetAssociatedSlide(instance));
         SValue theGuid;
         if (m_SlideCore.GetSpecificInstancePropertyValue(theAssociatedSlide, instance, inProperty,
                                                          theGuid)
@@ -434,7 +434,7 @@ public:
         if (m_DataCore.GetInstancePropertyValue(inInstance, inProperty, theValue)) {
             TDataStrPtr theStr(get<TDataStrPtr>(theValue));
             if (theStr && theStr->GetLength())
-                outPaths.push_back(make_pair(CUICDMSlideHandle(0), CString(theStr->GetData())));
+                outPaths.push_back(make_pair(Qt3DSDMSlideHandle(0), CString(theStr->GetData())));
         }
 
         TSlideHandleList theSlides;
@@ -442,7 +442,7 @@ public:
 
         SValue theSlideValue;
         for (size_t idx = 0, end = theSlides.size(); idx < end; ++idx) {
-            CUICDMSlideHandle theSlide(theSlides[idx]);
+            Qt3DSDMSlideHandle theSlide(theSlides[idx]);
             if (m_SlideCore.GetSpecificInstancePropertyValue(theSlide, inInstance, inProperty,
                                                              theSlideValue)) {
                 TDataStrPtr theStr(get<TDataStrPtr>(theSlideValue));
@@ -473,7 +473,7 @@ public:
             GetAllPaths(theAsset, inProperty, thePaths);
 
             for (size_t pathIdx = 0, pathEnd = thePaths.size(); pathIdx < pathEnd; ++pathIdx) {
-                const pair<qt3dsdm::CUICDMSlideHandle, Q3DStudio::CString> &theSlideStr(
+                const pair<qt3dsdm::Qt3DSDMSlideHandle, Q3DStudio::CString> &theSlideStr(
                     thePaths[pathIdx]);
                 CFilePath thePath(theSlideStr.second);
                 if (inIncludeIdentifiers == false)
@@ -516,7 +516,7 @@ public:
         if (IsInstance(inInstance)) {
             AdditionalMetaDataType::Value thePropertyMetaData =
                 m_PropertySystem.GetAdditionalMetaDataType(inInstance, inProperty);
-            CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+            Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
             if (theAssociatedSlide.Valid() && m_SlideSystem.IsMasterSlide(theAssociatedSlide)) {
                 SValue theValue;
                 if (thePropertyMetaData == AdditionalMetaDataType::Image) {
@@ -598,7 +598,7 @@ public:
         return std::make_pair(0L, 0L);
     }
 
-    std::pair<long, long> GetTimeRangeInSlide(CUICDMSlideHandle inSlide,
+    std::pair<long, long> GetTimeRangeInSlide(Qt3DSDMSlideHandle inSlide,
                                               TInstanceHandle instance) const override
     {
         SValue theStart, theEnd;
@@ -687,7 +687,7 @@ public:
             return false;
         }
         if (inSlide.Valid() == false) {
-            CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
+            Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
             if (theSlide.Valid() == false) {
                 assert(0);
                 return false;
@@ -709,7 +709,7 @@ public:
             return false;
         }
         if (inSlide.Valid() == false) {
-            CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
+            Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
             if (theSlide.Valid() == false) {
                 assert(0);
                 return false;
@@ -804,7 +804,7 @@ public:
         return DoCopySceneGraphObject(inInstances).second;
     }
 
-    CFilePath CopyAction(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide) override
+    CFilePath CopyAction(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide) override
     {
         std::shared_ptr<IComposerSerializer> theSerializer(m_Doc.CreateSerializer());
         std::shared_ptr<qt3dsdm::IDOMWriter> theWriter(
@@ -814,7 +814,7 @@ public:
         return WriteWriterToFile(*theWriter, L"Action");
     }
 
-    std::shared_ptr<qt3dsdm::IDOMReader> CopySlide(CUICDMSlideHandle inSlide) override
+    std::shared_ptr<qt3dsdm::IDOMReader> CopySlide(Qt3DSDMSlideHandle inSlide) override
     {
         if (m_SlideSystem.IsMasterSlide(inSlide)) {
             QT3DS_ASSERT(false);
@@ -917,11 +917,11 @@ public:
     void Release() override { m_Doc.CloseTransaction(); }
 
     bool FilterForNotInSlideAndNotInstance(Q3DStudio::TIdentifier inInstance,
-                                           CUICDMSlideHandle inSlide,
+                                           Qt3DSDMSlideHandle inSlide,
                                            Qt3DSDMInstanceHandle inTargetInstance)
     {
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
-        CUICDMSlideHandle theParentSlide = m_SlideSystem.GetMasterSlide(theAssociatedSlide);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theParentSlide = m_SlideSystem.GetMasterSlide(theAssociatedSlide);
         if (inTargetInstance == Qt3DSDMInstanceHandle(inInstance)
             || (theAssociatedSlide != inSlide && theAssociatedSlide != theParentSlide))
             return true; // The object is *not* in present in this slide or is the target instance
@@ -931,7 +931,7 @@ public:
 
     void SetTimeRangeToParent(Qt3DSDMInstanceHandle inInstance)
     {
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         if (theAssociatedSlide.Valid() == false)
             return;
 
@@ -947,7 +947,7 @@ public:
 
         for (size_t slideIdx = 0, slideEnd = theChildSlides.size(); slideIdx < slideEnd;
              ++slideIdx) {
-            CUICDMSlideHandle theChildSlide(theChildSlides[slideIdx]);
+            Qt3DSDMSlideHandle theChildSlide(theChildSlides[slideIdx]);
             pair<long, long> destTimeRange(0, 0);
             if (isParentSlideOwner) {
                 // Get the previous item in the current slide.
@@ -1093,7 +1093,7 @@ public:
 
                 SValue theSlideValue;
                 for (size_t idx = 0, end = theSlides.size(); idx < end; ++idx) {
-                    CUICDMSlideHandle theSlide(theSlides[idx]);
+                    Qt3DSDMSlideHandle theSlide(theSlides[idx]);
                     if (m_SlideCore.GetSpecificInstancePropertyValue(theSlide, theInstance,
                                                                      theProperty, theSlideValue))
                         slideValues.push_back(std::make_pair(
@@ -1200,7 +1200,7 @@ public:
         }
     }
 
-    void SetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+    void SetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle instance,
                                                   TPropertyHandle propName, const SValue &value) override
     {
@@ -1215,7 +1215,7 @@ public:
     }
 
     void CheckMeshSubsets(TInstanceHandle instance, TPropertyHandle propName,
-                          Option<pair<CUICDMSlideHandle, SValue>> inValue = Empty())
+                          Option<pair<Qt3DSDMSlideHandle, SValue>> inValue = Empty())
     {
         // Simply ensure we have enough materials for all the subsets.
         TSlideValuePairList theValues;
@@ -1283,7 +1283,7 @@ public:
                 if (theSubsetName.size()) {
                     Qt3DSDMInstanceHandle theMaterial(theMaterials[subsetIdx]);
                     SValue theValue;
-                    CUICDMSlideHandle theSlide(theValues[propIdx].first);
+                    Qt3DSDMSlideHandle theSlide(theValues[propIdx].first);
                     Qt3DSDMPropertyHandle theNameProp(
                         m_Bridge.GetObjectDefinitions().m_Named.m_NameProp);
                     SValue theDMValue;
@@ -1526,7 +1526,7 @@ public:
                 return theImageInstance;
         }
 
-        CUICDMSlideHandle theSlide(GetAssociatedSlide(instance));
+        Qt3DSDMSlideHandle theSlide(GetAssociatedSlide(instance));
         TInstanceHandle theImageInstance =
             CreateSceneGraphInstance(ComposerObjectTypes::Image, instance, theSlide);
         const Q3DStudio::TGUIDPacked thePackedGuid(m_Bridge.GetGUID(theImageInstance));
@@ -1551,7 +1551,7 @@ public:
 
     void DeleteImageInstanceFromMaterialOrLayer(TInstanceHandle instance, TPropertyHandle propName)
     {
-        CUICDMSlideHandle theAssociatedSlide(GetAssociatedSlide(instance));
+        Qt3DSDMSlideHandle theAssociatedSlide(GetAssociatedSlide(instance));
         qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
             GetImageInstanceForProperty(instance, propName);
         if (theImageInstance.Valid()) {
@@ -1568,7 +1568,7 @@ public:
         assert(thePath.IsFile());
         if (!thePath.IsFile())
             return 0;
-        CUICDMSlideHandle theSlide(GetAssociatedSlide(instance));
+        Qt3DSDMSlideHandle theSlide(GetAssociatedSlide(instance));
 
         TInstanceHandle theImageInstance =
             CreateImageInstanceForMaterialOrLayer(instance, propName);
@@ -1598,7 +1598,7 @@ public:
                                  std::make_shared<qt3dsdm::CDataStr>(inSourcePath.c_str()), true);
         // If this is a render plugin
         if (thePath.Exists() && thePath.GetExtension().CompareNoCase("plugin")) {
-            CUICDMSlideHandle theSlide(GetAssociatedSlide(instance));
+            Qt3DSDMSlideHandle theSlide(GetAssociatedSlide(instance));
             return LoadRenderPlugin(thePath, instance, theSlide,
                                     DocumentEditorInsertType::LastChild, -1);
         }
@@ -1714,7 +1714,7 @@ public:
         // Find all actions that point to the old slide name, and change it to new name
         // First, we need to get the owning component instance, for example inSlideInstance is owned
         // by Scene
-        CUICDMSlideHandle theSlide = m_SlideSystem.GetSlideByInstance(inSlideInstance);
+        Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetSlideByInstance(inSlideInstance);
         if (theSlide.Valid() == false) {
             assert(0);
             return;
@@ -1775,7 +1775,7 @@ public:
         IPropertySystem &thePropertySystem(m_PropertySystem);
         AdditionalMetaDataType::Value thePropertyMetaData =
             thePropertySystem.GetAdditionalMetaDataType(instance, propName);
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(instance);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(instance);
         SValue theValue;
         if (thePropertyMetaData == AdditionalMetaDataType::Image) {
             qt3dsdm::Qt3DSDMInstanceHandle theInstance;
@@ -1805,7 +1805,7 @@ public:
         IPropertySystem &thePropertySystem(m_PropertySystem);
         AdditionalMetaDataType::Value thePropertyMetaData =
             thePropertySystem.GetAdditionalMetaDataType(instance, propName);
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(instance);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(instance);
         SValue theValue;
         if (thePropertyMetaData == AdditionalMetaDataType::Image
             && m_SlideCore.GetSpecificInstancePropertyValue(theAssociatedSlide, instance, propName,
@@ -1827,7 +1827,7 @@ public:
                 TSlideHandleList theChildren;
                 m_SlideCore.GetChildSlides(theAssociatedSlide, theChildren);
                 for (size_t idx = 0, end = theChildren.size(); idx < end; ++idx) {
-                    CUICDMSlideHandle theChildSlide(theChildren[idx]);
+                    Qt3DSDMSlideHandle theChildSlide(theChildren[idx]);
                     for (long childIdx = 0; childIdx < m_AssetGraph.GetChildCount(instance);
                          ++childIdx) {
                         TInstanceHandle theChild(m_AssetGraph.GetChild(instance, childIdx));
@@ -1873,8 +1873,8 @@ public:
 
     bool IsAssetNotInActiveSlide(Q3DStudio::TIdentifier inIdentifier)
     {
-        CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inIdentifier);
-        CUICDMSlideHandle theActiveSlide = m_Doc.GetActiveSlide();
+        Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inIdentifier);
+        Qt3DSDMSlideHandle theActiveSlide = m_Doc.GetActiveSlide();
         // return true to filter the object, apparently.
         bool isInCurrentSlide =
             theSlide == theActiveSlide || theSlide == m_SlideSystem.GetMasterSlide(theActiveSlide);
@@ -2055,7 +2055,7 @@ public:
     }
 
     virtual CUICDMAnimationHandle
-    CreateOrSetAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
+    CreateOrSetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
                          const wchar_t *propName, long subIndex, EAnimationType animType,
                          const float *keyframeValues, long numValues, bool /*inUserEdited*/) override
     {
@@ -2066,7 +2066,7 @@ public:
             return 0;
         }
         if (inSlide.Valid() == false) {
-            CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
+            Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(instance);
             if (theSlide.Valid() == false) {
                 assert(0);
                 return 0;
@@ -2109,7 +2109,7 @@ public:
         }
         return animHandle;
     }
-    bool RemoveAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
+    bool RemoveAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
                                  const wchar_t *propName, long subIndex) override
     {
         Qt3DSDMPropertyHandle propHdl =
@@ -2363,7 +2363,7 @@ public:
         qt3dsdm::TInstanceHandleList theInstances = ToGraphOrdering(inInstances);
         // Do this in reverse order.
         // first add new component.
-        CUICDMSlideHandle theSlide = GetAssociatedSlide(theInstances[0]);
+        Qt3DSDMSlideHandle theSlide = GetAssociatedSlide(theInstances[0]);
 
         TInstanceHandle component = CreateSceneGraphInstance(
             ComposerObjectTypes::Component, theInstances[0], theSlide,
@@ -2382,7 +2382,7 @@ public:
         DeleteInstances(theInstances);
 
         std::shared_ptr<IComposerSerializer> theSerializer = m_Doc.CreateSerializer();
-        CUICDMSlideHandle theComponentSlide(m_Bridge.GetComponentActiveSlide(component));
+        Qt3DSDMSlideHandle theComponentSlide(m_Bridge.GetComponentActiveSlide(component));
 
         // Paste into the master slide of the new component
         theSerializer->SerializeSceneGraphObject(*theReader, m_Doc.GetDocumentDirectory(),
@@ -2415,7 +2415,7 @@ public:
         return DoPasteSceneGraphObject(theReader, inDest, true, inInsertType, CPt());
     }
 
-    CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    CUICDMActionHandle AddAction(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                          const wstring &inEvent, const wstring &inHandler) override
     {
         Q3DStudio::CId theGuid = m_Bridge.GetGUID(inOwner);
@@ -2456,11 +2456,11 @@ public:
         return theSerializer->SerializeAction(*theReader, inNewRoot, GetActiveSlide(inNewRoot));
     }
 
-    bool ContainsSlideByName(const CString &inName, CUICDMSlideHandle inMasterSlide)
+    bool ContainsSlideByName(const CString &inName, Qt3DSDMSlideHandle inMasterSlide)
     {
         size_t existingCount = m_SlideSystem.GetSlideCount(inMasterSlide);
         for (size_t idx = 0; idx < existingCount; ++idx) {
-            CUICDMSlideHandle theSlide = m_SlideSystem.GetSlideByIndex(inMasterSlide, idx);
+            Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetSlideByIndex(inMasterSlide, idx);
             Qt3DSDMInstanceHandle theInstance(m_SlideSystem.GetSlideInstance(theSlide));
             if (GetName(theInstance) == inName)
                 return true;
@@ -2468,7 +2468,7 @@ public:
         return false;
     }
 
-    CString GenerateUniqueSlideName(const CString &inStem, CUICDMSlideHandle inMasterSlide,
+    CString GenerateUniqueSlideName(const CString &inStem, Qt3DSDMSlideHandle inMasterSlide,
                                     int inStartIndex)
     {
         size_t theStartIndex = inStartIndex;
@@ -2490,21 +2490,21 @@ public:
         return theNameStr;
     }
 
-    void CheckSlideGroupPlayThroughTo(CUICDMSlideHandle inSlide)
+    void CheckSlideGroupPlayThroughTo(Qt3DSDMSlideHandle inSlide)
     {
-        CUICDMSlideHandle theMaster(m_SlideSystem.GetMasterSlide(inSlide));
+        Qt3DSDMSlideHandle theMaster(m_SlideSystem.GetMasterSlide(inSlide));
         size_t slideCount(m_SlideSystem.GetSlideCount(theMaster));
         for (size_t idx = 1; idx < slideCount; ++idx) {
             bool hasPrevious = idx > 1;
             bool hasNext = idx < slideCount - 1;
-            CUICDMSlideHandle theCurrentSlide = m_SlideSystem.GetSlideByIndex(theMaster, idx);
+            Qt3DSDMSlideHandle theCurrentSlide = m_SlideSystem.GetSlideByIndex(theMaster, idx);
             Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theCurrentSlide);
             SValue theValue;
             Qt3DSDMPropertyHandle theProp = m_Bridge.GetObjectDefinitions().m_Slide.m_PlaythroughTo;
             m_DataCore.GetInstancePropertyValue(theSlideInstance, theProp, theValue);
             SStringOrInt theData(get<SStringOrInt>(theValue));
             if (theData.GetType() == SStringOrIntTypes::Int) {
-                CUICDMSlideHandle theSlide((int)get<long>(theData.m_Value));
+                Qt3DSDMSlideHandle theSlide((int)get<long>(theData.m_Value));
                 if (m_SlideCore.IsSlide(theSlide) == false) {
                     theData = SStringOrInt(std::make_shared<CDataStr>(L"Next"));
                     m_DataCore.SetInstancePropertyValue(theSlideInstance, theProp, theData);
@@ -2534,10 +2534,10 @@ public:
         }
     }
 
-    CUICDMSlideHandle AddSlide(CUICDMSlideHandle inMasterSlide, int inIndex = -1) override
+    Qt3DSDMSlideHandle AddSlide(Qt3DSDMSlideHandle inMasterSlide, int inIndex = -1) override
     {
         CString theNewName = GenerateUniqueSlideName(L"Slide", inMasterSlide, inIndex);
-        CUICDMSlideHandle theNewSlide = m_SlideSystem.DuplicateSlide(inMasterSlide, inIndex);
+        Qt3DSDMSlideHandle theNewSlide = m_SlideSystem.DuplicateSlide(inMasterSlide, inIndex);
         Qt3DSDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
         m_DataCore.SetInstancePropertyValue(newInstance,
                                             m_Bridge.GetObjectDefinitions().m_Named.m_NameProp,
@@ -2554,7 +2554,7 @@ public:
     }
 
     // Only valid if the master slide has more than one slide.
-    void DeleteSlide(CUICDMSlideHandle inSlide) override
+    void DeleteSlide(Qt3DSDMSlideHandle inSlide) override
     {
         TInstanceHandleList theInstances;
         m_SlideSystem.GetAssociatedInstances(inSlide, theInstances);
@@ -2569,7 +2569,7 @@ public:
             }
         }
 
-        CUICDMSlideHandle theMaster = m_SlideCore.GetParentSlide(inSlide);
+        Qt3DSDMSlideHandle theMaster = m_SlideCore.GetParentSlide(inSlide);
         size_t theCount = m_SlideSystem.GetSlideCount(theMaster);
         if (theCount < 2) {
             QT3DS_ASSERT(false);
@@ -2581,27 +2581,27 @@ public:
         CheckSlideGroupPlayThroughTo(theMaster);
     }
 
-    void RearrangeSlide(CUICDMSlideHandle inSlide, int inNewIndex) override
+    void RearrangeSlide(Qt3DSDMSlideHandle inSlide, int inNewIndex) override
     {
-        CUICDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
+        Qt3DSDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
         int theOldIndex = m_SlideSystem.GetSlideIndex(inSlide);
         m_SlideSystem.RearrangeSlide(theMaster, theOldIndex, inNewIndex);
         CheckSlideGroupPlayThroughTo(theMaster);
     }
 
-    CUICDMSlideHandle DuplicateSlide(CUICDMSlideHandle inSlide) override
+    Qt3DSDMSlideHandle DuplicateSlide(Qt3DSDMSlideHandle inSlide) override
     {
         std::shared_ptr<IDOMReader> theReader(CopySlide(inSlide));
         if (!theReader)
             return 0;
 
-        CUICDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
+        Qt3DSDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
         int theIndex = m_SlideSystem.GetSlideIndex(inSlide);
         std::shared_ptr<IComposerSerializer> theSerializer = m_Doc.CreateSerializer();
 
         CString theNewName = GenerateUniqueSlideName(L"Slide", theMaster, theIndex + 1);
 
-        CUICDMSlideHandle theNewSlide = theSerializer->SerializeSlide(
+        Qt3DSDMSlideHandle theNewSlide = theSerializer->SerializeSlide(
             *theReader, m_Doc.GetDocumentDirectory(), theMaster, theIndex);
 
         Qt3DSDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
@@ -2666,7 +2666,7 @@ public:
 
     TInstanceHandle DoImport(
         CFilePath inImportFilePath, Q3DStudio::CString importSrc, Qt3DSDMInstanceHandle inParent,
-        Qt3DSDMInstanceHandle inRoot, CUICDMSlideHandle inSlide, Q3DStudio::CString inDocDir,
+        Qt3DSDMInstanceHandle inRoot, Qt3DSDMSlideHandle inSlide, Q3DStudio::CString inDocDir,
         STranslationLog &inTranslationLog,
         function<SImportResult(IComposerEditorInterface &, Q3DStudio::CString)> inImportFunction,
         DocumentEditorInsertType::Enum inInsertType, const CPt &inPosition, long inStartTime)
@@ -3908,7 +3908,7 @@ public:
                 TIdMultiMap::iterator theGroupId =
                     theGroupIdMap
                         .insert(make_pair(m_StringTable.GetWideStr(GetImportId(theRoot)),
-                                          vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>()))
+                                          vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>>()))
                         .first;
                 insert_unique(theGroupId->second, make_pair(theSlide, theRoot));
                 theAddedInstances.insert(theRoot);
@@ -3921,7 +3921,7 @@ public:
             theIter = theImportPaths.find(m_StringTable.RegisterStr(theImportRelativePath));
             TSlideHandleList theAssociatedSlides;
             if (theIter != theImportPaths.end()) {
-                vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &theInstances =
+                vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>> &theInstances =
                     theIter->second;
                 for (size_t freeInstanceIdx = 0, end = theInstances.size(); freeInstanceIdx < end;
                      ++freeInstanceIdx) {
@@ -3935,7 +3935,7 @@ public:
                         theGroupIdMap
                             .insert(
                                 make_pair(m_StringTable.GetWideStr(GetImportId(theInstance)),
-                                          vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>()))
+                                          vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>>()))
                             .first;
                     for (size_t slideIdx = 0, slideEnd = theAssociatedSlides.size();
                          slideIdx < slideEnd; ++slideIdx)
@@ -4256,7 +4256,7 @@ public:
                     }
                 }
             }
-            qt3dsdm::CUICDMSlideHandle theAssociatedSlide = GetAssociatedSlide(theTextHandle);
+            qt3dsdm::Qt3DSDMSlideHandle theAssociatedSlide = GetAssociatedSlide(theTextHandle);
             if (theAssociatedSlide.Valid()) {
                 theChildSlides.clear();
                 m_SlideCore.GetChildSlides(theAssociatedSlide, theChildSlides);
diff --git a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
index b4eeb79d..0faf25d7 100644
--- a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
@@ -129,12 +129,12 @@ const Q3DStudio::TFilter FilterForNodeType(CDoc *inDoc)
 /**
  *	Excludes those who doesn't exist in SlideIndex
  */
-bool FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide,
+bool FilterForSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                     Q3DStudio::TIdentifier inGraphable)
 {
     try {
         qt3dsdm::ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inGraphable);
+        qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inGraphable);
         return !(theSlideSystem->IsMasterSlide(theSlide) || inSlide == theSlide);
     } catch (qt3dsdm::SlideNotFound &error) {
         Q_UNUSED(error);
@@ -146,7 +146,7 @@ bool FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide,
 /**
  *	Excludes those who doesn't exist in SlideIndex
  */
-const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide)
+const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     return boost::bind(FilterForSlide, inDoc, inSlide, _1);
 }
@@ -178,13 +178,13 @@ FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inCon
 /**
  *	Excludes those that are not in active component
  */
-bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inActiveComponentSlide,
+bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide,
                               Q3DStudio::TIdentifier inGraphable)
 {
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     qt3dsdm::ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
 
-    qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inGraphable);
+    qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inGraphable);
     if (theBridge->IsInActiveComponent(inGraphable)
         && (theSlideSystem->IsMasterSlide(theSlide) || theSlide == inActiveComponentSlide))
         return false; // I'm in the active component and on the right slide, don't filter me!
@@ -196,7 +196,7 @@ bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inActiveCo
  *	Excludes those that are not in active component
  */
 const Q3DStudio::TFilter FilterForActiveComponent(CDoc *inDoc,
-                                                  qt3dsdm::CUICDMSlideHandle inActiveComponentSlide)
+                                                  qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide)
 {
     return boost::bind(FilterForActiveComponent, inDoc, inActiveComponentSlide, _1);
 }
@@ -210,10 +210,10 @@ bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inTimePar
 {
     qt3dsdm::ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
 
-    qt3dsdm::CUICDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(inGraphable);
+    qt3dsdm::Qt3DSDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(inGraphable);
 
     // Get the current slide index
-    qt3dsdm::CUICDMSlideHandle theCurrentSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theCurrentSlide =
         inDoc->GetStudioSystem()->GetClientDataModelBridge()->GetComponentActiveSlide(inTimeParent);
     if (theSlideSystem->IsMasterSlide(theSlideHandle) || (theCurrentSlide == theSlideHandle))
         return false;
@@ -282,7 +282,7 @@ void GetAssetChildren(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
  *	Used primarily for displaying objects in the timeline in the correct order.
  */
 void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                             qt3dsdm::CUICDMSlideHandle inSlide,
+                             qt3dsdm::Qt3DSDMSlideHandle inSlide,
                              Q3DStudio::CGraphIterator &outIterator, EStudioObjectType inObjectType)
 {
     TAssetGraphPtr theGraph = inDoc->GetAssetGraph();
@@ -299,7 +299,7 @@ void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInsta
  */
 void GetAssetChildrenInTimeParent(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc,
                                   bool inIsAssetTimeParent, Q3DStudio::CGraphIterator &outIterator,
-                                  qt3dsdm::CUICDMSlideHandle inActiveComponentSlide)
+                                  qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide)
 {
     // TODO: for inFilterActiveComponentSlideIndex, just pass in the SlideHandle
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
@@ -414,12 +414,12 @@ void PrintAssetSubTree(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc, c
 /**
  *	Prints all the slides under a master slide
  */
-void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::CUICDMSlideHandle theMasterSlide)
+void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::Qt3DSDMSlideHandle theMasterSlide)
 {
     size_t slideCountBefore =
         m_Doc->GetStudioSystem()->GetSlideSystem()->GetSlideCount(theMasterSlide);
     for (size_t i = 0; i < slideCountBefore; ++i) {
-        qt3dsdm::CUICDMSlideHandle slideHdl =
+        qt3dsdm::Qt3DSDMSlideHandle slideHdl =
             m_Doc->GetStudioSystem()->GetSlideSystem()->GetSlideByIndex(theMasterSlide, i);
         Q3DStudio::CString name = m_Doc->GetStudioSystem()->GetClientDataModelBridge()->GetName(
             m_Doc->GetStudioSystem()->GetSlideSystem()->GetSlideInstance(slideHdl));
diff --git a/src/Authoring/Client/Code/Core/Doc/GraphUtils.h b/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
index d241d200..daa72ef1 100644
--- a/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
+++ b/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
@@ -66,9 +66,9 @@ const Q3DStudio::TFilter FilterAwayAssetType(CDoc *inDoc, EStudioObjectType inOb
 bool FilterForNodeType(CDoc *inDoc, Q3DStudio::TIdentifier inGraphable);
 const Q3DStudio::TFilter FilterForNodeType(CDoc *inDoc);
 
-bool FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide,
+bool FilterForSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                     Q3DStudio::TIdentifier inGraphable);
-const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide);
+const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
 bool FilterForControllingTimeParent(CDoc *inDoc,
                                     qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent,
@@ -76,10 +76,10 @@ bool FilterForControllingTimeParent(CDoc *inDoc,
 const Q3DStudio::TFilter
 FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent);
 
-bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inActiveComponentSlide,
+bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide,
                               Q3DStudio::TIdentifier inGraphable);
 const Q3DStudio::TFilter FilterForActiveComponent(CDoc *inDoc,
-                                                  qt3dsdm::CUICDMSlideHandle inActiveComponentSlide);
+                                                  qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide);
 
 bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inTimeParent,
                            Q3DStudio::TIdentifier inGraphable);
@@ -93,12 +93,12 @@ void GetAssetChildren(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                       Q3DStudio::CGraphIterator &outIterator,
                       EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
 void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
-                             qt3dsdm::CUICDMSlideHandle inSlide,
+                             qt3dsdm::Qt3DSDMSlideHandle inSlide,
                              Q3DStudio::CGraphIterator &outIterator,
                              EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
 void GetAssetChildrenInTimeParent(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc,
                                   bool inIsAssetTimeParent, Q3DStudio::CGraphIterator &outIterator,
-                                  qt3dsdm::CUICDMSlideHandle inActiveComponentSlide = 0);
+                                  qt3dsdm::Qt3DSDMSlideHandle inActiveComponentSlide = 0);
 void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                     Q3DStudio::CGraphIterator &outIterator,
                                     EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
@@ -113,6 +113,6 @@ Q3DStudio::TIdentifier GetSibling(const Q3DStudio::TIdentifier inNode, bool inAf
                                   const Q3DStudio::CGraphIterator &inIterator);
 
 void PrintAssetSubTree(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *m_Doc, char *prefix);
-void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::CUICDMSlideHandle theMasterSlide);
+void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::Qt3DSDMSlideHandle theMasterSlide);
 
 #endif // INCLUDED_GRAPH_UTILS_H
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerEditorInterface.h b/src/Authoring/Client/Code/Core/Doc/IComposerEditorInterface.h
index 35d5fcab..ba35b50f 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerEditorInterface.h
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerEditorInterface.h
@@ -50,7 +50,7 @@ namespace ComposerImport {
 
     // For the children of this instance that are associated with this slide,
     // update their information.
-    typedef unordered_map<const wchar_t *, vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>>
+    typedef unordered_map<const wchar_t *, vector<pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>>>
         TIdMultiMap;
 
     // Interface between the import library (which defines IComposerEditor)
@@ -74,7 +74,7 @@ namespace ComposerImport {
         static std::shared_ptr<IComposerEditorInterface> CreateEditorInterface(
             Q3DStudio::IDocumentEditor &editor, qt3dsdm::CDataModelHandle parent // Parent object
             ,
-            qt3dsdm::CDataModelHandle root, qt3dsdm::CUICDMSlideHandle slide,
+            qt3dsdm::CDataModelHandle root, qt3dsdm::Qt3DSDMSlideHandle slide,
             const Q3DStudio::CFilePath &docPath, const Q3DStudio::CFilePath &fullPathToImportFile,
             long inStartTime, qt3dsdm::IStringTable &inStringTable);
 
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index cfebf22d..252f32c3 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -296,7 +296,7 @@ using std::tuple;
 struct SComposerSerializerImpl : public IComposerSerializer
 {
     typedef unordered_set<Qt3DSDMInstanceHandle, hash<int>> TInstanceSet;
-    typedef unordered_set<CUICDMSlideHandle, hash<int>> TSlideSet;
+    typedef unordered_set<Qt3DSDMSlideHandle, hash<int>> TSlideSet;
     typedef unordered_set<CUICDMActionHandle, hash<int>> TActionSet;
     typedef vector<Qt3DSDMInstanceHandle> TInstanceList;
     typedef unordered_map<int, TCharPtr> THandleToIdMap;
@@ -328,8 +328,8 @@ struct SComposerSerializerImpl : public IComposerSerializer
     TGUIDToHandleMap m_GUIDToHandleMap;
     THandleToGUIDMap m_HandleToGUIDMap;
 
-    CUICDMSlideHandle m_ActiveSlide;
-    CUICDMSlideHandle m_ActiveSlideParent;
+    Qt3DSDMSlideHandle m_ActiveSlide;
+    Qt3DSDMSlideHandle m_ActiveSlideParent;
 
     THandleToIdMap m_ActionToIdMap;
     TIdToHandleMap m_IdToActionMap;
@@ -453,7 +453,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theIdStr;
     }
 
-    TCharPtr AddSlideId(const wstring &inId, CUICDMSlideHandle inHandle)
+    TCharPtr AddSlideId(const wstring &inId, Qt3DSDMSlideHandle inHandle)
     {
         TCharPtr theIdStr = m_StringTable.RegisterStr(inId.c_str());
         m_IdToSlideMap.insert(make_pair(theIdStr, inHandle));
@@ -475,7 +475,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return 0;
     }
 
-    CUICDMSlideHandle GetSlideById(TCharPtr inId)
+    Qt3DSDMSlideHandle GetSlideById(TCharPtr inId)
     {
         if (IsTrivial(inId))
             return 0;
@@ -526,7 +526,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
     TCharPtr GetInstanceName(Qt3DSDMInstanceHandle inInstance)
     {
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         SValue theValue;
         if (theAssociatedSlide.Valid()
                 && m_SlideCore.GetSpecificInstancePropertyValue(theAssociatedSlide, inInstance,
@@ -552,7 +552,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return L"";
     }
 
-    TCharPtr GetInstanceName(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide)
+    TCharPtr GetInstanceName(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide)
     {
         SValue theValue;
         if (m_SlideCore.GetSpecificInstancePropertyValue(
@@ -631,7 +631,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                             if (thePropGuid == theGuid)
                                 theProperty = theProperties[propIdx];
                         }
-                        CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+                        Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
                         if (theProperty.Valid() == false && theSlide.Valid()
                                 && m_SlideCore.GetSpecificInstancePropertyValue(
                                     theSlide, theMaterial, theProperties[propIdx], theValue)) {
@@ -653,7 +653,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return AddId(theNewId, inInstance);
     }
 
-    TCharPtr GetActionId(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    TCharPtr GetActionId(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                          Qt3DSDMInstanceHandle inInstance)
     {
         QT3DS_ASSERT(inAction.Valid());
@@ -670,7 +670,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
     // If this function is called with an invalid instance and we don't already have an id
     // then we assume we have an external reference and lookup the instance via the component id.
-    TCharPtr GetSlideId(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
+    TCharPtr GetSlideId(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
     {
         QT3DS_ASSERT(inSlide.Valid());
         THandleToIdMap::iterator theFind(m_SlideToIdMap.find(inSlide));
@@ -679,7 +679,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
         if (inInstance.Valid() == false) {
             m_ExternalSlides.insert(inSlide);
-            CUICDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
+            Qt3DSDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
             Qt3DSDMInstanceHandle theSlideData = m_SlideCore.GetSlideInstance(theMaster);
             SValue theValue;
             m_DataCore.GetInstancePropertyValue(
@@ -706,7 +706,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     || theLongValue.m_Longs[3])
                 return theLongValue;
         }
-        CUICDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         SValue theSlideValue;
         if (theSlide.Valid()
                 && m_SlideCore.GetInstancePropertyValue(theSlide, inInstance, inProperty,
@@ -808,7 +808,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         } else if (theValueType == DataModelDataType::StringOrInt) {
             const SStringOrInt &theData(get<SStringOrInt>(theValue));
             if (theData.GetType() == SStringOrIntTypes::Int) {
-                CUICDMSlideHandle theHandle(get<long>(theData.m_Value));
+                Qt3DSDMSlideHandle theHandle(get<long>(theData.m_Value));
                 wstring theSlideId(L"#");
                 theSlideId.append(GetSlideId(theHandle, 0));
                 theValue = std::make_shared<CDataStr>(theSlideId.c_str());
@@ -854,7 +854,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
         if (inType == DataModelDataType::StringOrInt) {
             if (inValue[0] == '#') {
-                CUICDMSlideHandle theSlide = GetSlideById(inValue + 1);
+                Qt3DSDMSlideHandle theSlide = GetSlideById(inValue + 1);
                 QT3DS_ASSERT(theSlide.Valid());
                 return SStringOrInt((long)theSlide.GetHandleValue());
             } else
@@ -1023,7 +1023,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void ParseAnimation(IDOMReader &inReader, CUICDMSlideHandle inSlide,
+    void ParseAnimation(IDOMReader &inReader, Qt3DSDMSlideHandle inSlide,
                         Qt3DSDMInstanceHandle inInstance)
     {
         IDOMReader::Scope __animScope(inReader);
@@ -1135,7 +1135,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         m_AnimationCore.SetIsArtistEdited(theAnimation, artistEdited);
     }
 
-    void SerializeAction(IDOMWriter &inWriter, CUICDMSlideHandle inSlide,
+    void SerializeAction(IDOMWriter &inWriter, Qt3DSDMSlideHandle inSlide,
                          Qt3DSDMInstanceHandle inInstance, CUICDMActionHandle inAction)
     {
         TCharStr valueStr;
@@ -1190,7 +1190,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void SerializeActions(IDOMWriter &inWriter, CUICDMSlideHandle inSlide,
+    void SerializeActions(IDOMWriter &inWriter, Qt3DSDMSlideHandle inSlide,
                           Qt3DSDMInstanceHandle inInstance, TActionHandleList &inActions)
     {
         // We sort the actions just by action handle.  This keeps the file in the same order because
@@ -1258,7 +1258,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theSourceInstance;
     }
 
-    CUICDMActionHandle ParseAction(IDOMReader &inReader, CUICDMSlideHandle inSlide,
+    CUICDMActionHandle ParseAction(IDOMReader &inReader, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inInstance)
     {
         IDOMReader::Scope __actionScope(inReader);
@@ -1329,8 +1329,8 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theAction;
     }
 
-    void GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
-                                     CUICDMSlideHandle inSlideParent,
+    void GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
+                                     Qt3DSDMSlideHandle inSlideParent,
                                      TPropertyHandleValuePairList &ioValues,
                                      TAnimationHandleList &ioAnimations,
                                      TActionHandleList &ioActions)
@@ -1383,7 +1383,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    TCharPtr GetSlideName(CUICDMSlideHandle inSlide)
+    TCharPtr GetSlideName(Qt3DSDMSlideHandle inSlide)
     {
         if (inSlide.Valid() == false)
             return L"";
@@ -1398,11 +1398,11 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return L"";
     }
 
-    CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance)
+    Qt3DSDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance)
     {
         if (inInstance.Valid() == false)
             return 0;
-        CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         if (theAssociatedSlide == m_ActiveSlideParent)
             return m_ActiveSlide;
         return theAssociatedSlide;
@@ -1451,7 +1451,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         m_DataCore.GetSpecificInstancePropertyValues(inInstance, outList);
         SanitizeHandleValuePairList(inInstance, outList);
     }
-    void GetSlidePropertyValues(CUICDMSlideHandle inSlide, TPropertyHandleValuePairList &outList)
+    void GetSlidePropertyValues(Qt3DSDMSlideHandle inSlide, TPropertyHandleValuePairList &outList)
     {
         Qt3DSDMInstanceHandle theSlideInstance(m_SlideCore.GetSlideInstance(inSlide));
         if (theSlideInstance.Valid() == false)
@@ -1533,7 +1533,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void ParseAndSetInstanceProperties(IDOMReader &inReader, CUICDMSlideHandle inSlide,
+    void ParseAndSetInstanceProperties(IDOMReader &inReader, Qt3DSDMSlideHandle inSlide,
                                        Qt3DSDMInstanceHandle inInstance,
                                        vector<pair<TCharPtr, TCharPtr>> &outExtraAttributes,
                                        TPropertyHandleValuePairList &ioProperties)
@@ -1554,11 +1554,11 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> CreateSlide()
+    pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> CreateSlide()
     {
         Qt3DSDMInstanceHandle slideInstance = m_DataCore.CreateInstance();
         m_DataCore.DeriveInstance(slideInstance, m_ObjectDefinitions.m_Slide.m_Instance);
-        CUICDMSlideHandle masterSlide = m_SlideCore.CreateSlide(slideInstance);
+        Qt3DSDMSlideHandle masterSlide = m_SlideCore.CreateSlide(slideInstance);
         return make_pair(masterSlide, slideInstance);
     }
 
@@ -1613,7 +1613,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
         m_InstanceSet.insert(inInstance);
 
-        CUICDMSlideHandle theAssociatedSlide = GetAssociatedSlide(inInstance);
+        Qt3DSDMSlideHandle theAssociatedSlide = GetAssociatedSlide(inInstance);
 
         if (theAssociatedSlide.Valid())
             m_SlideSet.insert(theAssociatedSlide);
@@ -1623,7 +1623,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         if (isSlideOwner) {
             // Ensure we mark all of those slides.
             SLong4 theGuid = GetGuid(inInstance, m_ObjectDefinitions.m_Guided.m_GuidProp);
-            CUICDMSlideHandle theMasterSlide = m_SlideSystem.GetMasterSlideByComponentGuid(theGuid);
+            Qt3DSDMSlideHandle theMasterSlide = m_SlideSystem.GetMasterSlideByComponentGuid(theGuid);
             if (theMasterSlide.Valid()) {
                 TSlideHandleList theChildSlides;
                 m_SlideCore.GetChildSlides(theMasterSlide, theChildSlides);
@@ -1680,7 +1680,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 // If we a copying from a master slide, we don't want nonmaster
                 // only children of this object.
                 Qt3DSDMInstanceHandle theChildHandle = theChildren.GetCurrent();
-                CUICDMSlideHandle theChildAssociatedSlide = GetAssociatedSlide(theChildHandle);
+                Qt3DSDMSlideHandle theChildAssociatedSlide = GetAssociatedSlide(theChildHandle);
                 isNonmasterActiveSlideChild =
                         std::find(theActiveSlideChildren.begin(), theActiveSlideChildren.end(),
                                   theChildAssociatedSlide)
@@ -1784,7 +1784,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void WriteSlideMasterOverrides(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance,
-                                   CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent)
+                                   Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent)
     {
         TPropertyHandleValuePairList theValues;
         TAnimationHandleList theAnimations;
@@ -1843,7 +1843,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void WriteSlideInstance(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance,
-                            CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent)
+                            Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent)
     {
         TPropertyHandleValuePairList theValues;
         TAnimationHandleList theAnimations;
@@ -1892,16 +1892,16 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // Get the set of instances associated with a slide but filtered by our
     // m_InstanceSet, meaning ignore instances that aren't scene graph instances
     // and that haven't been written out.
-    void GetFilteredAssociatedInstances(CUICDMSlideHandle inSlide,
+    void GetFilteredAssociatedInstances(Qt3DSDMSlideHandle inSlide,
                                         TInstanceHandleList &outInstances)
     {
         m_SlideSystem.GetAssociatedInstances(inSlide, outInstances);
         erase_if(outInstances, SInstanceNotInSet(m_InstanceSet));
     }
 
-    Qt3DSDMInstanceHandle GetSlideComponent(CUICDMSlideHandle inSlide)
+    Qt3DSDMInstanceHandle GetSlideComponent(Qt3DSDMSlideHandle inSlide)
     {
-        CUICDMSlideHandle theMasterSlide = m_SlideSystem.GetMasterSlide(inSlide);
+        Qt3DSDMSlideHandle theMasterSlide = m_SlideSystem.GetMasterSlide(inSlide);
         Qt3DSDMInstanceHandle theMasterInstance(m_SlideCore.GetSlideInstance(theMasterSlide));
         SLong4 theComponentGuid =
                 GetGuid(theMasterInstance, m_ObjectDefinitions.m_Slide.m_ComponentId);
@@ -1927,8 +1927,8 @@ struct SComposerSerializerImpl : public IComposerSerializer
         {
             return GetInstanceOrder(lhs) < GetInstanceOrder(rhs);
         }
-        bool operator()(const std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &lhs,
-                        const std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &rhs) const
+        bool operator()(const std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> &lhs,
+                        const std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> &rhs) const
         {
             return GetInstanceOrder(lhs.second) < GetInstanceOrder(rhs.second);
         }
@@ -1985,13 +1985,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 }
             }
         } // m_ActiveSlide.valid;
-        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> theSerializationSlides;
+        std::vector<std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>> theSerializationSlides;
         theSerializationSlides.reserve(m_SlideSet.size());
         TSlideSet theMasterSlideSet;
         for (TSlideSet::iterator theIter = m_SlideSet.begin(), end = m_SlideSet.end();
              theIter != end; ++theIter) {
-            CUICDMSlideHandle theSlide = *theIter;
-            CUICDMSlideHandle theMasterSlide = m_SlideCore.GetParentSlide(theSlide);
+            Qt3DSDMSlideHandle theSlide = *theIter;
+            Qt3DSDMSlideHandle theMasterSlide = m_SlideCore.GetParentSlide(theSlide);
             if (theMasterSlide.Valid() && theMasterSlideSet.insert(theMasterSlide).second) {
                 Qt3DSDMInstanceHandle theSlideOwner(GetSlideComponent(theMasterSlide));
                 if (theSlideOwner.Valid())
@@ -2003,7 +2003,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                          SInstanceOrderSorter(m_InstanceToGraphDepthMap));
         for (size_t slideSetIdx = 0, slideSetEnd = theSerializationSlides.size();
              slideSetIdx < slideSetEnd; ++slideSetIdx) {
-            CUICDMSlideHandle theMasterSlide = theSerializationSlides[slideSetIdx].first;
+            Qt3DSDMSlideHandle theMasterSlide = theSerializationSlides[slideSetIdx].first;
             Qt3DSDMInstanceHandle theComponent = theSerializationSlides[slideSetIdx].second;
             IDOMWriter::Scope __masterScope(inWriter, L"State");
 
@@ -2033,11 +2033,11 @@ struct SComposerSerializerImpl : public IComposerSerializer
             // else a reference to a further slide may generate an external slide reference
             // which wouldn't be our intention.
             for (size_t idx = 0, end = theChildren.size(); idx < end; ++idx) {
-                CUICDMSlideHandle theChildSlide(theChildren[idx]);
+                Qt3DSDMSlideHandle theChildSlide(theChildren[idx]);
                 GetSlideId(theChildSlide, theComponent);
             }
             for (size_t idx = 0, end = theChildren.size(); idx < end; ++idx) {
-                CUICDMSlideHandle theChildSlide(theChildren[idx]);
+                Qt3DSDMSlideHandle theChildSlide(theChildren[idx]);
                 m_SlideSet.erase(theChildSlide);
                 IDOMWriter::Scope __childSlideScope(inWriter, L"State");
                 inWriter.Att(L"id", GetSlideId(theChildSlide, theComponent));
@@ -2077,13 +2077,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
     struct SActionParseRecord
     {
         void *m_ReaderScope;
-        CUICDMSlideHandle m_Slide;
+        Qt3DSDMSlideHandle m_Slide;
         Qt3DSDMInstanceHandle m_Instance;
         SActionParseRecord()
             : m_ReaderScope(NULL)
         {
         }
-        SActionParseRecord(void *inReaderScope, CUICDMSlideHandle inSlide,
+        SActionParseRecord(void *inReaderScope, Qt3DSDMSlideHandle inSlide,
                            Qt3DSDMInstanceHandle inInstance)
             : m_ReaderScope(inReaderScope)
             , m_Slide(inSlide)
@@ -2092,7 +2092,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     };
 
-    void ParseSlide(IDOMReader &inReader, CUICDMSlideHandle inSlide, SLong4 inComponentId,
+    void ParseSlide(IDOMReader &inReader, Qt3DSDMSlideHandle inSlide, SLong4 inComponentId,
                     vector<SActionParseRecord> &inUnparsedActions)
     {
         IDOMReader::Scope __stateScope(inReader);
@@ -2112,7 +2112,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 {
                     const wchar_t *theId = L"";
                     inReader.Att(L"Id", theId);
-                    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> theChildSlideInstPair =
+                    pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> theChildSlideInstPair =
                             CreateSlide();
                     m_SlideCore.DeriveSlide(theChildSlideInstPair.first, inSlide);
                     m_DataCore.SetInstancePropertyValue(theChildSlideInstPair.second,
@@ -2171,7 +2171,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             } else if (AreEqual(inReader.GetElementName(), L"State")) {
                 const wchar_t *theId = L"";
                 inReader.Att(L"Id", theId);
-                CUICDMSlideHandle theSlide;
+                Qt3DSDMSlideHandle theSlide;
                 if (!IsTrivial(theId))
                     theSlide = GetSlideById(theId);
                 else
@@ -2223,7 +2223,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 bool foundDuplicateGraph = false;
                 for (size_t idx = 0, end = theGraphs.size();
                      idx < end && foundDuplicateGraph == false; ++idx) {
-                    CUICDMSlideHandle theMaster = m_SlideGraphCore.GetGraphRoot(theGraphs[idx]);
+                    Qt3DSDMSlideHandle theMaster = m_SlideGraphCore.GetGraphRoot(theGraphs[idx]);
                     Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theMaster);
                     SValue theValue;
                     if (m_DataCore.GetInstancePropertyValue(
@@ -2240,7 +2240,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     }
                 }
                 if (foundDuplicateGraph == false) {
-                    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> theSlideInstPair = CreateSlide();
+                    pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> theSlideInstPair = CreateSlide();
                     m_SlideGraphCore.CreateSlideGraph(theSlideInstPair.first);
                     m_DataCore.SetInstancePropertyValue(theSlideInstPair.second,
                                                         m_ObjectDefinitions.m_Slide.m_ComponentId,
@@ -2306,7 +2306,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         for (TSlideSet::iterator theIter = m_ExternalSlides.begin(),
              theEnd = m_ExternalSlides.end();
              theIter != theEnd; ++theIter) {
-            CUICDMSlideHandle theSlide(*theIter);
+            Qt3DSDMSlideHandle theSlide(*theIter);
             IDOMWriter::Scope __refScope(inWriter, L"SlideReference");
             theId.assign(L"#");
             theId.append(GetSlideId(theSlide, 0));
@@ -2454,7 +2454,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     inReader.Att(L"ref", theRef);
                     inReader.Att(L"handle", theGuidBuf);
                     long theHandleValue(wcstol(theGuidBuf.wide_str(), NULL, 10));
-                    CUICDMSlideHandle theSlide(theHandleValue);
+                    Qt3DSDMSlideHandle theSlide(theHandleValue);
                     QT3DS_ASSERT(m_SlideCore.IsSlide(theSlide));
                     AddSlideId(theRef.wide_str() + 1, theSlide);
                 }
@@ -2720,7 +2720,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // new root.
     virtual qt3dsdm::TInstanceHandleList
     SerializeSceneGraphObject(IDOMReader &inReader, const CFilePath &inDocumentDirectory,
-                              Qt3DSDMInstanceHandle inNewRoot, CUICDMSlideHandle inActiveSlide) override
+                              Qt3DSDMInstanceHandle inNewRoot, Qt3DSDMSlideHandle inActiveSlide) override
     {
         reset();
         m_ActiveSlide = inActiveSlide;
@@ -2732,7 +2732,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // Equivalent to the older partial serialization system
     void SerializeSceneGraphObjects(IDOMWriter &inWriter,
                                             const TInstanceHandleList &inInstances,
-                                            CUICDMSlideHandle inActiveSlide) override
+                                            Qt3DSDMSlideHandle inActiveSlide) override
     {
         if (inInstances.empty())
             return;
@@ -2746,7 +2746,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     // Save and load just a single action
-    void SerializeAction(qt3dsdm::IDOMWriter &inWriter, CUICDMSlideHandle inSlide,
+    void SerializeAction(qt3dsdm::IDOMWriter &inWriter, Qt3DSDMSlideHandle inSlide,
                                  CUICDMActionHandle inAction) override
     {
         reset();
@@ -2759,7 +2759,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // Load a new action onto this root object
     qt3dsdm::CUICDMActionHandle SerializeAction(qt3dsdm::IDOMReader &inReader,
                                                       qt3dsdm::Qt3DSDMInstanceHandle inNewRoot,
-                                                      qt3dsdm::CUICDMSlideHandle inSlide) override
+                                                      qt3dsdm::Qt3DSDMSlideHandle inSlide) override
     {
         reset();
         m_PreserveFileIds = false;
@@ -2784,11 +2784,11 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
     struct SParentInSlide
     {
-        CUICDMSlideHandle m_Slide;
+        Qt3DSDMSlideHandle m_Slide;
         ISlideSystem &m_SlideSystem;
         CGraph &m_AssetGraph;
 
-        SParentInSlide(CUICDMSlideHandle inSlide, ISlideSystem &inSystem, CGraph &inAssetGraph)
+        SParentInSlide(Qt3DSDMSlideHandle inSlide, ISlideSystem &inSystem, CGraph &inAssetGraph)
             : m_Slide(inSlide)
             , m_SlideSystem(inSystem)
             , m_AssetGraph(inAssetGraph)
@@ -2804,7 +2804,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     };
 
-    void SerializeSlide(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::CUICDMSlideHandle inSlide) override
+    void SerializeSlide(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::Qt3DSDMSlideHandle inSlide) override
     {
         reset();
         m_PreserveFileIds = false;
@@ -2828,14 +2828,14 @@ struct SComposerSerializerImpl : public IComposerSerializer
         DoSerializeScene(inWriter, theInstancePtr, (QT3DSU32)theSlideInstances.size(), true);
     }
 
-    CUICDMSlideHandle SerializeSlide(qt3dsdm::IDOMReader &inReader,
+    Qt3DSDMSlideHandle SerializeSlide(qt3dsdm::IDOMReader &inReader,
                                              const CFilePath &inDocumentDirectory,
-                                             qt3dsdm::CUICDMSlideHandle inMaster, int newIndex) override
+                                             qt3dsdm::Qt3DSDMSlideHandle inMaster, int newIndex) override
     {
         reset();
         m_PreserveFileIds = false;
         m_ActiveSlideParent = inMaster;
-        CUICDMSlideHandle retval = m_SlideSystem.DuplicateSlide(inMaster, newIndex + 1);
+        Qt3DSDMSlideHandle retval = m_SlideSystem.DuplicateSlide(inMaster, newIndex + 1);
         m_ActiveSlide = retval;
         Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(retval);
         Qt3DSDMInstanceHandle theMasterInstance(m_SlideSystem.GetSlideInstance(inMaster));
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
index 04e89ff9..b511e0b2 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
@@ -76,27 +76,27 @@ public:
     // Equivalent to the older partial serialization system
     virtual void SerializeSceneGraphObjects(qt3dsdm::IDOMWriter &inWriter,
                                             const qt3dsdm::TInstanceHandleList &inInstances,
-                                            qt3dsdm::CUICDMSlideHandle inActiveSlide) = 0;
+                                            qt3dsdm::Qt3DSDMSlideHandle inActiveSlide) = 0;
 
     // Read a partial serialization into this slide, attaching the instance as the last child of the
     // new root.
     virtual qt3dsdm::TInstanceHandleList SerializeSceneGraphObject(
         qt3dsdm::IDOMReader &inReader, const Q3DStudio::CFilePath &inDocumentDirectory,
-        qt3dsdm::Qt3DSDMInstanceHandle inNewRoot, qt3dsdm::CUICDMSlideHandle inActiveSlide) = 0;
+        qt3dsdm::Qt3DSDMInstanceHandle inNewRoot, qt3dsdm::Qt3DSDMSlideHandle inActiveSlide) = 0;
 
     // Save and load just a single action
-    virtual void SerializeAction(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::CUICDMSlideHandle inSlide,
+    virtual void SerializeAction(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                  qt3dsdm::CUICDMActionHandle inAction) = 0;
     // Load a new action onto this root object
     virtual qt3dsdm::CUICDMActionHandle SerializeAction(qt3dsdm::IDOMReader &inReader,
                                                       qt3dsdm::Qt3DSDMInstanceHandle inNewRoot,
-                                                      qt3dsdm::CUICDMSlideHandle inSlide) = 0;
+                                                      qt3dsdm::Qt3DSDMSlideHandle inSlide) = 0;
 
-    virtual void SerializeSlide(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::CUICDMSlideHandle inSlide) = 0;
+    virtual void SerializeSlide(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::Qt3DSDMSlideHandle inSlide) = 0;
 
-    virtual qt3dsdm::CUICDMSlideHandle SerializeSlide(qt3dsdm::IDOMReader &inReader,
+    virtual qt3dsdm::Qt3DSDMSlideHandle SerializeSlide(qt3dsdm::IDOMReader &inReader,
                                                     const CFilePath &inDocumentDirectory,
-                                                    qt3dsdm::CUICDMSlideHandle inMaster,
+                                                    qt3dsdm::Qt3DSDMSlideHandle inMaster,
                                                     int inNewIndex = -1) = 0;
 
     friend class std::shared_ptr<IComposerSerializer>;
diff --git a/src/Authoring/Client/Code/Core/Doc/IDoc.h b/src/Authoring/Client/Code/Core/Doc/IDoc.h
index e045f6f0..42406049 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDoc.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDoc.h
@@ -57,7 +57,7 @@ namespace foundation {
 }
 namespace qt3dsdm {
 class Qt3DSDMInstanceHandle;
-class CUICDMSlideHandle;
+class Qt3DSDMSlideHandle;
 class CStudioSystem;
 class IPropertySystem;
 class IAnimationCore;
@@ -83,8 +83,8 @@ class IDoc
 public:
     virtual long GetCurrentViewTime() const = 0;
     virtual void NotifyTimeChanged(long inNewTime) = 0;
-    virtual void NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide) = 0;
-    virtual void NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide,
+    virtual void NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide) = 0;
+    virtual void NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide,
                                           bool inForceRefresh,
                                           bool inIgnoreLastDisplayTime = false) = 0;
     virtual void NotifySelectionChanged(
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
index 3787d7f6..0728fa14 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
@@ -300,7 +300,7 @@ public:
         return DuplicateInstances(theInstances);
     }
 
-    virtual CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    virtual CUICDMActionHandle AddAction(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                          const wstring &inEvent, const wstring &inHandler) = 0;
 
     virtual void DeleteAction(CUICDMActionHandle inAction) = 0;
@@ -309,14 +309,14 @@ public:
     virtual CUICDMActionHandle PasteAction(const CFilePath &inFilePath,
                                            Qt3DSDMInstanceHandle inNewRoot) = 0;
 
-    virtual CUICDMSlideHandle AddSlide(CUICDMSlideHandle inMasterSlide, int inIndex = -1) = 0;
+    virtual Qt3DSDMSlideHandle AddSlide(Qt3DSDMSlideHandle inMasterSlide, int inIndex = -1) = 0;
 
     // Only valid if the master slide has more than one slide.
-    virtual void DeleteSlide(CUICDMSlideHandle inSlide) = 0;
+    virtual void DeleteSlide(Qt3DSDMSlideHandle inSlide) = 0;
 
-    virtual void RearrangeSlide(CUICDMSlideHandle inSlide, int inNewIndex) = 0;
+    virtual void RearrangeSlide(Qt3DSDMSlideHandle inSlide, int inNewIndex) = 0;
 
-    virtual CUICDMSlideHandle DuplicateSlide(CUICDMSlideHandle inSlide) = 0;
+    virtual Qt3DSDMSlideHandle DuplicateSlide(Qt3DSDMSlideHandle inSlide) = 0;
 
     virtual qt3dsdm::CUICDMGuideHandle CreateGuide(const qt3dsdm::SGuideInfo &inInfo) = 0;
     virtual void UpdateGuide(qt3dsdm::CUICDMGuideHandle hdl, const qt3dsdm::SGuideInfo &inInfo) = 0;
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
index 3852a9d1..82e9f998 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
@@ -56,14 +56,14 @@ namespace Q3DStudio {
 using std::shared_ptr;
 class IDynamicLua;
 
-typedef std::vector<std::pair<qt3dsdm::CUICDMSlideHandle, qt3dsdm::Qt3DSDMInstanceHandle>>
+typedef std::vector<std::pair<qt3dsdm::Qt3DSDMSlideHandle, qt3dsdm::Qt3DSDMInstanceHandle>>
     TSlideInstanceList;
-typedef std::vector<std::pair<qt3dsdm::CUICDMSlideHandle, Q3DStudio::CString>> TSlideStringList;
+typedef std::vector<std::pair<qt3dsdm::Qt3DSDMSlideHandle, Q3DStudio::CString>> TSlideStringList;
 typedef std::unordered_map<const wchar_t *, TSlideInstanceList> TCharPtrToSlideInstanceMap;
 using qt3ds::foundation::Option;
 using qt3dsdm::Qt3DSDMInstanceHandle;
 using qt3dsdm::Qt3DSDMPropertyHandle;
-using qt3dsdm::CUICDMSlideHandle;
+using qt3dsdm::Qt3DSDMSlideHandle;
 using qt3dsdm::CUICDMKeyframeHandle;
 using qt3dsdm::CUICDMActionHandle;
 using qt3dsdm::CUICDMAnimationHandle;
@@ -81,7 +81,7 @@ protected:
 public:
     typedef Qt3DSDMInstanceHandle TInstanceHandle;
     typedef Qt3DSDMPropertyHandle TPropertyHandle;
-    typedef CUICDMSlideHandle TSlideHandle;
+    typedef Qt3DSDMSlideHandle TSlideHandle;
     typedef CUICDMKeyframeHandle TKeyframeHandle;
     typedef qt3dsdm::SValue SValue;
     typedef std::pair<TSlideHandle, SValue> TSlideValuePair;
@@ -180,7 +180,7 @@ public:
 
     // Return (start,end), inclusive, that represent this instance's lifetime.
     virtual std::pair<long, long> GetTimeRange(TInstanceHandle instance) const = 0;
-    virtual std::pair<long, long> GetTimeRangeInSlide(CUICDMSlideHandle inSlide,
+    virtual std::pair<long, long> GetTimeRangeInSlide(Qt3DSDMSlideHandle inSlide,
                                                       TInstanceHandle instance) const = 0;
     // Get the GUID for a given instance.
     virtual qt3dsdm::SLong4 GetGuidForInstance(TInstanceHandle instance) const = 0;
@@ -229,7 +229,7 @@ public:
     virtual std::shared_ptr<qt3dsdm::IDOMReader>
     CopySceneGraphObjectToMemory(Qt3DSDMInstanceHandle inInstance) = 0;
 
-    virtual CFilePath CopyAction(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide) = 0;
+    virtual CFilePath CopyAction(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide) = 0;
 
     virtual void ParseSourcePathsOutOfEffectFile(Q3DStudio::CString inFile,
                                                  std::vector<Q3DStudio::CString> &outFilePaths) = 0;
@@ -237,7 +237,7 @@ public:
     virtual Q3DStudio::CString GetCustomMaterialName(const Q3DStudio::CString &inFullPathToFile) const = 0;
 
     // Must not be a master slide.  Used during duplicate slide.
-    virtual std::shared_ptr<qt3dsdm::IDOMReader> CopySlide(CUICDMSlideHandle inSlide) = 0;
+    virtual std::shared_ptr<qt3dsdm::IDOMReader> CopySlide(Qt3DSDMSlideHandle inSlide) = 0;
 
     // Don't release this, it is owned and cached by the document.  Also, reset top to 0 with a
     // scope, please.
diff --git a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
index 5674b8cf..f83a3d62 100644
--- a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
@@ -97,7 +97,7 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
     static inline void SetPropertyIfOnInstance(const TSlideEntry &inEntry,
                                                Qt3DSDMInstanceHandle inInstance,
                                                Qt3DSDMInstanceHandle inDestInstance,
-                                               CUICDMSlideHandle inDestSlide,
+                                               Qt3DSDMSlideHandle inDestSlide,
                                                TSlideCorePtr inSlideCore)
     {
         if (get<0>(inEntry) == inInstance)
@@ -106,9 +106,9 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
     }
 
     static inline void
-    CopyAnimationIfOnInstance(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSourceSlide,
+    CopyAnimationIfOnInstance(CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inSourceSlide,
                               Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inDestInstance,
-                              CUICDMSlideHandle inDestSlide, TAnimationCorePtr inAnimationCore)
+                              Qt3DSDMSlideHandle inDestSlide, TAnimationCorePtr inAnimationCore)
     {
         SAnimationInfo theInfo(inAnimationCore->GetAnimationInfo(inAnimation));
         if (theInfo.m_Instance == inInstance && theInfo.m_Slide == inSourceSlide)
@@ -120,8 +120,8 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
      *	Duplicate this instance and whichever properties and animations you desire,
      *	returning a new data model value that will be set on the newly created property.
      */
-    SValue CreateInstanceForProperty(CUICDMSlideHandle inSourceSlide,
-                                             CUICDMSlideHandle inDestSlide,
+    SValue CreateInstanceForProperty(Qt3DSDMSlideHandle inSourceSlide,
+                                             Qt3DSDMSlideHandle inDestSlide,
                                              Qt3DSDMInstanceHandle inInstance) override
     {
         std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4> theInstanceGuidPair(
diff --git a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
index 207c9cc8..6ea23673 100644
--- a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
@@ -208,7 +208,7 @@ qt3dsdm::Qt3DSDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath
         qt3dsdm::Qt3DSDMInstanceHandle theTimeParent =
             theBridge->GetOwningComponentInstance(theFoundInstance);
         if (theTimeParent.Valid()) {
-            qt3dsdm::CUICDMSlideHandle theCurrentSlide =
+            qt3dsdm::Qt3DSDMSlideHandle theCurrentSlide =
                 theBridge->GetComponentActiveSlide(theTimeParent);
             return DoFindAssetInstanceByObjectPath(inDoc, theFoundInstance, theTimeParent,
                                                    theCurrentSlide, theTokenizer, outIsResolved,
@@ -258,7 +258,7 @@ CRelativePathTools::CreateAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle inI
  */
 qt3dsdm::Qt3DSDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPath(
     CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
-    const qt3dsdm::Qt3DSDMInstanceHandle inTimeParentInstance, qt3dsdm::CUICDMSlideHandle inSlide,
+    const qt3dsdm::Qt3DSDMInstanceHandle inTimeParentInstance, qt3dsdm::Qt3DSDMSlideHandle inSlide,
     CStackTokenizer &ioTokenizer, bool &outIsResolved, const IObjectReferenceHelper *inHelper)
 {
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
diff --git a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
index 199ba94a..f3bbc3fa 100644
--- a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
+++ b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
@@ -82,7 +82,7 @@ protected:
     static qt3dsdm::Qt3DSDMInstanceHandle
     DoFindAssetInstanceByObjectPath(CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
                                     const qt3dsdm::Qt3DSDMInstanceHandle inTimeParentInstance,
-                                    qt3dsdm::CUICDMSlideHandle inSlide, CStackTokenizer &ioTokenizer,
+                                    qt3dsdm::Qt3DSDMSlideHandle inSlide, CStackTokenizer &ioTokenizer,
                                     bool &outIsResolved, const IObjectReferenceHelper *inHelper);
     static Q3DStudio::CString LookupObjectName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                CDoc *inDoc);
diff --git a/src/Authoring/Client/Code/Core/Doc/SelectedValue.h b/src/Authoring/Client/Code/Core/Doc/SelectedValue.h
index 103a7fad..705c3fc4 100644
--- a/src/Authoring/Client/Code/Core/Doc/SelectedValue.h
+++ b/src/Authoring/Client/Code/Core/Doc/SelectedValue.h
@@ -36,7 +36,7 @@ struct SelectedValueTypes
     enum Enum {
         UnknownSelectedValueType = 0,
         Instance, // Qt3DSDMInstanceHandle
-        Slide, // CUICDMSlideHandle
+        Slide, // Qt3DSDMSlideHandle
         SlideInsertion, // void*
         Guide, // CUICDMGuideHandle
         MultipleInstances, // std::vector<Qt3DSDMInstanceHandle>
diff --git a/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h b/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h
index a6664906..d112b4a7 100644
--- a/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h
+++ b/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h
@@ -38,7 +38,7 @@ namespace Q3DStudio {
 struct SSlideInstanceWrapper
 {
     qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
-    qt3dsdm::CUICDMSlideHandle m_Slide;
+    qt3dsdm::Qt3DSDMSlideHandle m_Slide;
 #ifdef _WIN32
     // We have a multiple unions which needs to be big enough
     // This is strange on 32 bit systems but wrong on 64 bit.
@@ -46,7 +46,7 @@ struct SSlideInstanceWrapper
     size_t m_Padding;
 #endif
     SSlideInstanceWrapper() {}
-    SSlideInstanceWrapper(qt3dsdm::Qt3DSDMInstanceHandle inst, qt3dsdm::CUICDMSlideHandle slide)
+    SSlideInstanceWrapper(qt3dsdm::Qt3DSDMInstanceHandle inst, qt3dsdm::Qt3DSDMSlideHandle slide)
         : m_Instance(inst)
         , m_Slide(slide)
     {
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
index a35fdecd..e65c326e 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
@@ -55,7 +55,7 @@ inline void GetAllowableParentSlides(CClientDataModelBridge *inBridge,
     if (!inInstance.Valid())
         return;
 
-    qt3dsdm::CUICDMSlideHandle theSlide = 0;
+    qt3dsdm::Qt3DSDMSlideHandle theSlide = 0;
     qt3dsdm::Qt3DSDMInstanceHandle theTimeParent = inBridge->GetOwningComponentInstance(inInstance);
     if (theTimeParent.Valid()) {
         if (inBridge->IsMaster(inInstance)) {
@@ -129,7 +129,7 @@ CObjectReferenceHelper::GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInst
     qt3dsdm::TSlideHandleList theList;
     if (inInstance.Valid()) {
         CClientDataModelBridge *theBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
-        qt3dsdm::CUICDMSlideHandle theCurrentSlide = m_Doc->GetActiveSlide();
+        qt3dsdm::Qt3DSDMSlideHandle theCurrentSlide = m_Doc->GetActiveSlide();
         if (theBridge->IsComponentInstance(inInstance)) {
             // if selected object is a component, and we are inside it
             GetAllowableParentSlides(theBridge, inInstance, theList);
@@ -146,7 +146,7 @@ CObjectReferenceHelper::GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInst
 // Return all children under inSlideIndex
 bool CObjectReferenceHelper::GetChildInstanceList(
     const qt3dsdm::Qt3DSDMInstanceHandle &inInstance, qt3dsdm::TInstanceHandleList &outList,
-    qt3dsdm::CUICDMSlideHandle inSlide, const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const
+    qt3dsdm::Qt3DSDMSlideHandle inSlide, const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const
 {
     (void)inOwningInstance;
     CClientDataModelBridge *theClientBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
index 71b33c99..16957e1a 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
@@ -61,7 +61,7 @@ public:
     GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const override;
     bool GetChildInstanceList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                                       qt3dsdm::TInstanceHandleList &outList,
-                                      qt3dsdm::CUICDMSlideHandle inSlide,
+                                      qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                       const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const override;
     virtual Q3DStudio::CString
     LookupObjectFormalName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const override;
diff --git a/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h b/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
index 8b5ed38b..5ac7cad5 100644
--- a/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
@@ -76,7 +76,7 @@ public:
     GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const = 0;
     virtual bool
     GetChildInstanceList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
-                         qt3dsdm::TInstanceHandleList &outlist, qt3dsdm::CUICDMSlideHandle inSlide,
+                         qt3dsdm::TInstanceHandleList &outlist, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                          const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const = 0;
     virtual Q3DStudio::CString
     LookupObjectFormalName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const = 0;
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
index 9777aed3..b8a48b9a 100644
--- a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
+++ b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
@@ -117,7 +117,7 @@ void CPlaybackClock::UpdateTime()
 
 void CPlaybackClock::OnReachedUpperBound()
 {
-    qt3dsdm::CUICDMSlideHandle theActiveSlide(m_Doc->GetActiveSlide());
+    qt3dsdm::Qt3DSDMSlideHandle theActiveSlide(m_Doc->GetActiveSlide());
     // clock has passed the end, check whether needs to switch slide
     qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle =
         GetSlideSystem()->GetSlideInstance(theActiveSlide);
@@ -135,13 +135,13 @@ void CPlaybackClock::OnReachedUpperBound()
         SStringOrInt thePlaythroughTo = qt3dsdm::get<SStringOrInt>(theValue);
 
         qt3dsdm::ISlideSystem *theSlideSystem = GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle thePlaythroughToSlide;
+        qt3dsdm::Qt3DSDMSlideHandle thePlaythroughToSlide;
 
         if (thePlaythroughTo.GetType() == SStringOrIntTypes::String) {
             Q3DStudio::CString theValue(get<TDataStrPtr>(thePlaythroughTo.m_Value)->GetData());
             if (theValue == L"Next") {
                 size_t theNextSlideIndex = theSlideSystem->GetSlideIndex(theActiveSlide) + 1;
-                qt3dsdm::CUICDMSlideHandle theMasterSlide =
+                qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
                     theSlideSystem->GetMasterSlide(theActiveSlide);
                 size_t theSlideCount = theSlideSystem->GetSlideCount(theMasterSlide);
                 if (theNextSlideIndex < theSlideCount) {
@@ -151,7 +151,7 @@ void CPlaybackClock::OnReachedUpperBound()
                 }
             } else if (theValue == L"Previous") {
                 int thePrevSlideIndex = theSlideSystem->GetSlideIndex(theActiveSlide) - 1;
-                qt3dsdm::CUICDMSlideHandle theMasterSlide =
+                qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
                     theSlideSystem->GetMasterSlide(theActiveSlide);
                 if (thePrevSlideIndex > 0) // Index 0 refers to MasterSlide, so we check > 0
                 {
diff --git a/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp b/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp
index 42e75a58..59575b97 100644
--- a/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/ActionSystem.cpp
@@ -48,7 +48,7 @@ CActionSystem::CActionSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
     m_Signaller = CreateActionSystemSignaller();
 }
 
-CUICDMActionHandle CActionSystem::CreateAction(CUICDMSlideHandle inSlide,
+CUICDMActionHandle CActionSystem::CreateAction(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inOwner,
                                                SLong4 inTriggerTargetObjects)
 {
@@ -81,14 +81,14 @@ void CActionSystem::DeleteAction(CUICDMActionHandle inAction)
     GetSignalSender()->SendActionDeleted(inAction, theActionInfo.m_Slide, theActionInfo.m_Owner);
 }
 
-void CActionSystem::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+void CActionSystem::GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                TActionHandleList &outActions) const
 {
     // Get all actions that exist in inSlide
     m_ActionCore->GetActions(inSlide, inOwner, outActions);
 
     // if inSlide is not master, get all actions that exist in master slide
-    CUICDMSlideHandle theMaster = m_SlideSystem->GetMasterSlide(inSlide);
+    Qt3DSDMSlideHandle theMaster = m_SlideSystem->GetMasterSlide(inSlide);
     if (theMaster != inSlide) {
         TActionHandleList theMasterActions;
         m_ActionCore->GetActions(theMaster, inOwner, theMasterActions);
@@ -97,7 +97,7 @@ void CActionSystem::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle
     }
 }
 
-bool CActionSystem::GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
+bool CActionSystem::GetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide,
                                           CUICDMActionHandle inAction) const
 {
     SValue theValue;
@@ -110,7 +110,7 @@ bool CActionSystem::GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
     return false;
 }
 
-void CActionSystem::SetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
+void CActionSystem::SetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide,
                                           CUICDMActionHandle inAction, bool inValue)
 {
     Qt3DSDMInstanceHandle theInstance = m_ActionCore->GetActionInstance(inAction);
diff --git a/src/Authoring/QT3DSDM/Systems/ActionSystem.h b/src/Authoring/QT3DSDM/Systems/ActionSystem.h
index a1059fb7..296697bb 100644
--- a/src/Authoring/QT3DSDM/Systems/ActionSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/ActionSystem.h
@@ -60,15 +60,15 @@ public:
                   TSlideSystemPtr inSlideSystem, Qt3DSDMInstanceHandle inActionInstance,
                   Qt3DSDMPropertyHandle inActionEyeball);
 
-    CUICDMActionHandle CreateAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    CUICDMActionHandle CreateAction(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                             SLong4 inTriggerTargetObjects) override;
     void DeleteAction(CUICDMActionHandle inAction) override;
-    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const override;
 
-    bool GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
+    bool GetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide,
                                        CUICDMActionHandle inAction) const override;
-    void SetActionEyeballValue(CUICDMSlideHandle inActiveSlide, CUICDMActionHandle inAction,
+    void SetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide, CUICDMActionHandle inAction,
                                        bool inValue) override;
 
     virtual IActionSystemSignalProvider *GetSignalProvider();
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
index 89bcd183..8b6f7ef5 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.cpp
@@ -37,7 +37,7 @@ using namespace std;
 namespace qt3dsdm {
 
 CUICDMActionHandle CActionCoreProducer::CreateAction(Qt3DSDMInstanceHandle inInstance,
-                                                     CUICDMSlideHandle inSlide,
+                                                     Qt3DSDMSlideHandle inSlide,
                                                      Qt3DSDMInstanceHandle inOwner,
                                                      SLong4 inTriggerTargetObjects)
 {
@@ -64,13 +64,13 @@ const SActionInfo &CActionCoreProducer::GetActionInfo(CUICDMActionHandle inActio
     return m_Data->GetActionInfo(inAction);
 }
 
-void CActionCoreProducer::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+void CActionCoreProducer::GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                      TActionHandleList &outActions) const
 {
     return m_Data->GetActions(inSlide, inOwner, outActions);
 }
 
-void CActionCoreProducer::GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const
+void CActionCoreProducer::GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const
 {
     return m_Data->GetActions(inSlide, outActions);
 }
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
index 5aec831b..a08d109c 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/ActionCoreProducer.h
@@ -59,13 +59,13 @@ public:
     IStringTable &GetStringTable() const override { return m_Data->GetStringTable(); }
     TStringTablePtr GetStringTablePtr() const override { return m_Data->GetStringTablePtr(); }
     // Action
-    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
                                     Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
     void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
     const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
-    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                     TActionHandleList &outActions) const override;
-    void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const override;
+    void GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const override;
     void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
     void GetActions(TActionHandleList &outActions) const override;
     Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
index 10c934b6..01b7062b 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.cpp
@@ -108,7 +108,7 @@ struct SLookupCacheDoUndoOp : public ITransaction
 };
 
 CUICDMAnimationHandle
-CAnimationCoreProducer::CreateAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+CAnimationCoreProducer::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                         Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                         EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
 {
@@ -144,7 +144,7 @@ void CAnimationCoreProducer::DeleteAnimation(CUICDMAnimationHandle inAnimation)
                                             theInfo.m_AnimationType);
 }
 
-CUICDMAnimationHandle CAnimationCoreProducer::GetAnimation(CUICDMSlideHandle inSlide,
+CUICDMAnimationHandle CAnimationCoreProducer::GetAnimation(Qt3DSDMSlideHandle inSlide,
                                                            Qt3DSDMInstanceHandle inInstance,
                                                            Qt3DSDMPropertyHandle inProperty,
                                                            size_t inIndex) const
@@ -163,8 +163,8 @@ void CAnimationCoreProducer::GetAnimations(TAnimationHandleList &outAnimations)
 }
 
 void CAnimationCoreProducer::GetAnimations(TAnimationInfoList &outAnimations,
-                                           CUICDMSlideHandle inMaster,
-                                           CUICDMSlideHandle inSlide) const
+                                           Qt3DSDMSlideHandle inMaster,
+                                           Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->GetAnimations(outAnimations, inMaster, inSlide);
 }
@@ -338,7 +338,7 @@ size_t CAnimationCoreProducer::GetKeyframeCount(CUICDMAnimationHandle inAnimatio
     return m_Data->GetKeyframeCount(inAnimation);
 }
 
-void CAnimationCoreProducer::OffsetAnimations(CUICDMSlideHandle inSlide,
+void CAnimationCoreProducer::OffsetAnimations(Qt3DSDMSlideHandle inSlide,
                                               Qt3DSDMInstanceHandle inInstance,
                                               long inMillisecondOffset)
 {
@@ -391,9 +391,9 @@ bool CAnimationCoreProducer::AnimationValid(CUICDMAnimationHandle inAnimation) c
     return m_Data->AnimationValid(inAnimation);
 }
 
-void CAnimationCoreProducer::CopyAnimations(CUICDMSlideHandle inSourceSlide,
+void CAnimationCoreProducer::CopyAnimations(Qt3DSDMSlideHandle inSourceSlide,
                                             Qt3DSDMInstanceHandle inSourceInstance,
-                                            CUICDMSlideHandle inDestSlide,
+                                            Qt3DSDMSlideHandle inDestSlide,
                                             Qt3DSDMInstanceHandle inDestInstance)
 {
     std::vector<SAnimationTrack *> theAnimations;
@@ -422,7 +422,7 @@ void CAnimationCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
 }
 
 TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationCreated(
-    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+    const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
 {
     return GetSignalProvider()->ConnectAnimationCreated(inCallback);
@@ -433,7 +433,7 @@ TSignalConnectionPtr CAnimationCoreProducer::ConnectBeforeAnimationDeleted(
     return GetSignalProvider()->ConnectBeforeAnimationDeleted(inCallback);
 }
 TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationDeleted(
-    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+    const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
 {
     return GetSignalProvider()->ConnectAnimationDeleted(inCallback);
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
index b8e4d23a..ac25d887 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/AnimationCoreProducer.h
@@ -64,19 +64,19 @@ public:
 
     // IAnimationManger implementation
 
-    CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
+    CUICDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
                                           bool inFirstKeyframeDynamic) override;
     void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
-    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    CUICDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                        Qt3DSDMPropertyHandle inProperty, size_t inIndex) const override;
     SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const override;
     void GetAnimations(TAnimationHandleList &outAnimations) const override;
-    void GetAnimations(TAnimationInfoList &outAnimations, CUICDMSlideHandle inMaster,
-                       CUICDMSlideHandle inSlide) const override;
-    void GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void GetAnimations(TAnimationInfoList &outAnimations, Qt3DSDMSlideHandle inMaster,
+                       Qt3DSDMSlideHandle inSlide) const override;
+    void GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                        TAnimationHandleList &outAnimations) override
     {
         m_Data->GetSpecificInstanceAnimations(inSlide, inInstance, outAnimations);
@@ -97,7 +97,7 @@ public:
     {
         return m_Data->IsFirstKeyframe(inKeyframe);
     }
-    void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void OffsetAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                           long inMillisecondOffset) override;
 
     void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
@@ -109,19 +109,19 @@ public:
     bool KeyframeValid(CUICDMKeyframeHandle inKeyframe) const override;
     bool AnimationValid(CUICDMAnimationHandle inAnimation) const override;
 
-    void CopyAnimations(CUICDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
-                        CUICDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
+    void CopyAnimations(Qt3DSDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
+                        Qt3DSDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
 
     // ITransactionProducer implementation
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
 
     TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
     virtual TSignalConnectionPtr
     ConnectBeforeAnimationDeleted(const std::function<void(CUICDMAnimationHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectAnimationDeleted(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
     TSignalConnectionPtr ConnectKeyframeInserted(
         const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
index 4f4e0a46..4aa55c89 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.cpp
@@ -32,7 +32,7 @@
 namespace qt3dsdm {
 
 CUICDMActionHandle CSimpleActionCore::CreateAction(Qt3DSDMInstanceHandle inInstance,
-                                                   CUICDMSlideHandle inSlide,
+                                                   Qt3DSDMSlideHandle inSlide,
                                                    Qt3DSDMInstanceHandle inOwner,
                                                    SLong4 inTriggerTargetObjects)
 {
@@ -58,7 +58,7 @@ const SActionInfo &CSimpleActionCore::GetActionInfo(CUICDMActionHandle inAction)
     return theAction->m_ActionInfo;
 }
 
-inline void AddIfActionMatches(const THandleObjectPair &inPair, CUICDMSlideHandle inSlide,
+inline void AddIfActionMatches(const THandleObjectPair &inPair, Qt3DSDMSlideHandle inSlide,
                                Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions)
 {
     if (inPair.second->GetType() == CHandleObject::EHandleObjectTypeAction) {
@@ -70,7 +70,7 @@ inline void AddIfActionMatches(const THandleObjectPair &inPair, CUICDMSlideHandl
 }
 
 // Return all actions that belong to a certain instance in a certain slide
-void CSimpleActionCore::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+void CSimpleActionCore::GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                    TActionHandleList &outActions) const
 {
     outActions.clear();
@@ -80,7 +80,7 @@ void CSimpleActionCore::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHan
 }
 
 // Return all actions that exist in a certain slide
-void CSimpleActionCore::GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const
+void CSimpleActionCore::GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const
 {
     GetActions(inSlide, 0, outActions);
 }
@@ -214,7 +214,7 @@ void CSimpleActionCore::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandler
 // Helper functions
 CUICDMActionHandle CSimpleActionCore::CreateActionWithHandle(int inHandle,
                                                              Qt3DSDMInstanceHandle inInstance,
-                                                             CUICDMSlideHandle inSlide,
+                                                             Qt3DSDMSlideHandle inSlide,
                                                              Qt3DSDMInstanceHandle inOwner)
 {
     if (HandleValid(inHandle))
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
index 0700d5c9..8b3626a9 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleActionCore.h
@@ -41,7 +41,7 @@ struct SAction : public CHandleObject
 
     SAction() {}
 
-    SAction(int inHandle, Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+    SAction(int inHandle, Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
             Qt3DSDMInstanceHandle inOwner)
         : CHandleObject(inHandle)
         , m_ActionInfo(inInstance, inSlide, inOwner)
@@ -82,13 +82,13 @@ public: // Use
     IStringTable &GetStringTable() const override { return *m_StringTable.get(); }
     TStringTablePtr GetStringTablePtr() const override { return m_StringTable; }
     // Action
-    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
                                     Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
     void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
     const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
-    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                     TActionHandleList &outActions) const override;
-    void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const override;
+    void GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const override;
     void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
     void GetActions(TActionHandleList &outActions) const override;
 
@@ -122,7 +122,7 @@ public: // Use
 
     // Helper functions
     CUICDMActionHandle CreateActionWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance,
-                                              CUICDMSlideHandle inSlide,
+                                              Qt3DSDMSlideHandle inSlide,
                                               Qt3DSDMInstanceHandle inOwner);
     CUICDMHandlerArgHandle AddHandlerArgumentWithHandle(int inHandle, CUICDMActionHandle inAction,
                                                         const TCharStr &inName,
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
index dd761cbc..145bacaa 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
@@ -51,7 +51,7 @@ using namespace boost;
 namespace qt3dsdm {
 
 CUICDMAnimationHandle
-CSimpleAnimationCore::CreateAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+CSimpleAnimationCore::CreateAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
 {
@@ -85,7 +85,7 @@ void CSimpleAnimationCore::EnsureAnimationCache() const
     }
 }
 
-CUICDMAnimationHandle CSimpleAnimationCore::GetAnimation(CUICDMSlideHandle inSlide,
+CUICDMAnimationHandle CSimpleAnimationCore::GetAnimation(Qt3DSDMSlideHandle inSlide,
                                                          Qt3DSDMInstanceHandle inInstance,
                                                          Qt3DSDMPropertyHandle inProperty,
                                                          size_t inIndex) const
@@ -130,8 +130,8 @@ void CSimpleAnimationCore::GetAnimations(TAnimationHandleList &outAnimations) co
 }
 
 void CSimpleAnimationCore::GetAnimations(TAnimationInfoList &outAnimations,
-                                         CUICDMSlideHandle inMaster,
-                                         CUICDMSlideHandle inSlide) const
+                                         Qt3DSDMSlideHandle inMaster,
+                                         Qt3DSDMSlideHandle inSlide) const
 {
     outAnimations.clear();
     for (THandleObjectMap::const_iterator iter = m_Objects.begin(), end = m_Objects.end();
@@ -153,7 +153,7 @@ void CSimpleAnimationCore::GetAnimations(TAnimationInfoList &outAnimations,
     }
 }
 
-inline void AddSpecificAnimationsIf(const THandleObjectPair &inPair, CUICDMSlideHandle inSlide,
+inline void AddSpecificAnimationsIf(const THandleObjectPair &inPair, Qt3DSDMSlideHandle inSlide,
                                     Qt3DSDMInstanceHandle inInstance,
                                     TAnimationHandleList &outAnimations)
 {
@@ -164,7 +164,7 @@ inline void AddSpecificAnimationsIf(const THandleObjectPair &inPair, CUICDMSlide
     }
 }
 
-void CSimpleAnimationCore::GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide,
+void CSimpleAnimationCore::GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSlide,
                                                          Qt3DSDMInstanceHandle inInstance,
                                                          TAnimationHandleList &outAnimations)
 {
@@ -302,7 +302,7 @@ bool CSimpleAnimationCore::IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) cons
     return false;
 }
 
-void CSimpleAnimationCore::OffsetAnimations(CUICDMSlideHandle /*inSlide*/,
+void CSimpleAnimationCore::OffsetAnimations(Qt3DSDMSlideHandle /*inSlide*/,
                                             Qt3DSDMInstanceHandle /*inInstance*/, long /*inOffset*/)
 {
     throw std::runtime_error("unimplemented");
@@ -436,7 +436,7 @@ bool CSimpleAnimationCore::AnimationValid(CUICDMAnimationHandle inAnimation) con
 }
 
 CUICDMAnimationHandle CSimpleAnimationCore::CreateAnimationWithHandle(
-    int inHandle, CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    int inHandle, Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
     Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
     bool inFirstKeyframeDynamic)
 {
@@ -465,7 +465,7 @@ void CSimpleAnimationCore::RemoveAnimationFromLookupCache(CUICDMAnimationHandle
 void CSimpleAnimationCore::AddAnimationToLookupCache(
     std::shared_ptr<SAnimationTrack> inAnimation) const
 {
-    CUICDMSlideHandle theSlide = inAnimation->m_Slide;
+    Qt3DSDMSlideHandle theSlide = inAnimation->m_Slide;
     Qt3DSDMInstanceHandle theInstance = inAnimation->m_Instance;
     pair<TStateInstanceAnimationMap::iterator, TStateInstanceAnimationMap::iterator> theRange =
         m_AnimationMatchesCache.equal_range(
@@ -484,7 +484,7 @@ void CSimpleAnimationCore::RemoveAnimationFromLookupCache(
     std::shared_ptr<SAnimationTrack> inAnimation) const
 {
     TStateInstanceAnimationMap &theMap(m_AnimationMatchesCache);
-    CUICDMSlideHandle theSlide = inAnimation->m_Slide;
+    Qt3DSDMSlideHandle theSlide = inAnimation->m_Slide;
     Qt3DSDMInstanceHandle theInstance = inAnimation->m_Instance;
     pair<TStateInstanceAnimationMap::iterator, TStateInstanceAnimationMap::iterator> theRange =
         theMap.equal_range(make_pair(theSlide.GetHandleValue(), theInstance.GetHandleValue()));
@@ -517,7 +517,7 @@ void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &
 }
 
 CUICDMAnimationHandle CopyAnimation(TAnimationCorePtr inAnimationCore,
-                                    CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inNewSlide,
+                                    CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inNewSlide,
                                     Qt3DSDMInstanceHandle inNewInstance,
                                     Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex)
 {
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
index 62d7e6c8..cbc2aa01 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.h
@@ -58,7 +58,7 @@ struct SAnimationTrack : public CHandleObject
     {
     }
 
-    SAnimationTrack(int inHandle, CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    SAnimationTrack(int inHandle, Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                     Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
                     bool inFirstKeyframeDynamic, bool inArtistEdited)
         : CHandleObject(inHandle)
@@ -116,19 +116,19 @@ public: // Use
     }
     TStringTablePtr GetStringTablePtr() const { return m_StringTable; }
 
-    CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
+    CUICDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
                                           bool inFirstKeyframeDynamic) override;
     void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
-    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    CUICDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                        Qt3DSDMPropertyHandle inProperty, size_t inIndex) const override;
     SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const override;
     void GetAnimations(TAnimationHandleList &outAnimations) const override;
-    void GetAnimations(TAnimationInfoList &outAnimations, CUICDMSlideHandle inMaster,
-                       CUICDMSlideHandle inSlide) const override;
-    void GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void GetAnimations(TAnimationInfoList &outAnimations, Qt3DSDMSlideHandle inMaster,
+                       Qt3DSDMSlideHandle inSlide) const override;
+    void GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                        TAnimationHandleList &outAnimations) override;
 
     void SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation, bool inValue) override;
@@ -148,7 +148,7 @@ public: // Use
     size_t GetKeyframeCount(CUICDMAnimationHandle inAnimation) const override;
     bool IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) const override;
     // Only implemented in the producer for now.
-    void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void OffsetAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                           long inOffset) override;
 
     void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
@@ -161,9 +161,9 @@ public: // Use
     bool AnimationValid(CUICDMAnimationHandle inAnimation) const override;
 
     // Only implemented at the producer level, not at the simple core level.
-    void CopyAnimations(CUICDMSlideHandle /*inSourceSlide*/,
+    void CopyAnimations(Qt3DSDMSlideHandle /*inSourceSlide*/,
                         Qt3DSDMInstanceHandle /*inSourceInstance*/,
-                        CUICDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
+                        Qt3DSDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
     {
         throw AnimationNotFound(L"");
     }
@@ -177,7 +177,7 @@ public: // Use
 
     void EnsureAnimationCache() const;
 
-    CUICDMAnimationHandle CreateAnimationWithHandle(int inHandle, CUICDMSlideHandle inSlide,
+    CUICDMAnimationHandle CreateAnimationWithHandle(int inHandle, Qt3DSDMSlideHandle inSlide,
                                                     Qt3DSDMInstanceHandle inInstance,
                                                     Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                                     EAnimationType inAnimationType,
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp
index cc364db7..06d3de58 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.cpp
@@ -36,13 +36,13 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideHandle CSimpleSlideCore::CreateSlide(Qt3DSDMInstanceHandle inInstance)
+Qt3DSDMSlideHandle CSimpleSlideCore::CreateSlide(Qt3DSDMInstanceHandle inInstance)
 {
     int nextId = GetNextId();
     return CreateSlideWithHandle(nextId, inInstance);
 }
 
-Qt3DSDMInstanceHandle CSimpleSlideCore::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle CSimpleSlideCore::GetSlideInstance(Qt3DSDMSlideHandle inSlide) const
 {
     return GetSlideNF(inSlide, m_Objects)->m_Instance;
 }
@@ -55,7 +55,7 @@ inline bool SlideInstanceMatches(const THandleObjectPair &inPair, int inInstance
     return false;
 }
 
-CUICDMSlideHandle CSimpleSlideCore::GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const
+Qt3DSDMSlideHandle CSimpleSlideCore::GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const
 {
     THandleObjectMap::const_iterator theSlide =
         find_if(m_Objects.begin(), m_Objects.end(),
@@ -66,7 +66,7 @@ CUICDMSlideHandle CSimpleSlideCore::GetSlideByInstance(Qt3DSDMInstanceHandle inI
     throw SlideNotFound(L"");
 }
 
-void RecurseDeleteSlide(CUICDMSlideHandle inSlide, THandleObjectMap &inObjects,
+void RecurseDeleteSlide(Qt3DSDMSlideHandle inSlide, THandleObjectMap &inObjects,
                         TInstanceHandleList &outInstances)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, inObjects);
@@ -77,7 +77,7 @@ void RecurseDeleteSlide(CUICDMSlideHandle inSlide, THandleObjectMap &inObjects,
     CHandleBase::EraseHandle(inSlide, inObjects);
 }
 
-void CSimpleSlideCore::DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances)
+void CSimpleSlideCore::DeleteSlide(Qt3DSDMSlideHandle inSlide, TInstanceHandleList &outInstances)
 {
     SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
     if (theSlide->m_Parent) {
@@ -98,21 +98,21 @@ inline void MaybeAddObject(const THandleObjectPair &inPair, vector<TVectorType>
 void CSimpleSlideCore::GetSlides(TSlideHandleList &outSlides) const
 {
     do_all(m_Objects,
-           std::bind(MaybeAddObject<SSlide, CUICDMSlideHandle>,
+           std::bind(MaybeAddObject<SSlide, Qt3DSDMSlideHandle>,
                      std::placeholders::_1, std::ref(outSlides)));
 }
 
-float CSimpleSlideCore::GetSlideTime(CUICDMSlideHandle inSlide) const
+float CSimpleSlideCore::GetSlideTime(Qt3DSDMSlideHandle inSlide) const
 {
     return GetSlideNF(inSlide, m_Objects)->m_Time;
 }
 
-void CSimpleSlideCore::SetSlideTime(CUICDMSlideHandle inSlide, float inNewTime)
+void CSimpleSlideCore::SetSlideTime(Qt3DSDMSlideHandle inSlide, float inNewTime)
 {
     GetSlideNF(inSlide, m_Objects)->m_Time = inNewTime;
 }
 
-void CSimpleSlideCore::DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
+void CSimpleSlideCore::DeriveSlide(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent,
                                    int inIndex)
 {
     int oldParent = GetSlideNF(inSlide, m_Objects)->m_Parent;
@@ -132,18 +132,18 @@ void CSimpleSlideCore::DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle
     GetSlideNF(inSlide, m_Objects)->m_Parent = inParent;
 }
 
-CUICDMSlideHandle CSimpleSlideCore::GetParentSlide(CUICDMSlideHandle inSlide) const
+Qt3DSDMSlideHandle CSimpleSlideCore::GetParentSlide(Qt3DSDMSlideHandle inSlide) const
 {
     return GetSlideNF(inSlide, m_Objects)->m_Parent;
 }
 
-void CSimpleSlideCore::GetChildSlides(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::GetChildSlides(Qt3DSDMSlideHandle inSlide,
                                       TSlideHandleList &outChildren) const
 {
     transformv_all(GetSlideNF(inSlide, m_Objects)->m_Children, outChildren);
 }
 
-int CSimpleSlideCore::GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const
+int CSimpleSlideCore::GetChildIndex(Qt3DSDMSlideHandle inParent, Qt3DSDMSlideHandle inChild) const
 {
     const SSlide *theSlide = GetSlideNF(inParent, m_Objects);
     size_t dist = distance(theSlide->m_Children.begin(),
@@ -155,7 +155,7 @@ int CSimpleSlideCore::GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandl
     return (int)dist;
 }
 
-bool CSimpleSlideCore::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CSimpleSlideCore::GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                 Qt3DSDMInstanceHandle inHandle,
                                                 Qt3DSDMPropertyHandle inProperty,
                                                 SValue &outValue) const
@@ -172,7 +172,7 @@ bool CSimpleSlideCore::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
 }
 
 std::pair<SSlide *, SInternValue *> CSimpleSlideCore::ResolveSetInstancePropertyValue(
-    CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle, Qt3DSDMPropertyHandle inProperty)
+    Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle, Qt3DSDMPropertyHandle inProperty)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, m_Objects);
     SInternValue *theValue = theSlide->GetInstancePropertyValue(inHandle, inProperty);
@@ -183,7 +183,7 @@ std::pair<SSlide *, SInternValue *> CSimpleSlideCore::ResolveSetInstanceProperty
     return ResolveSetInstancePropertyValue(theSlide->m_Parent, inHandle, inProperty);
 }
 
-void CSimpleSlideCore::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::SetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                 Qt3DSDMInstanceHandle inHandle,
                                                 Qt3DSDMPropertyHandle inProperty,
                                                 const SValue &inValue)
@@ -197,7 +197,7 @@ void CSimpleSlideCore::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
         theTarget.first->SetInstancePropertyValue(inHandle, inProperty, theValue);
 }
 
-void CSimpleSlideCore::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                      Qt3DSDMInstanceHandle inHandle,
                                                      Qt3DSDMPropertyHandle inProperty,
                                                      const SValue &inValue)
@@ -206,7 +206,7 @@ void CSimpleSlideCore::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
                                             inProperty, inValue);
 }
 
-bool CSimpleSlideCore::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CSimpleSlideCore::GetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                         Qt3DSDMInstanceHandle inInstance,
                                                         Qt3DSDMPropertyHandle inProperty,
                                                         SValue &outValue) const
@@ -220,7 +220,7 @@ bool CSimpleSlideCore::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlid
     return false;
 }
 
-void CSimpleSlideCore::GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::GetSpecificInstancePropertyValues(Qt3DSDMSlideHandle inSlide,
                                                          Qt3DSDMInstanceHandle inInstance,
                                                          TPropertyHandleValuePairList &outValues)
 {
@@ -228,21 +228,21 @@ void CSimpleSlideCore::GetSpecificInstancePropertyValues(CUICDMSlideHandle inSli
     theSlide->GetSpecificInstancePropertyValues(inInstance, outValues);
 }
 
-void CSimpleSlideCore::GetSlidePropertyEntries(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::GetSlidePropertyEntries(Qt3DSDMSlideHandle inSlide,
                                                TSlideEntryList &outEntries) const
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
     theSlide->ToSlideEntryList(outEntries);
 }
 
-bool CSimpleSlideCore::ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+bool CSimpleSlideCore::ContainsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                         Qt3DSDMPropertyHandle inProperty) const
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
     return theSlide->GetInstancePropertyValue(inHandle, inProperty) != NULL;
 }
 
-CUICDMSlideHandle CSimpleSlideCore::CreateSlideWithHandle(int inHandle,
+Qt3DSDMSlideHandle CSimpleSlideCore::CreateSlideWithHandle(int inHandle,
                                                           Qt3DSDMInstanceHandle inInstance)
 {
     if (HandleValid(inHandle))
@@ -251,20 +251,20 @@ CUICDMSlideHandle CSimpleSlideCore::CreateSlideWithHandle(int inHandle,
     return inHandle;
 }
 
-void CSimpleSlideCore::GetSlideProperties(CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::GetSlideProperties(Qt3DSDMSlideHandle inSlide,
                                           TSlideEntryList &outProperties) const
 {
     outProperties.clear();
     GetSlidePropertyEntries(inSlide, outProperties);
 }
 
-bool CSimpleSlideCore::IsSlide(CUICDMSlideHandle inSlide) const
+bool CSimpleSlideCore::IsSlide(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Objects.find(inSlide) != m_Objects.end();
 }
 
 void CSimpleSlideCore::ForceSetPropertyValue(IStringTable &inStringTable,
-                                             THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
+                                             THandleObjectMap &inObjects, Qt3DSDMSlideHandle inSlide,
                                              Qt3DSDMInstanceHandle inHandle,
                                              Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
 {
@@ -272,7 +272,7 @@ void CSimpleSlideCore::ForceSetPropertyValue(IStringTable &inStringTable,
         ->SetInstancePropertyValue(inHandle, inProperty, SInternValue(inValue, inStringTable));
 }
 
-void CSimpleSlideCore::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
+void CSimpleSlideCore::PushPropertyValueToChildren(Qt3DSDMSlideHandle inParent,
                                                    Qt3DSDMInstanceHandle inHandle,
                                                    Qt3DSDMPropertyHandle inProperty,
                                                    const SValue &inValue)
@@ -289,8 +289,8 @@ inline void AddIntersectingEntry(TSlideEntryList &outEntries, Qt3DSDMInstanceHan
     outEntries.push_back(TSlideEntry(inst, prop, inValue.GetValue()));
 }
 
-void CSimpleSlideCore::GetIntersectingProperties(CUICDMSlideHandle inSlide1,
-                                                 CUICDMSlideHandle inSlide2,
+void CSimpleSlideCore::GetIntersectingProperties(Qt3DSDMSlideHandle inSlide1,
+                                                 Qt3DSDMSlideHandle inSlide2,
                                                  TSlideEntryList &outEntries) const
 {
     const SSlide *theSlide1 = GetSlideNF(inSlide1, m_Objects);
@@ -301,9 +301,9 @@ void CSimpleSlideCore::GetIntersectingProperties(CUICDMSlideHandle inSlide1,
                               std::placeholders::_3));
 }
 
-void CSimpleSlideCore::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
-                                                  CUICDMSlideHandle inSlide2,
-                                                  CUICDMSlideHandle inDestination)
+void CSimpleSlideCore::PushIntersectingProperties(Qt3DSDMSlideHandle inSlide1,
+                                                  Qt3DSDMSlideHandle inSlide2,
+                                                  Qt3DSDMSlideHandle inDestination)
 {
     const SSlide *theSlide1 = GetSlideNF(inSlide1, m_Objects);
     const SSlide *theSlide2 = GetSlideNF(inSlide2, m_Objects);
@@ -314,7 +314,7 @@ void CSimpleSlideCore::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
                               std::placeholders::_3));
 }
 
-void CSimpleSlideCore::ClearPropertyValue(THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
+void CSimpleSlideCore::ClearPropertyValue(THandleObjectMap &inObjects, Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty)
 {
@@ -333,13 +333,13 @@ void CSimpleSlideCore::ForEachSlide(std::function<void(SSlide *)> inFunction)
     do_all(m_Objects, std::bind(DoForEachSlide, std::placeholders::_1, inFunction));
 }
 
-void LookupSlideAndDoSomething(CUICDMSlideHandle inSlide, THandleObjectMap &inObjects,
+void LookupSlideAndDoSomething(Qt3DSDMSlideHandle inSlide, THandleObjectMap &inObjects,
                                std::function<void(SSlide *)> inFunction)
 {
     inFunction(CSimpleSlideCore::GetSlideNF(inSlide, inObjects));
 }
 
-void CSimpleSlideCore::ForEachChild(CUICDMSlideHandle inParent,
+void CSimpleSlideCore::ForEachChild(Qt3DSDMSlideHandle inParent,
                                     std::function<void(SSlide *)> inFunction)
 {
     do_all(GetSlideNF(inParent, m_Objects)->m_Children,
@@ -396,7 +396,7 @@ void CSimpleSlideCore::DeleteAllInstancePropertyEntries(const TInstanceHandleLis
     ForEachSlide(std::bind(&SSlide::ClearPropertiesIf, std::placeholders::_1, predicate));
 }
 
-void CSimpleSlideCore::ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
+void CSimpleSlideCore::ClearChildrenPropertyValues(Qt3DSDMSlideHandle inParent,
                                                    Qt3DSDMInstanceHandle inHandle,
                                                    Qt3DSDMPropertyHandle inProperty)
 {
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h
index 1188f5a0..d7207508 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideCore.h
@@ -258,52 +258,52 @@ public: // use
 
     TStringTablePtr GetStringTablePtr() const override { return m_StringTable; }
     IStringTable &GetStringTable() const override { return *m_StringTable.get(); }
-    CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
-    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
-    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
-    void DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
+    Qt3DSDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
+    Qt3DSDMInstanceHandle GetSlideInstance(Qt3DSDMSlideHandle inSlide) const override;
+    Qt3DSDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
+    void DeleteSlide(Qt3DSDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
     void GetSlides(TSlideHandleList &outSlides) const override;
 
-    float GetSlideTime(CUICDMSlideHandle inSlide) const override;
-    void SetSlideTime(CUICDMSlideHandle inSlide, float inNewTime) override;
+    float GetSlideTime(Qt3DSDMSlideHandle inSlide) const override;
+    void SetSlideTime(Qt3DSDMSlideHandle inSlide, float inNewTime) override;
 
-    void DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent, int inIndex = -1) override;
-    CUICDMSlideHandle GetParentSlide(CUICDMSlideHandle inSlide) const override;
-    void GetChildSlides(CUICDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
-    int GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const override;
+    void DeriveSlide(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent, int inIndex = -1) override;
+    Qt3DSDMSlideHandle GetParentSlide(Qt3DSDMSlideHandle inSlide) const override;
+    void GetChildSlides(Qt3DSDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
+    int GetChildIndex(Qt3DSDMSlideHandle inParent, Qt3DSDMSlideHandle inChild) const override;
 
-    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    bool GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                   Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    void SetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                   Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
     // Return the slide this property should be set on, along with the previous value if any.
     // Set the value on the slide.
     std::pair<SSlide *, SInternValue *>
-    ResolveSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    ResolveSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                     Qt3DSDMPropertyHandle inProperty);
-    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    void ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                        Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
-    bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+    bool GetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
 
-    void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
+    void GetSpecificInstancePropertyValues(Qt3DSDMSlideHandle inSlide,
                                            Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outValues) override;
 
-    void GetSlidePropertyEntries(CUICDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
+    void GetSlidePropertyEntries(Qt3DSDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
 
-    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+    void PushPropertyValueToChildren(Qt3DSDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
                                      Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
-    void GetIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
+    void GetIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
                                    TSlideEntryList &outEntries) const override;
-    void PushIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
-                                    CUICDMSlideHandle inDestination) override;
+    void PushIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
+                                    Qt3DSDMSlideHandle inDestination) override;
 
-    void ClearChildrenPropertyValues(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+    void ClearChildrenPropertyValues(Qt3DSDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
                                      Qt3DSDMPropertyHandle inProperty) override;
 
     void DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inHandle) override;
@@ -311,23 +311,23 @@ public: // use
     void DeleteAllInstancePropertyEntries(const TInstanceHandleList &inInstances,
                                           const TPropertyHandleList &inProperties) override;
 
-    bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    bool ContainsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                           Qt3DSDMPropertyHandle inProperty) const override;
     bool HandleValid(int inHandle) const override { return CHandleBase::HandleValid(inHandle); }
 
-    CUICDMSlideHandle CreateSlideWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance);
-    void GetSlideProperties(CUICDMSlideHandle inSlide, TSlideEntryList &outProperties) const;
+    Qt3DSDMSlideHandle CreateSlideWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance);
+    void GetSlideProperties(Qt3DSDMSlideHandle inSlide, TSlideEntryList &outProperties) const;
 
-    bool IsSlide(CUICDMSlideHandle inSlide) const override;
+    bool IsSlide(Qt3DSDMSlideHandle inSlide) const override;
 
     // Possibly alter every slide in the database
     void ForEachSlide(std::function<void(SSlide *)> inFunction);
-    void ForEachChild(CUICDMSlideHandle inSlide, std::function<void(SSlide *)> inFunction);
+    void ForEachChild(Qt3DSDMSlideHandle inSlide, std::function<void(SSlide *)> inFunction);
 
     // Only implemented at the producer level, not at this lower level.
-    void CopyProperties(CUICDMSlideHandle /*inSourceSlide*/,
+    void CopyProperties(Qt3DSDMSlideHandle /*inSourceSlide*/,
                         Qt3DSDMInstanceHandle /*inSourceInstance*/,
-                        CUICDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
+                        Qt3DSDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
     {
         throw SlideNotFound(L"");
     }
@@ -354,10 +354,10 @@ public: // use
     }
 
     static void ForceSetPropertyValue(IStringTable &inStringTable, THandleObjectMap &inObjects,
-                                      CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                      Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                       Qt3DSDMPropertyHandle inProperty, const SValue &inValue);
 
-    static void ClearPropertyValue(THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
+    static void ClearPropertyValue(THandleObjectMap &inObjects, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inInstance,
                                    Qt3DSDMPropertyHandle inProperty);
 
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
index ce7159a5..07d47b66 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.cpp
@@ -33,18 +33,18 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraph(CUICDMSlideHandle inRoot)
+CUICDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
 {
     int nextId = GetNextId();
     return CreateSlideGraphWithHandle(nextId, inRoot);
 }
 
-CUICDMSlideHandle CSimpleSlideGraphCore::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
 {
     return GetSlideGraphNF(inGraph, m_Objects)->m_Root;
 }
 
-inline bool RootSlideMatches(const THandleObjectPair &inPair, CUICDMSlideHandle inSlide)
+inline bool RootSlideMatches(const THandleObjectPair &inPair, Qt3DSDMSlideHandle inSlide)
 {
     const SSlideGraph *theGraph = static_cast<SSlideGraph *>(inPair.second.get());
     if (theGraph->m_Root == inSlide)
@@ -52,7 +52,7 @@ inline bool RootSlideMatches(const THandleObjectPair &inPair, CUICDMSlideHandle
     return false;
 }
 
-CUICDMSlideGraphHandle CSimpleSlideGraphCore::GetSlideGraph(CUICDMSlideHandle inSlide) const
+CUICDMSlideGraphHandle CSimpleSlideGraphCore::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
 {
     THandleObjectMap::const_iterator theFind = find_if<THandleObjectMap::const_iterator>(
         m_Objects, std::bind(RootSlideMatches, std::placeholders::_1, inSlide));
@@ -82,7 +82,7 @@ void CSimpleSlideGraphCore::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
 }
 
 void CSimpleSlideGraphCore::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
-                                              CUICDMSlideHandle inSlide,
+                                              Qt3DSDMSlideHandle inSlide,
                                               Qt3DSDMInstanceHandle inInstance)
 {
     pair<TInstanceToGraphMap::iterator, bool> theResult =
@@ -121,7 +121,7 @@ struct SInstanceMatcher
         : m_Instance(inInst)
     {
     }
-    bool operator()(const pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &inItem) const
+    bool operator()(const pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> &inItem) const
     {
         return m_Instance == inItem.second;
     }
@@ -142,12 +142,12 @@ void CSimpleSlideGraphCore::DissociateInstance(Qt3DSDMInstanceHandle inInstance)
 }
 
 void CSimpleSlideGraphCore::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
-                                                CUICDMSlideHandle inSlide)
+                                                Qt3DSDMSlideHandle inSlide)
 {
     GetSlideGraphNF(inGraph, m_Objects)->m_ActiveSlide = inSlide;
 }
 
-CUICDMSlideHandle CSimpleSlideGraphCore::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSimpleSlideGraphCore::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
 {
     const SSlideGraph *theSlide = GetSlideGraphNF(inGraph, m_Objects);
     if (theSlide->m_ActiveSlide)
@@ -161,7 +161,7 @@ bool CSimpleSlideGraphCore::HandleValid(int inHandle) const
 }
 
 CUICDMSlideGraphHandle CSimpleSlideGraphCore::CreateSlideGraphWithHandle(int inHandle,
-                                                                         CUICDMSlideHandle inRoot)
+                                                                         Qt3DSDMSlideHandle inRoot)
 {
     m_Objects.insert(make_pair(inHandle, (THandleObjectPtr) new SSlideGraph(inHandle, inRoot)));
     return inHandle;
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
index b4e82c76..9c9d9142 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleSlideGraphCore.h
@@ -49,8 +49,8 @@ struct SSlideGraph : public CHandleObject
         , m_ActiveSlide(0)
     {
     }
-    CUICDMSlideHandle m_Root;
-    CUICDMSlideHandle m_ActiveSlide;
+    Qt3DSDMSlideHandle m_Root;
+    Qt3DSDMSlideHandle m_ActiveSlide;
 
     static const EHandleObjectType s_Type = CHandleObject::EHandleObjectTypeSSlideGraph;
     EHandleObjectType GetType() override { return s_Type; }
@@ -60,7 +60,7 @@ class CSimpleSlideGraphCore : public CHandleBase, public ISlideGraphCore
 {
     TStringTablePtr m_StringTable;
     typedef std::unordered_map<Qt3DSDMInstanceHandle,
-                                 pair<CUICDMSlideGraphHandle, CUICDMSlideHandle>, std::hash<int>>
+                                 pair<CUICDMSlideGraphHandle, Qt3DSDMSlideHandle>, std::hash<int>>
         TInstanceToGraphMap;
     typedef std::unordered_map<CUICDMSlideGraphHandle, TSlideInstancePairList, std::hash<int>>
         TGraphToInstanceMap;
@@ -81,9 +81,9 @@ public:
      *	of one and only one graph (i.e. it does not derive from another slide outside of the graph).
      *	Second is that an instance is a member of one and only one graph.
      */
-    CUICDMSlideGraphHandle CreateSlideGraph(CUICDMSlideHandle inRoot) override;
-    CUICDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
-    CUICDMSlideGraphHandle GetSlideGraph(CUICDMSlideHandle inSlide) const override;
+    CUICDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
+    Qt3DSDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
+    CUICDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
     void GetSlideGraphs(TSlideGraphHandleList &outGraphs) const override;
     void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) override;
 
@@ -96,7 +96,7 @@ public:
      *is
      *	implicitly associated with any root-derived slides.
      */
-    void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
+    void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
                            Qt3DSDMInstanceHandle inInstance) override;
     void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                 TSlideInstancePairList &outAssociations) const override;
@@ -106,12 +106,12 @@ public:
     /**
      *	All graphs always have an active slide.  This is assumed to be the root right off the bat.
      */
-    void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) override;
-    CUICDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
+    void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
+    Qt3DSDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
 
     bool HandleValid(int inHandle) const override;
 
-    CUICDMSlideGraphHandle CreateSlideGraphWithHandle(int inHandle, CUICDMSlideHandle inRoot);
+    CUICDMSlideGraphHandle CreateSlideGraphWithHandle(int inHandle, Qt3DSDMSlideHandle inRoot);
 
     static SSlideGraph *GetSlideGraphNF(int inHandle, THandleObjectMap &inObjects)
     {
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
index b23ba012..79c7fdc5 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
@@ -39,31 +39,31 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideHandle CSlideCoreProducer::CreateSlide(Qt3DSDMInstanceHandle inInstance)
+Qt3DSDMSlideHandle CSlideCoreProducer::CreateSlide(Qt3DSDMInstanceHandle inInstance)
 {
-    CUICDMSlideHandle retval = m_Data->CreateSlide(inInstance);
+    Qt3DSDMSlideHandle retval = m_Data->CreateSlide(inInstance);
     CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
     GetSignalSender()->SendSlideCreated(retval);
     return retval;
 }
 
-Qt3DSDMInstanceHandle CSlideCoreProducer::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle CSlideCoreProducer::GetSlideInstance(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->GetSlideInstance(inSlide);
 }
 
-CUICDMSlideHandle CSlideCoreProducer::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
+Qt3DSDMSlideHandle CSlideCoreProducer::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
 {
     return m_Data->GetSlideByInstance(inSlide);
 }
 
-void SendPropertyRemoved(const TSlideEntry &inEntry, CUICDMSlideHandle inSlide,
+void SendPropertyRemoved(const TSlideEntry &inEntry, Qt3DSDMSlideHandle inSlide,
                          ISlideCoreSignalSender *inSender)
 {
     inSender->SendPropertyValueRemoved(inSlide, get<0>(inEntry), get<1>(inEntry), get<2>(inEntry));
 }
 
-void RecurseCreateDeleteTransactions(TTransactionConsumerPtr inConsumer, CUICDMSlideHandle inSlide,
+void RecurseCreateDeleteTransactions(TTransactionConsumerPtr inConsumer, Qt3DSDMSlideHandle inSlide,
                                      THandleObjectMap &inObjects, ISlideCoreSignalSender *inSender)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, inObjects);
@@ -76,7 +76,7 @@ void RecurseCreateDeleteTransactions(TTransactionConsumerPtr inConsumer, CUICDMS
     inSender->SendSlideDeleted(theSlide->m_Handle);
 }
 
-void CSlideCoreProducer::DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances)
+void CSlideCoreProducer::DeleteSlide(Qt3DSDMSlideHandle inSlide, TInstanceHandleList &outInstances)
 {
     // Ensure exists
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, m_Data->m_Objects);
@@ -95,12 +95,12 @@ void CSlideCoreProducer::GetSlides(TSlideHandleList &outSlides) const
     m_Data->GetSlides(outSlides);
 }
 
-float CSlideCoreProducer::GetSlideTime(CUICDMSlideHandle inSlide) const
+float CSlideCoreProducer::GetSlideTime(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->GetSlideTime(inSlide);
 }
 
-void CSlideCoreProducer::SetSlideTime(CUICDMSlideHandle inSlide, float inNewTime)
+void CSlideCoreProducer::SetSlideTime(Qt3DSDMSlideHandle inSlide, float inNewTime)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, m_Data->m_Objects);
     float oldTime = theSlide->m_Time;
@@ -118,7 +118,7 @@ inline void SetSlideParent(THandleObjectMap &inObjects, int inSlide, int inParen
     CSimpleSlideCore::GetSlideNF(inSlide, inObjects)->m_Parent = inParent;
 }
 
-void CSlideCoreProducer::DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
+void CSlideCoreProducer::DeriveSlide(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent,
                                      int inIndex)
 {
     // Integrity checks to ensure operation will proceed
@@ -147,23 +147,23 @@ void CSlideCoreProducer::DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandl
     GetSignalSender()->SendSlideDerived(inSlide, inParent, inIndex);
 }
 
-CUICDMSlideHandle CSlideCoreProducer::GetParentSlide(CUICDMSlideHandle inSlide) const
+Qt3DSDMSlideHandle CSlideCoreProducer::GetParentSlide(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->GetParentSlide(inSlide);
 }
 
-void CSlideCoreProducer::GetChildSlides(CUICDMSlideHandle inSlide,
+void CSlideCoreProducer::GetChildSlides(Qt3DSDMSlideHandle inSlide,
                                         TSlideHandleList &outChildren) const
 {
     m_Data->GetChildSlides(inSlide, outChildren);
 }
 
-int CSlideCoreProducer::GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const
+int CSlideCoreProducer::GetChildIndex(Qt3DSDMSlideHandle inParent, Qt3DSDMSlideHandle inChild) const
 {
     return m_Data->GetChildIndex(inParent, inChild);
 }
 
-bool CSlideCoreProducer::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CSlideCoreProducer::GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inHandle,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const
@@ -178,7 +178,7 @@ inline void EraseProperty(TSlideEntryList &inProperties, int inInstance, int inP
                        std::placeholders::_1));
 }
 
-void CSlideCoreProducer::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
+void CSlideCoreProducer::SetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inHandle,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue)
@@ -214,7 +214,7 @@ struct HashMapDataValueInsertTransaction
     }
 };
 
-inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                                 Qt3DSDMInstanceHandle inHandle,
                                                                 Qt3DSDMPropertyHandle inProperty,
                                                                 const SValue &inValue)
@@ -262,7 +262,7 @@ inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(CUICDMSlideHandl
     }
 }
 
-void CSlideCoreProducer::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+void CSlideCoreProducer::ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                        Qt3DSDMInstanceHandle inHandle,
                                                        Qt3DSDMPropertyHandle inProperty,
                                                        const SValue &inValue)
@@ -273,7 +273,7 @@ void CSlideCoreProducer::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide
         m_Data->ForceSetInstancePropertyValue(inSlide, inHandle, inProperty, inValue);
 }
 
-bool CSlideCoreProducer::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CSlideCoreProducer::GetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                           Qt3DSDMInstanceHandle inInstance,
                                                           Qt3DSDMPropertyHandle inProperty,
                                                           SValue &outValue) const
@@ -281,19 +281,19 @@ bool CSlideCoreProducer::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSl
     return m_Data->GetSpecificInstancePropertyValue(inSlide, inInstance, inProperty, outValue);
 }
 
-bool CSlideCoreProducer::ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+bool CSlideCoreProducer::ContainsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                           Qt3DSDMPropertyHandle inProperty) const
 {
     return m_Data->ContainsProperty(inSlide, inHandle, inProperty);
 }
 
-void CSlideCoreProducer::GetSlidePropertyEntries(CUICDMSlideHandle inSlide,
+void CSlideCoreProducer::GetSlidePropertyEntries(Qt3DSDMSlideHandle inSlide,
                                                  TSlideEntryList &outEntries) const
 {
     return m_Data->GetSlidePropertyEntries(inSlide, outEntries);
 }
 
-void CSlideCoreProducer::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
+void CSlideCoreProducer::PushPropertyValueToChildren(Qt3DSDMSlideHandle inParent,
                                                      Qt3DSDMInstanceHandle inHandle,
                                                      Qt3DSDMPropertyHandle inProperty,
                                                      const SValue &inValue)
@@ -324,7 +324,7 @@ inline void ClearValueWithTransactions(TTransactionConsumerPtr inConsumer,
     }
 }
 
-void CSlideCoreProducer::ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
+void CSlideCoreProducer::ClearChildrenPropertyValues(Qt3DSDMSlideHandle inParent,
                                                      Qt3DSDMInstanceHandle inHandle,
                                                      Qt3DSDMPropertyHandle inProperty)
 {
@@ -414,8 +414,8 @@ void CSlideCoreProducer::DeleteAllInstancePropertyEntries(const TInstanceHandleL
                                               std::cref(inProperties)));
 }
 
-void CSlideCoreProducer::GetIntersectingProperties(CUICDMSlideHandle inSlide1,
-                                                   CUICDMSlideHandle inSlide2,
+void CSlideCoreProducer::GetIntersectingProperties(Qt3DSDMSlideHandle inSlide1,
+                                                   Qt3DSDMSlideHandle inSlide2,
                                                    TSlideEntryList &outEntries) const
 {
     return m_Data->GetIntersectingProperties(inSlide1, inSlide2, outEntries);
@@ -429,7 +429,7 @@ bool InstancePropMatches(Qt3DSDMInstanceHandle instance, Qt3DSDMPropertyHandle p
 
 bool SendPropertyAddedIfNotInList(Qt3DSDMInstanceHandle instance, Qt3DSDMPropertyHandle prop,
                                   SValue & /*value*/, const TSlideEntryList &inList,
-                                  CUICDMSlideHandle inSource, CUICDMSlideHandle inSlide,
+                                  Qt3DSDMSlideHandle inSource, Qt3DSDMSlideHandle inSlide,
                                   ISlideCoreSignalSender * /*inSignalSender*/)
 {
     if (find_if<TSlideEntryList::const_iterator>(
@@ -441,9 +441,9 @@ bool SendPropertyAddedIfNotInList(Qt3DSDMInstanceHandle instance, Qt3DSDMPropert
 }
 
 // destination gets the properties from slide 1 that have corresponding entries in slide 2
-void CSlideCoreProducer::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
-                                                    CUICDMSlideHandle inSlide2,
-                                                    CUICDMSlideHandle inDestination)
+void CSlideCoreProducer::PushIntersectingProperties(Qt3DSDMSlideHandle inSlide1,
+                                                    Qt3DSDMSlideHandle inSlide2,
+                                                    Qt3DSDMSlideHandle inDestination)
 {
     SSlide *theDest = CSimpleSlideCore::GetSlideNF(inDestination, m_Data->m_Objects);
     TSlideEntryList theProperties;
@@ -466,9 +466,9 @@ void CSlideCoreProducer::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
     }
 }
 
-void CSlideCoreProducer::CopyProperties(CUICDMSlideHandle inSourceSlide,
+void CSlideCoreProducer::CopyProperties(Qt3DSDMSlideHandle inSourceSlide,
                                         Qt3DSDMInstanceHandle inSourceInstance,
-                                        CUICDMSlideHandle inDestSlide,
+                                        Qt3DSDMSlideHandle inDestSlide,
                                         Qt3DSDMInstanceHandle inDestInstance)
 {
     SSlide *sourceSlide = CSimpleSlideCore::GetSlideNF(inSourceSlide, m_Data->m_Objects);
@@ -490,7 +490,7 @@ bool CSlideCoreProducer::HandleValid(int inHandle) const
     return m_Data->HandleValid(inHandle);
 }
 
-bool CSlideCoreProducer::IsSlide(CUICDMSlideHandle inSlide) const
+bool CSlideCoreProducer::IsSlide(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->IsSlide(inSlide);
 }
@@ -502,39 +502,39 @@ void CSlideCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
 }
 
 TSignalConnectionPtr
-CSlideCoreProducer::ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback)
+CSlideCoreProducer::ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectSlideCreated(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectBeforeSlideDeleted(
-    const std::function<void(CUICDMSlideHandle)> &inCallback)
+    const std::function<void(Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectBeforeSlideDeleted(inCallback);
 }
 TSignalConnectionPtr
-CSlideCoreProducer::ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback)
+CSlideCoreProducer::ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectSlideDeleted(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectSlideDerived(
-    const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback)
+    const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, int)> &inCallback)
 {
     return GetSignalProvider()->ConnectSlideDerived(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectInstancePropertyValueSet(
-    const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+    const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                const SValue &)> &inCallback)
 {
     return GetSignalProvider()->ConnectInstancePropertyValueSet(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectInstancePropertyValueRemoved(
-    const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+    const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                const SValue &)> &inCallback)
 {
     return GetSignalProvider()->ConnectInstancePropertyValueRemoved(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectSlideTimeChanged(
-    const std::function<void(CUICDMSlideHandle)> &inCallback)
+    const std::function<void(Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectSlideTimeChanged(inCallback);
 }
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h
index 848ed2a1..aa7e89e9 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.h
@@ -97,56 +97,56 @@ public:
     TSimpleSlideCorePtr GetTransactionlessSlideCore() { return m_Data; }
     TSimpleSlideCorePtr GetTransactionlessSlideCore() const { return m_Data; }
 
-    CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
-    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
-    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const override;
-    void DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
+    Qt3DSDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
+    Qt3DSDMInstanceHandle GetSlideInstance(Qt3DSDMSlideHandle inSlide) const override;
+    Qt3DSDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const override;
+    void DeleteSlide(Qt3DSDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
     void GetSlides(TSlideHandleList &outSlides) const override;
 
-    float GetSlideTime(CUICDMSlideHandle inSlide) const override;
-    void SetSlideTime(CUICDMSlideHandle inSlide, float inNewTime) override;
+    float GetSlideTime(Qt3DSDMSlideHandle inSlide) const override;
+    void SetSlideTime(Qt3DSDMSlideHandle inSlide, float inNewTime) override;
 
-    void DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent, int inIndex = -1) override;
-    CUICDMSlideHandle GetParentSlide(CUICDMSlideHandle inSlide) const override;
-    void GetChildSlides(CUICDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
-    int GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const override;
+    void DeriveSlide(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent, int inIndex = -1) override;
+    Qt3DSDMSlideHandle GetParentSlide(Qt3DSDMSlideHandle inSlide) const override;
+    void GetChildSlides(Qt3DSDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
+    int GetChildIndex(Qt3DSDMSlideHandle inParent, Qt3DSDMSlideHandle inChild) const override;
 
-    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    bool GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                   Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    void SetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                   Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
-    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    void ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                        Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
-    bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+    bool GetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
-    void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
+    void GetSpecificInstancePropertyValues(Qt3DSDMSlideHandle inSlide,
                                            Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outValues) override
     {
         return m_Data->GetSpecificInstancePropertyValues(inSlide, inInstance, outValues);
     }
-    bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    bool ContainsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                           Qt3DSDMPropertyHandle inProperty) const override;
-    void GetSlidePropertyEntries(CUICDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
+    void GetSlidePropertyEntries(Qt3DSDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
 
-    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+    void PushPropertyValueToChildren(Qt3DSDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
                                      Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
-    void ClearChildrenPropertyValues(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+    void ClearChildrenPropertyValues(Qt3DSDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
                                      Qt3DSDMPropertyHandle inProperty) override;
     void DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inHandle) override;
     void DeleteAllPropertyEntries(Qt3DSDMPropertyHandle inHandle) override;
     void DeleteAllInstancePropertyEntries(const TInstanceHandleList &inInstances,
                                           const TPropertyHandleList &inProperties) override;
 
-    void GetIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
+    void GetIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
                                    TSlideEntryList &outEntries) const override;
-    void PushIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
-                                    CUICDMSlideHandle inDestination) override;
-    void CopyProperties(CUICDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
-                        CUICDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
+    void PushIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
+                                    Qt3DSDMSlideHandle inDestination) override;
+    void CopyProperties(Qt3DSDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
+                        Qt3DSDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
 
-    bool IsSlide(CUICDMSlideHandle inSlide) const override;
+    bool IsSlide(Qt3DSDMSlideHandle inSlide) const override;
 
     bool HandleValid(int inHandle) const override;
 
@@ -157,24 +157,24 @@ public:
     //===================================================================
 
     virtual TSignalConnectionPtr
-    ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) override;
+    ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectBeforeSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override;
+    ConnectBeforeSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override;
+    ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectSlideDerived(
-        const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback) override;
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, int)> &inCallback) override;
     TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override;
     TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectSlideTimeChanged(const std::function<void(CUICDMSlideHandle)> &inCallback) override;
+    ConnectSlideTimeChanged(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override;
 
 private:
-    inline void DoForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    inline void DoForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                 Qt3DSDMInstanceHandle inHandle,
                                                 Qt3DSDMPropertyHandle inProperty,
                                                 const SValue &inValue);
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
index 52ea12b5..5bf5b94a 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.cpp
@@ -35,7 +35,7 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideGraphHandle CSlideGraphCoreProducer::CreateSlideGraph(CUICDMSlideHandle inRoot)
+CUICDMSlideGraphHandle CSlideGraphCoreProducer::CreateSlideGraph(Qt3DSDMSlideHandle inRoot)
 {
     CUICDMSlideGraphHandle retval(m_Data->CreateSlideGraph(inRoot));
     CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
@@ -43,12 +43,12 @@ CUICDMSlideGraphHandle CSlideGraphCoreProducer::CreateSlideGraph(CUICDMSlideHand
     return retval;
 }
 
-CUICDMSlideHandle CSlideGraphCoreProducer::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphRoot(CUICDMSlideGraphHandle inGraph) const
 {
     return m_Data->GetGraphRoot(inGraph);
 }
 
-CUICDMSlideGraphHandle CSlideGraphCoreProducer::GetSlideGraph(CUICDMSlideHandle inSlide) const
+CUICDMSlideGraphHandle CSlideGraphCoreProducer::GetSlideGraph(Qt3DSDMSlideHandle inSlide) const
 {
     return m_Data->GetSlideGraph(inSlide);
 }
@@ -87,7 +87,7 @@ struct DissocateAllInstanceTrans : public ITransaction
 void CSlideGraphCoreProducer::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
 {
     SSlideGraph *theGraph = CSimpleSlideGraphCore::GetSlideGraphNF(inHandle, m_Data->m_Objects);
-    CUICDMSlideHandle theRootSlide(theGraph->m_Root);
+    Qt3DSDMSlideHandle theRootSlide(theGraph->m_Root);
     if (m_Consumer)
         m_Consumer->OnTransaction(
             make_shared<DissocateAllInstanceTrans>(__FILE__, __LINE__, m_Data, inHandle));
@@ -100,12 +100,12 @@ struct SInstanceAssociateTrans : public ITransaction
 {
     std::shared_ptr<CSimpleSlideGraphCore> m_Graph;
     CUICDMSlideGraphHandle m_GraphHandle;
-    CUICDMSlideHandle m_Slide;
+    Qt3DSDMSlideHandle m_Slide;
     Qt3DSDMInstanceHandle m_Instance;
     bool m_InsertOnDo;
     SInstanceAssociateTrans(const char *inFile, int inLine,
                             std::shared_ptr<CSimpleSlideGraphCore> inGraph,
-                            CUICDMSlideGraphHandle inGraphHandle, CUICDMSlideHandle inSlideHandle,
+                            CUICDMSlideGraphHandle inGraphHandle, Qt3DSDMSlideHandle inSlideHandle,
                             Qt3DSDMInstanceHandle inInstance, bool inInsertOnDo)
         : ITransaction(inFile, inLine)
         , m_Graph(inGraph)
@@ -135,7 +135,7 @@ struct SInstanceAssociateTrans : public ITransaction
 };
 
 void CSlideGraphCoreProducer::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
-                                                CUICDMSlideHandle inSlide,
+                                                Qt3DSDMSlideHandle inSlide,
                                                 Qt3DSDMInstanceHandle inInstance)
 {
     m_Data->AssociateInstance(inSlideGraph, inSlide, inInstance);
@@ -172,10 +172,10 @@ void CSlideGraphCoreProducer::DissociateInstance(Qt3DSDMInstanceHandle inInstanc
 }
 
 void CSlideGraphCoreProducer::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
-                                                  CUICDMSlideHandle inSlide)
+                                                  Qt3DSDMSlideHandle inSlide)
 {
     if (m_Consumer) {
-        CUICDMSlideHandle current = m_Data->GetGraphActiveSlide(inGraph);
+        Qt3DSDMSlideHandle current = m_Data->GetGraphActiveSlide(inGraph);
         TTransactionPtr theTransaction(CREATE_GENERIC_TRANSACTION(
             bind(&CSimpleSlideGraphCore::SetGraphActiveSlide, m_Data, inGraph, inSlide),
             bind(&CSimpleSlideGraphCore::SetGraphActiveSlide, m_Data, inGraph, current)));
@@ -185,7 +185,7 @@ void CSlideGraphCoreProducer::SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph
     GetSignalSender()->SendGraphActiveSlide(inGraph, inSlide);
 }
 
-CUICDMSlideHandle CSlideGraphCoreProducer::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
+Qt3DSDMSlideHandle CSlideGraphCoreProducer::GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const
 {
     return m_Data->GetGraphActiveSlide(inGraph);
 }
@@ -201,29 +201,29 @@ void CSlideGraphCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
 }
 
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphCreated(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback)
+    const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectGraphCreated(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphDeleted(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback)
+    const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectGraphDeleted(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceAssociated(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+    const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
         &inCallback)
 {
     return GetSignalProvider()->ConnectInstanceAssociated(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceDissociated(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+    const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
         &inCallback)
 {
     return GetSignalProvider()->ConnectInstanceDissociated(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphActiveSlide(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback)
+    const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback)
 {
     return GetSignalProvider()->ConnectGraphActiveSlide(inCallback);
 }
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
index 2cc50436..1188b69d 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideGraphCoreProducer.h
@@ -53,21 +53,21 @@ public:
     TSimpleSlideGraphCorePtr GetTransactionlessSlideGraphCore() { return m_Data; }
     TSimpleSlideGraphCorePtr GetTransactionlessSlideGraphCore() const { return m_Data; }
 
-    CUICDMSlideGraphHandle CreateSlideGraph(CUICDMSlideHandle inRoot) override;
-    CUICDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
-    CUICDMSlideGraphHandle GetSlideGraph(CUICDMSlideHandle inSlide) const override;
+    CUICDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) override;
+    Qt3DSDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const override;
+    CUICDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const override;
     void GetSlideGraphs(TSlideGraphHandleList &outGraphs) const override;
     void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) override;
 
-    void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
+    void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
                            Qt3DSDMInstanceHandle inInstance) override;
     void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                 TSlideInstancePairList &outAssociations) const override;
     TGraphSlidePair GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const override;
     void DissociateInstance(Qt3DSDMInstanceHandle inInstance) override;
 
-    void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) override;
-    CUICDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
+    void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override;
+    Qt3DSDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const override;
 
     bool HandleValid(int inHandle) const override;
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
@@ -76,17 +76,17 @@ public:
     // Signals
     //===================================================================
     TSignalConnectionPtr ConnectGraphCreated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectGraphDeleted(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override;
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override;
     TSignalConnectionPtr ConnectGraphActiveSlide(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override;
 
 private:
     void InitSignaller();
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
index 96ec1164..1409e84f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
@@ -52,13 +52,13 @@ public:
     virtual IStringTable &GetStringTable() const = 0;
     // Action
     virtual CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance,
-                                            CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+                                            Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                             SLong4 inTriggerTargetObjects) = 0;
     virtual void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) = 0;
     virtual const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const = 0;
-    virtual void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    virtual void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const = 0;
-    virtual void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const = 0;
+    virtual void GetActions(Qt3DSDMSlideHandle inSlide, TActionHandleList &outActions) const = 0;
     virtual void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const = 0;
     virtual void GetActions(TActionHandleList &outActions) const = 0;
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
index 853aea16..8ad26a1e 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
@@ -41,7 +41,7 @@ struct SActionInfo
                                      // properties not listed here)
 
     // Where the action is added to
-    CUICDMSlideHandle m_Slide; // the slide that the action is added to
+    Qt3DSDMSlideHandle m_Slide; // the slide that the action is added to
     Qt3DSDMInstanceHandle
         m_Owner; // the object that the action is added to (the owner of the action)
 
@@ -59,7 +59,7 @@ struct SActionInfo
 
     SActionInfo() {}
 
-    SActionInfo(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+    SActionInfo(Qt3DSDMInstanceHandle inInstance, Qt3DSDMSlideHandle inSlide,
                 Qt3DSDMInstanceHandle inOwner)
         : m_Instance(inInstance)
         , m_Slide(inSlide)
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
index 51e5bb5a..5324da88 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
@@ -47,22 +47,22 @@ public:
 
     // CreateAction will create Action's InstanceHandle and Action's ActionHandle and do some
     // necessary setup
-    virtual CUICDMActionHandle CreateAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    virtual CUICDMActionHandle CreateAction(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                             SLong4 inTriggerTargetObjects) = 0;
     // DeleteAction will delete both Action's ActionHandle and Action's InstanceHandle
     virtual void DeleteAction(CUICDMActionHandle inAction) = 0;
     // Return all actions that belong to a certain instance in a certain slide + the master slide
-    virtual void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
+    virtual void GetActions(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const = 0;
 
     // Get/set action eyeball property value
-    virtual bool GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
+    virtual bool GetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide,
                                        CUICDMActionHandle inAction) const = 0;
-    virtual void SetActionEyeballValue(CUICDMSlideHandle inActiveSlide, CUICDMActionHandle inAction,
+    virtual void SetActionEyeballValue(Qt3DSDMSlideHandle inActiveSlide, CUICDMActionHandle inAction,
                                        bool inValue) = 0;
 };
 
 typedef std::shared_ptr<IActionSystem> TActionSystemPtr;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
index a38e8d77..96bb1298 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
@@ -185,7 +185,7 @@ typedef std::vector<TKeyframe> TKeyframeList;
 
 struct SAnimationInfo
 {
-    CUICDMSlideHandle m_Slide;
+    Qt3DSDMSlideHandle m_Slide;
     Qt3DSDMInstanceHandle m_Instance;
     Qt3DSDMPropertyHandle m_Property;
     size_t m_Index;
@@ -205,7 +205,7 @@ struct SAnimationInfo
 
     {
     }
-    SAnimationInfo(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    SAnimationInfo(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                    Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
                    bool inDynamicFirstKeyframe, bool inArtistEdited)
         : m_Slide(inSlide)
@@ -230,23 +230,23 @@ class IAnimationCore
 {
 public:
     virtual ~IAnimationCore() {}
-    virtual CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
+    virtual CUICDMAnimationHandle CreateAnimation(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                                   EAnimationType inAnimationType,
                                                   bool inFirstKeyframeDynamic) = 0;
     virtual void DeleteAnimation(CUICDMAnimationHandle inAnimation) = 0;
-    virtual CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide,
+    virtual CUICDMAnimationHandle GetAnimation(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inInstance,
                                                Qt3DSDMPropertyHandle inProperty,
                                                size_t inIndex) const = 0;
     virtual SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const = 0;
     virtual void GetAnimations(TAnimationHandleList &outAnimations) const = 0;
     virtual void GetAnimations(TAnimationInfoList &outAnimations,
-                               CUICDMSlideHandle inMaster = CUICDMSlideHandle(),
-                               CUICDMSlideHandle inSlide = CUICDMSlideHandle()) const = 0;
+                               Qt3DSDMSlideHandle inMaster = Qt3DSDMSlideHandle(),
+                               Qt3DSDMSlideHandle inSlide = Qt3DSDMSlideHandle()) const = 0;
 
-    virtual void GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide,
+    virtual void GetSpecificInstanceAnimations(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inInstance,
                                                TAnimationHandleList &outAnimations) = 0;
 
@@ -269,7 +269,7 @@ public:
     virtual size_t GetKeyframeCount(CUICDMAnimationHandle inAnimation) const = 0;
     virtual bool IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) const = 0;
 
-    virtual void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    virtual void OffsetAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                   long inOffset) = 0;
 
     // Direct mutators of the artist edited feature of animations
@@ -282,9 +282,9 @@ public:
     virtual bool KeyframeValid(CUICDMKeyframeHandle inKeyframe) const = 0;
     virtual bool AnimationValid(CUICDMAnimationHandle inAnimation) const = 0;
 
-    virtual void CopyAnimations(CUICDMSlideHandle inSourceSlide,
+    virtual void CopyAnimations(Qt3DSDMSlideHandle inSourceSlide,
                                 Qt3DSDMInstanceHandle inSourceInstance,
-                                CUICDMSlideHandle inDestSlide,
+                                Qt3DSDMSlideHandle inDestSlide,
                                 Qt3DSDMInstanceHandle inDestInstance) = 0;
 };
 
@@ -390,7 +390,7 @@ public:
      *	Get an instance property value.  Will override outValue only if the slide, instance,
      *property is animated.
      */
-    virtual bool GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual bool GetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const = 0;
@@ -399,7 +399,7 @@ public:
      *	the property is actually animated.  May only set local values, or may auto set a keyframed
      *value.
      */
-    virtual bool SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual bool SetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue) = 0;
@@ -438,7 +438,7 @@ inline SEaseInEaseOutKeyframe CreateEaseInEaseOutKeyframe(float inSeconds, float
     return retval;
 }
 
-inline SAnimationInfo CreateAnimationInfo(CUICDMSlideHandle inSlide,
+inline SAnimationInfo CreateAnimationInfo(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
@@ -741,7 +741,7 @@ void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &
                    CUICDMAnimationHandle inDestAnimation, const TKeyframeHandleList &inKeyframes);
 
 CUICDMAnimationHandle CopyAnimation(TAnimationCorePtr inSourceAnimationCore,
-                                    CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inNewSlide,
+                                    CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inNewSlide,
                                     Qt3DSDMInstanceHandle inNewInstance,
                                     Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex);
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
index 0a040214..7bd0d456 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
@@ -143,31 +143,31 @@ public:
 
 typedef std::vector<Qt3DSDMPropertyHandle> TPropertyHandleList;
 
-class CUICDMSlideHandle : public CDataModelHandle
+class Qt3DSDMSlideHandle : public CDataModelHandle
 {
 public:
-    CUICDMSlideHandle(int inHandle = 0)
+    Qt3DSDMSlideHandle(int inHandle = 0)
         : CDataModelHandle(inHandle)
     {
     }
 
-    CUICDMSlideHandle(const CDataModelHandle &inOther)
+    Qt3DSDMSlideHandle(const CDataModelHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMSlideHandle(const CUICDMSlideHandle &inOther)
+    Qt3DSDMSlideHandle(const Qt3DSDMSlideHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMSlideHandle &operator=(const CUICDMSlideHandle &inOther)
+    Qt3DSDMSlideHandle &operator=(const Qt3DSDMSlideHandle &inOther)
     {
-        return static_cast<CUICDMSlideHandle &>(CDataModelHandle::operator=(inOther));
+        return static_cast<Qt3DSDMSlideHandle &>(CDataModelHandle::operator=(inOther));
     }
 };
 
-typedef std::vector<CUICDMSlideHandle> TSlideHandleList;
+typedef std::vector<Qt3DSDMSlideHandle> TSlideHandleList;
 
 class CUICDMSlideGraphHandle : public CDataModelHandle
 {
@@ -454,6 +454,6 @@ public:
 typedef std::vector<CUICDMGuideHandle> TGuideHandleList;
 }
 
-Q_DECLARE_METATYPE(qt3dsdm::CUICDMSlideHandle);
+Q_DECLARE_METATYPE(qt3dsdm::Qt3DSDMSlideHandle);
 
 #endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
index 22f8e833..029e1671 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
@@ -121,80 +121,80 @@ class ISlideCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr
-    ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectBeforeSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectBeforeSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectSlideDerived(
-        const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, int)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectSlideTimeChanged(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectSlideTimeChanged(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
 };
 
 class ISlideCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SendSlideCreated(CUICDMSlideHandle inSlide) = 0;
-    virtual void SendBeforeSlideDeleted(CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideDeleted(CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideDerived(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
+    virtual void SendSlideCreated(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendBeforeSlideDeleted(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideDeleted(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideDerived(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent,
                                   int inIndex) = 0;
-    virtual void SendPropertyValueSet(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    virtual void SendPropertyValueSet(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inParent, const SValue &inValue) = 0;
     // This gives clients a chance to override a property value the first time it is set on a slide
-    virtual void SendPropertyValueRemoved(CUICDMSlideHandle inSlide,
+    virtual void SendPropertyValueRemoved(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inParent, const SValue &inValue) = 0;
-    virtual void SendSlideTimeChanged(CUICDMSlideHandle inSlide) = 0;
+    virtual void SendSlideTimeChanged(Qt3DSDMSlideHandle inSlide) = 0;
 };
 
 class ISlideGraphCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectGraphCreated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectGraphDeleted(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectGraphActiveSlide(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) = 0;
 };
 
 class ISlideGraphCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SendGraphCreated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) = 0;
-    virtual void SendGraphDeleted(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) = 0;
-    virtual void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
+    virtual void SendGraphCreated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendGraphDeleted(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide,
                                         Qt3DSDMInstanceHandle inInstance) = 0;
-    virtual void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
+    virtual void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide,
                                          Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SendGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
-                                      CUICDMSlideHandle inSlide) = 0;
+                                      Qt3DSDMSlideHandle inSlide) = 0;
 };
 
 class IAnimationCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectBeforeAnimationDeleted(
         const std::function<void(CUICDMAnimationHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectAnimationDeleted(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectKeyframeInserted(
         const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
@@ -215,12 +215,12 @@ public:
 class IAnimationCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SendAnimationCreated(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
+    virtual void SendAnimationCreated(CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inSlide,
                                       Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) = 0;
     virtual void SendBeforeAnimationDeleted(CUICDMAnimationHandle inAnimation) = 0;
-    virtual void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
+    virtual void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inSlide,
                                       Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) = 0;
@@ -283,19 +283,19 @@ class IActionSystemSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
 };
 
 class IActionSystemSignalSender : public ISignalItem
 {
 public:
-    virtual void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    virtual void SendActionCreated(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) = 0;
-    virtual void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    virtual void SendActionDeleted(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) = 0;
 };
 
@@ -369,74 +369,74 @@ class ISlideSystemSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr
-    ConnectMasterCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectMasterCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectMasterDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectMasterDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectSlideCreated(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectSlideDeleted(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectSlideRearranged(
-        const std::function<void(CUICDMSlideHandle, int, int)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, int, int)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActiveSlide(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle, CUICDMSlideHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle, Qt3DSDMSlideHandle)>
             &inCallback) = 0;
 };
 
 class ISlideSystemSignalSender : public ISignalItem
 {
 public:
-    virtual void SendMasterCreated(CUICDMSlideHandle inMaster) = 0;
-    virtual void SendMasterDeleted(CUICDMSlideHandle inMaster) = 0;
-    virtual void SendSlideCreated(CUICDMSlideHandle inMaster, int inIndex,
-                                  CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideDeleted(CUICDMSlideHandle inMaster, int inIndex,
-                                  CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideRearranged(CUICDMSlideHandle inMaster, int inOldIndex,
+    virtual void SendMasterCreated(Qt3DSDMSlideHandle inMaster) = 0;
+    virtual void SendMasterDeleted(Qt3DSDMSlideHandle inMaster) = 0;
+    virtual void SendSlideCreated(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                  Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideDeleted(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                  Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideRearranged(Qt3DSDMSlideHandle inMaster, int inOldIndex,
                                      int inNewIndex) = 0;
-    virtual void SendInstanceAssociated(CUICDMSlideHandle inMaster,
+    virtual void SendInstanceAssociated(Qt3DSDMSlideHandle inMaster,
                                         Qt3DSDMInstanceHandle inInstance) = 0;
-    virtual void SendInstanceDissociated(CUICDMSlideHandle inMaster,
+    virtual void SendInstanceDissociated(Qt3DSDMSlideHandle inMaster,
                                          Qt3DSDMInstanceHandle inInstance) = 0;
-    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    virtual void SendPropertyLinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                     Qt3DSDMPropertyHandle inProperty) = 0;
-    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    virtual void SendPropertyUnlinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty) = 0;
-    virtual void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex,
-                                 CUICDMSlideHandle inOldSlide, CUICDMSlideHandle inNewSlide) = 0;
+    virtual void SendActiveSlide(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                 Qt3DSDMSlideHandle inOldSlide, Qt3DSDMSlideHandle inNewSlide) = 0;
 };
 
 class IStudioFullSystemSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr
-    ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectSlideRearranged(
-        const std::function<void(CUICDMSlideHandle, int, int)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, int, int)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectBeginComponentSeconds(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectBeginComponentSeconds(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectComponentSeconds(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
+    ConnectComponentSeconds(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActiveSlide(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr
     ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
@@ -462,10 +462,10 @@ public:
         const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectTriggerObjectSet(const std::function<void(CUICDMActionHandle)> &inCallback) = 0;
@@ -509,18 +509,18 @@ public:
 class IStudioFullSystemSignalSender : public ISignalItem
 {
 public:
-    virtual void SendSlideCreated(CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideDeleted(CUICDMSlideHandle inSlide) = 0;
-    virtual void SendSlideRearranged(CUICDMSlideHandle inMaster, int inOldIndex,
+    virtual void SendSlideCreated(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideDeleted(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual void SendSlideRearranged(Qt3DSDMSlideHandle inMaster, int inOldIndex,
                                      int inNewIndex) = 0;
-    virtual void SendComponentSeconds(CUICDMSlideHandle inMaster) = 0;
-    virtual void SendBeginComponentSeconds(CUICDMSlideHandle inMaster) = 0;
-    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    virtual void SendComponentSeconds(Qt3DSDMSlideHandle inMaster) = 0;
+    virtual void SendBeginComponentSeconds(Qt3DSDMSlideHandle inMaster) = 0;
+    virtual void SendPropertyLinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                     Qt3DSDMPropertyHandle inProperty) = 0;
-    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    virtual void SendPropertyUnlinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty) = 0;
-    virtual void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex,
-                                 CUICDMSlideHandle inSlide) = 0;
+    virtual void SendActiveSlide(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                 Qt3DSDMSlideHandle inSlide) = 0;
 
     virtual void SendInstanceCreated(Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SendInstanceDeleted(Qt3DSDMInstanceHandle inInstance) = 0;
@@ -542,9 +542,9 @@ public:
     virtual void SendInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
                                            Qt3DSDMPropertyHandle inProperty) = 0;
 
-    virtual void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    virtual void SendActionCreated(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) = 0;
-    virtual void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    virtual void SendActionDeleted(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendTriggerObjectSet(CUICDMActionHandle inAction) = 0;
     virtual void SendTargetObjectSet(CUICDMActionHandle inAction) = 0;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
index 833290e4..7f54c203 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
@@ -55,30 +55,30 @@ public:
     /**
      *	Create a new slide.  Slides must have an instance allocated for them.
      */
-    virtual CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual Qt3DSDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) = 0;
     /**
      *	Return the instance that was allocated for this slide.
      */
-    virtual Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideInstance(Qt3DSDMSlideHandle inSlide) const = 0;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    virtual CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const = 0;
+    virtual Qt3DSDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const = 0;
     /**
      *	Delete a given slide.  This recursively deletes all children.  All associated instances
      *	are returned in the outInstances list so the caller can further delete them.
      *	The deleted object is removed from the parent's list of children.  Child objects are
      *	also deleted.
      */
-    virtual void DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances) = 0;
+    virtual void DeleteSlide(Qt3DSDMSlideHandle inSlide, TInstanceHandleList &outInstances) = 0;
     /**
      *	Return all of the slides in the core.
      */
     virtual void GetSlides(TSlideHandleList &outSlides) const = 0;
 
-    virtual float GetSlideTime(CUICDMSlideHandle inSlide) const = 0;
+    virtual float GetSlideTime(Qt3DSDMSlideHandle inSlide) const = 0;
 
-    virtual void SetSlideTime(CUICDMSlideHandle inSlide, float inNewTime) = 0;
+    virtual void SetSlideTime(Qt3DSDMSlideHandle inSlide, float inNewTime) = 0;
 
     //===============================================================
     // Slide derivation
@@ -89,21 +89,21 @@ public:
      *	if it isn't found on this slide.  OK for parent to be an invalid handle.  It is also fine
      *	for the slide to have a valid parent; all involved parties are notified and updated.
      */
-    virtual void DeriveSlide(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
+    virtual void DeriveSlide(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent,
                              int inIndex = -1) = 0;
     /**
      *	Return the parent slide for this slide.  Invalid handle if no parent.
      */
-    virtual CUICDMSlideHandle GetParentSlide(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMSlideHandle GetParentSlide(Qt3DSDMSlideHandle inSlide) const = 0;
     /**
      *	Return a list of derived slides for this slide.
      */
-    virtual void GetChildSlides(CUICDMSlideHandle inSlide, TSlideHandleList &outChildren) const = 0;
+    virtual void GetChildSlides(Qt3DSDMSlideHandle inSlide, TSlideHandleList &outChildren) const = 0;
 
     /**
      *	Return the index of this child.  Exception if child isn't found
      */
-    virtual int GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const = 0;
+    virtual int GetChildIndex(Qt3DSDMSlideHandle inParent, Qt3DSDMSlideHandle inChild) const = 0;
     //===============================================================
 
     //===============================================================
@@ -112,7 +112,7 @@ public:
     /**
      *	Get this property from this instance in this slide.  Includes lookup into any parent slides.
      */
-    virtual bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual bool GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
@@ -124,7 +124,7 @@ public:
      *if
      *	it already has a property entry then it sets the value locally.
      */
-    virtual void SetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual void SetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty,
                                           const SValue &inValue) = 0;
@@ -133,7 +133,7 @@ public:
      *	Set this property on this slide; do not try to set on parent slide under any circumstances.
      *Always adds entry to this slide.
      */
-    virtual void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual void ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inInstance,
                                                Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) = 0;
@@ -141,7 +141,7 @@ public:
     /**
      *	Return the value for this property if it exists on this slide.
      */
-    virtual bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual bool GetSpecificInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const = 0;
@@ -149,20 +149,20 @@ public:
     /**
      *	Return all of the properties for this instance stored on this slide.
      */
-    virtual void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
+    virtual void GetSpecificInstancePropertyValues(Qt3DSDMSlideHandle inSlide,
                                                    Qt3DSDMInstanceHandle inInstance,
                                                    TPropertyHandleValuePairList &outValues) = 0;
 
     /**
      *	Get all of the property entries for the slide.
      */
-    virtual void GetSlidePropertyEntries(CUICDMSlideHandle inSlide,
+    virtual void GetSlidePropertyEntries(Qt3DSDMSlideHandle inSlide,
                                          TSlideEntryList &outEntries) const = 0;
 
     /**
      *	Set this property value on all my child slides.
      */
-    virtual void PushPropertyValueToChildren(CUICDMSlideHandle inParent,
+    virtual void PushPropertyValueToChildren(Qt3DSDMSlideHandle inParent,
                                              Qt3DSDMInstanceHandle inInstance,
                                              Qt3DSDMPropertyHandle inProperty,
                                              const SValue &inValue) = 0;
@@ -172,7 +172,7 @@ public:
      *with slide 2,
      *	add said property entry from slide1 to outEntries;
      */
-    virtual void GetIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
+    virtual void GetIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
                                            TSlideEntryList &outEntries) const = 0;
 
     /**
@@ -180,13 +180,13 @@ public:
     *destination.
     *	Used for new slide operations.
     */
-    virtual void PushIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
-                                            CUICDMSlideHandle inDestination) = 0;
+    virtual void PushIntersectingProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
+                                            Qt3DSDMSlideHandle inDestination) = 0;
 
     /**
      *	Ensure the children of this parent item do not contain entries for a given property.
      */
-    virtual void ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
+    virtual void ClearChildrenPropertyValues(Qt3DSDMSlideHandle inParent,
                                              Qt3DSDMInstanceHandle inHandle,
                                              Qt3DSDMPropertyHandle inProperty) = 0;
 
@@ -210,7 +210,7 @@ public:
     /**
      *	Does this slide contain this property?
      */
-    virtual bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+    virtual bool ContainsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
                                   Qt3DSDMPropertyHandle inProperty) const = 0;
 
     /**
@@ -218,12 +218,12 @@ public:
      *destination
      *	instance.
      */
-    virtual void CopyProperties(CUICDMSlideHandle inSourceSlide,
+    virtual void CopyProperties(Qt3DSDMSlideHandle inSourceSlide,
                                 Qt3DSDMInstanceHandle inSourceInstance,
-                                CUICDMSlideHandle inDestSlide,
+                                Qt3DSDMSlideHandle inDestSlide,
                                 Qt3DSDMInstanceHandle inDestInstance) = 0;
 
-    virtual bool IsSlide(CUICDMSlideHandle inSlide) const = 0;
+    virtual bool IsSlide(Qt3DSDMSlideHandle inSlide) const = 0;
 };
 
 typedef std::shared_ptr<ISlideCore> TSlideCorePtr;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
index 9afe3dae..1b2d40b6 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
@@ -35,9 +35,9 @@
 
 namespace qt3dsdm {
 
-typedef std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> TSlideInstancePair;
+typedef std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle> TSlideInstancePair;
 typedef std::vector<TSlideInstancePair> TSlideInstancePairList;
-typedef std::pair<CUICDMSlideGraphHandle, CUICDMSlideHandle> TGraphSlidePair;
+typedef std::pair<CUICDMSlideGraphHandle, Qt3DSDMSlideHandle> TGraphSlidePair;
 
 /**
  *	Binding instances to slide graphs.
@@ -54,9 +54,9 @@ public:
      *	of one and only one graph (i.e. it does not derive from another slide outside of the graph).
      *	Second is that an instance is a member of one and only one graph.
      */
-    virtual CUICDMSlideGraphHandle CreateSlideGraph(CUICDMSlideHandle inRoot) = 0;
-    virtual CUICDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const = 0;
-    virtual CUICDMSlideGraphHandle GetSlideGraph(CUICDMSlideHandle inSlide) const = 0;
+    virtual CUICDMSlideGraphHandle CreateSlideGraph(Qt3DSDMSlideHandle inRoot) = 0;
+    virtual Qt3DSDMSlideHandle GetGraphRoot(CUICDMSlideGraphHandle inGraph) const = 0;
+    virtual CUICDMSlideGraphHandle GetSlideGraph(Qt3DSDMSlideHandle inSlide) const = 0;
     virtual void GetSlideGraphs(TSlideGraphHandleList &outGraphs) const = 0;
     virtual void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) = 0;
 
@@ -69,7 +69,7 @@ public:
      *is
      *	implicitly associated with any root-derived slides.
      */
-    virtual void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
+    virtual void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                         TSlideInstancePairList &outAssociations) const = 0;
@@ -79,8 +79,8 @@ public:
     /**
      *	All graphs always have an active slide.  This is assumed to be the root right off the bat.
      */
-    virtual void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) = 0;
-    virtual CUICDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const = 0;
+    virtual void SetGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) = 0;
+    virtual Qt3DSDMSlideHandle GetGraphActiveSlide(CUICDMSlideGraphHandle inGraph) const = 0;
 };
 
 typedef std::shared_ptr<ISlideGraphCore> TSlideGraphCorePtr;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
index d98d170c..7396eb14 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
@@ -57,8 +57,8 @@ public:
      *	Don't forget to associate the instance with a the dest slide.  I doubt things
      *	will work correctly if you do not.
      */
-    virtual SValue CreateInstanceForProperty(CUICDMSlideHandle inSourceSlide,
-                                             CUICDMSlideHandle inDestSlide,
+    virtual SValue CreateInstanceForProperty(Qt3DSDMSlideHandle inSourceSlide,
+                                             Qt3DSDMSlideHandle inDestSlide,
                                              Qt3DSDMInstanceHandle inInstance) = 0;
 };
 
@@ -67,11 +67,11 @@ typedef std::shared_ptr<IPropertyInstanceInfo> TPropertyInstanceInfoPtr;
 struct SInstanceSlideInformation
 {
     // The slide associated with the instance
-    CUICDMSlideHandle m_AssociatedSlide;
+    Qt3DSDMSlideHandle m_AssociatedSlide;
     // The master slide of the component.
-    CUICDMSlideHandle m_MasterSlide;
+    Qt3DSDMSlideHandle m_MasterSlide;
     // The active slide of the component.
-    CUICDMSlideHandle m_ActiveSlide;
+    Qt3DSDMSlideHandle m_ActiveSlide;
     // The current milliseconds of the active slide on the component.
     long m_ComponentMilliseconds;
 
@@ -79,8 +79,8 @@ struct SInstanceSlideInformation
         : m_ComponentMilliseconds(0)
     {
     }
-    SInstanceSlideInformation(CUICDMSlideHandle inAssoc, CUICDMSlideHandle inMaster,
-                              CUICDMSlideHandle inActive, long inMilliseconds)
+    SInstanceSlideInformation(Qt3DSDMSlideHandle inAssoc, Qt3DSDMSlideHandle inMaster,
+                              Qt3DSDMSlideHandle inActive, long inMilliseconds)
         : m_AssociatedSlide(inAssoc)
         , m_MasterSlide(inMaster)
         , m_ActiveSlide(inActive)
@@ -93,30 +93,30 @@ class ISlideSystem
 {
 public:
     virtual ~ISlideSystem() {}
-    virtual CUICDMSlideHandle CreateMasterSlide() = 0;
-    virtual CUICDMSlideHandle CreateSlide(CUICDMSlideHandle inMaster, int inIndex = -1) = 0;
+    virtual Qt3DSDMSlideHandle CreateMasterSlide() = 0;
+    virtual Qt3DSDMSlideHandle CreateSlide(Qt3DSDMSlideHandle inMaster, int inIndex = -1) = 0;
     // Duplicate this slide and put it into the master's child lists at index.
-    virtual CUICDMSlideHandle DuplicateSlide(CUICDMSlideHandle inSourceSlide, int inDestIndex) = 0;
-    virtual CUICDMSlideHandle GetMasterSlide(CUICDMSlideHandle inSlide) const = 0;
-    virtual bool IsMasterSlide(CUICDMSlideHandle inSlide) const = 0;
-    virtual CUICDMSlideHandle GetMasterSlideByComponentGuid(SLong4 inGuid) const = 0;
+    virtual Qt3DSDMSlideHandle DuplicateSlide(Qt3DSDMSlideHandle inSourceSlide, int inDestIndex) = 0;
+    virtual Qt3DSDMSlideHandle GetMasterSlide(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual bool IsMasterSlide(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMSlideHandle GetMasterSlideByComponentGuid(SLong4 inGuid) const = 0;
     // Indexes are 1 based.  Index 0 refers to the master slide; you can't delete this.
-    virtual void DeleteSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex) = 0;
-    virtual void GetSlideReferencedInstances(CUICDMSlideHandle inMaster, size_t inIndex,
+    virtual void DeleteSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex) = 0;
+    virtual void GetSlideReferencedInstances(Qt3DSDMSlideHandle inMaster, size_t inIndex,
                                              TInstanceHandleList &outReferencedInstances) = 0;
-    virtual CUICDMSlideHandle GetSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex) const = 0;
-    virtual void SetActiveSlide(CUICDMSlideHandle inMaster, size_t inIndex) = 0;
-    virtual void RearrangeSlide(CUICDMSlideHandle inMaster, size_t inOldIndex,
+    virtual Qt3DSDMSlideHandle GetSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex) const = 0;
+    virtual void SetActiveSlide(Qt3DSDMSlideHandle inMaster, size_t inIndex) = 0;
+    virtual void RearrangeSlide(Qt3DSDMSlideHandle inMaster, size_t inOldIndex,
                                 size_t inNewIndex) = 0;
     /**
      *	Set the current component time.  This object will figure out the component from the slide.
      */
-    virtual void SetComponentSeconds(CUICDMSlideHandle inSlide, float inSeconds) = 0;
+    virtual void SetComponentSeconds(Qt3DSDMSlideHandle inSlide, float inSeconds) = 0;
     /**
      *	Return the current time of the component
      */
-    virtual float GetComponentSeconds(CUICDMSlideHandle inSlide) const = 0;
-    virtual long GetComponentSecondsLong(CUICDMSlideHandle inSlide) const = 0;
+    virtual float GetComponentSeconds(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual long GetComponentSecondsLong(Qt3DSDMSlideHandle inSlide) const = 0;
     virtual long GetComponentSecondsLong(Qt3DSDMInstanceHandle inInstance) const = 0;
 
     // The fastest way possible, get all of the slide information for this instance.
@@ -125,26 +125,26 @@ public:
     /**
      *	Slide count includes the master slide;
      */
-    virtual size_t GetSlideCount(CUICDMSlideHandle inMaster) const = 0;
+    virtual size_t GetSlideCount(Qt3DSDMSlideHandle inMaster) const = 0;
     /**
      * Use the instance for storing information such as name, or the GUID of the object
      * this slide links to.
      */
-    virtual Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideInstance(Qt3DSDMSlideHandle inSlide) const = 0;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    virtual CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const = 0;
+    virtual Qt3DSDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const = 0;
     /**
      *	Slide may be either a master slide
      */
-    virtual void AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
+    virtual void AssociateInstanceWithSlide(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance) = 0;
-    virtual CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const = 0;
+    virtual Qt3DSDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const = 0;
     virtual void GetAssociatedInstances(
-        CUICDMSlideHandle inMaster,
-        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const = 0;
-    virtual void GetAssociatedInstances(CUICDMSlideHandle inSlide,
+        Qt3DSDMSlideHandle inMaster,
+        std::vector<std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const = 0;
+    virtual void GetAssociatedInstances(Qt3DSDMSlideHandle inSlide,
                                         TInstanceHandleList &outAssociations) const = 0;
     virtual void LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) = 0;
     virtual void UnlinkProperty(Qt3DSDMInstanceHandle inInstance,
@@ -153,35 +153,35 @@ public:
                                   Qt3DSDMPropertyHandle inProperty) const = 0;
     virtual bool CanPropertyBeLinked(Qt3DSDMInstanceHandle inInstance,
                                      Qt3DSDMPropertyHandle inProperty) const = 0;
-    virtual void GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide,
+    virtual void GetUnionOfProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide,
                                       TInstancePropertyPairList &outProperties) const = 0;
 
     virtual bool GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle inInstance,
                                        Qt3DSDMPropertyHandle inProperty, SValue &outValue) = 0;
 
-    virtual void SetActiveSlide(CUICDMSlideHandle inSlide) = 0;
-    virtual CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
+    virtual void SetActiveSlide(Qt3DSDMSlideHandle inSlide) = 0;
+    virtual Qt3DSDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
                                                  Qt3DSDMPropertyHandle inProperty) const = 0;
 
-    virtual bool SlideValid(CUICDMSlideHandle inSlide) const = 0;
-    virtual int GetSlideIndex(CUICDMSlideHandle inSlide) const = 0;
-    virtual int GetActiveSlideIndex(CUICDMSlideHandle inMaster) const = 0;
-    virtual CUICDMSlideHandle GetActiveSlide(CUICDMSlideHandle inMaster) const = 0;
-    virtual Qt3DSDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const = 0;
-    virtual void SetSlideSelectedInstance(CUICDMSlideHandle inSlide,
+    virtual bool SlideValid(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual int GetSlideIndex(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual int GetActiveSlideIndex(Qt3DSDMSlideHandle inMaster) const = 0;
+    virtual Qt3DSDMSlideHandle GetActiveSlide(Qt3DSDMSlideHandle inMaster) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide) const = 0;
+    virtual void SetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance) = 0;
 
-    virtual CUICDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+    virtual Qt3DSDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
                                                  Qt3DSDMPropertyHandle inProperty) = 0;
 
-    virtual bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual bool GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
     virtual bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
                                                    Qt3DSDMPropertyHandle inProperty,
                                                    SValue &outValue) const = 0;
-    virtual void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    virtual void ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inInstance,
                                                Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) = 0;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
index cb91ba1c..bfb85224 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
@@ -636,7 +636,7 @@ struct WStrOps<CDataModelHandle>
     };
 IMPLEMENT_HANDLE_WSTROPS(Qt3DSDMInstanceHandle);
 IMPLEMENT_HANDLE_WSTROPS(Qt3DSDMPropertyHandle);
-IMPLEMENT_HANDLE_WSTROPS(CUICDMSlideHandle);
+IMPLEMENT_HANDLE_WSTROPS(Qt3DSDMSlideHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMSlideGraphHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMAnimationHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMKeyframeHandle);
diff --git a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
index 2cef5c41..6f20a2da 100644
--- a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
+++ b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
@@ -200,92 +200,92 @@ TSignalItemPtr CreateDataCoreSignaller()
 
 class CSlideCoreSignaller : public ISlideCoreSignalProvider, public ISlideCoreSignalSender
 {
-    boost::signal<void(CUICDMSlideHandle)> m_SlideCreated;
-    boost::signal<void(CUICDMSlideHandle)> m_BeforeSlideDeleted;
-    boost::signal<void(CUICDMSlideHandle)> m_SlideDeleted;
-    boost::signal<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> m_SlideDerived;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
+    boost::signal<void(Qt3DSDMSlideHandle)> m_SlideCreated;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_BeforeSlideDeleted;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_SlideDeleted;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, int)> m_SlideDerived;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
         m_InstancePropertyValueSet;
-    boost::signal<SValue(CUICDMSlideHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+    boost::signal<SValue(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                   const SValue &)>
         m_InstancePropertyValueAdded;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
         m_InstancePropertyValueRemoved;
-    boost::signal<void(CUICDMSlideHandle)> m_SlideTimeChanged;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_SlideTimeChanged;
 
 public:
     virtual TSignalConnectionPtr
-    ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideCreated);
     }
     virtual TSignalConnectionPtr
-    ConnectBeforeSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectBeforeSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_BeforeSlideDeleted);
     }
     virtual TSignalConnectionPtr
-    ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideDeleted);
     }
     TSignalConnectionPtr ConnectSlideDerived(
-        const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, int)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideDerived);
     }
     TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueSet);
     }
     virtual TSignalConnectionPtr ConnectInstancePropertyValueAdded(
-        const std::function<SValue(CUICDMSlideHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<SValue(Qt3DSDMSlideHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                      Qt3DSDMPropertyHandle, const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueAdded);
     }
     TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueRemoved);
     }
     virtual TSignalConnectionPtr
-    ConnectSlideTimeChanged(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectSlideTimeChanged(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideTimeChanged);
     }
 
-    void SendSlideCreated(CUICDMSlideHandle inSlide) override
+    void SendSlideCreated(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideCreated(inSlide);
     }
-    void SendBeforeSlideDeleted(CUICDMSlideHandle inSlide) override
+    void SendBeforeSlideDeleted(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_BeforeSlideDeleted(inSlide);
     }
-    void SendSlideDeleted(CUICDMSlideHandle inSlide) override
+    void SendSlideDeleted(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideDeleted(inSlide);
     }
-    void SendSlideDerived(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
+    void SendSlideDerived(Qt3DSDMSlideHandle inSlide, Qt3DSDMSlideHandle inParent,
                                   int inIndex) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideDerived(inSlide, inParent, inIndex);
     }
-    void SendPropertyValueSet(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void SendPropertyValueSet(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstancePropertyValueSet(inSlide, inInstance, inProperty, inValue);
     }
-    virtual SValue SendPropertyValueAdded(CUICDMSlideHandle inSource, CUICDMSlideHandle inDest,
+    virtual SValue SendPropertyValueAdded(Qt3DSDMSlideHandle inSource, Qt3DSDMSlideHandle inDest,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
@@ -298,13 +298,13 @@ public:
             return m_InstancePropertyValueAdded(inSource, inDest, inInstance, inProperty, inValue);
         return inValue;
     }
-    void SendPropertyValueRemoved(CUICDMSlideHandle inSlide,
+    void SendPropertyValueRemoved(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override
     {
         m_InstancePropertyValueRemoved(inSlide, inInstance, inProperty, inValue);
     }
-    void SendSlideTimeChanged(CUICDMSlideHandle inSlide) override
+    void SendSlideTimeChanged(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideTimeChanged(inSlide);
@@ -319,40 +319,40 @@ TSignalItemPtr CreateSlideCoreSignaller()
 class CSlideGraphCoreSignaller : public ISlideGraphCoreSignalProvider,
                                  public ISlideGraphCoreSignalSender
 {
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphCreated;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphDeleted;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+    boost::signal<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> m_GraphCreated;
+    boost::signal<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> m_GraphDeleted;
+    boost::signal<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
         m_InstanceAssociated;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+    boost::signal<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
         m_InstanceDissociated;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphActiveSlide;
+    boost::signal<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> m_GraphActiveSlide;
     boost::signal<void(CUICDMSlideGraphHandle, float)> m_GraphSeconds;
 
 public:
     TSignalConnectionPtr ConnectGraphCreated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_GraphCreated);
     }
     TSignalConnectionPtr ConnectGraphDeleted(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_GraphDeleted);
     }
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceAssociated);
     }
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceDissociated);
     }
     TSignalConnectionPtr ConnectGraphActiveSlide(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(CUICDMSlideGraphHandle, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_GraphActiveSlide);
     }
@@ -362,29 +362,29 @@ public:
         return CONNECT_SIGNAL(m_GraphSeconds);
     }
 
-    void SendGraphCreated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) override
+    void SendGraphCreated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_GraphCreated(inGraph, inSlide);
     }
-    void SendGraphDeleted(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) override
+    void SendGraphDeleted(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_GraphDeleted(inGraph, inSlide);
     }
-    void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
+    void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide,
                                         Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceAssociated(inGraph, inSlide, inInstance);
     }
-    void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
+    void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide,
                                          Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDissociated(inGraph, inSlide, inInstance);
     }
-    void SendGraphActiveSlide(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) override
+    void SendGraphActiveSlide(CUICDMSlideGraphHandle inGraph, Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_GraphActiveSlide(inGraph, inSlide);
@@ -405,11 +405,11 @@ TSignalItemPtr CreateSlideGraphCoreSignaller()
 class CAnimationCoreSignaller : public IAnimationCoreSignalProvider,
                                 public IAnimationCoreSignalSender
 {
-    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+    boost::signal<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                 Qt3DSDMPropertyHandle, size_t, EAnimationType)>
         m_AnimationCreated;
     boost::signal<void(CUICDMAnimationHandle)> m_BeforeAnimationDeleted;
-    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+    boost::signal<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                 Qt3DSDMPropertyHandle, size_t, EAnimationType)>
         m_AnimationDeleted;
     boost::signal<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)> m_KeyframeInserted;
@@ -421,7 +421,7 @@ class CAnimationCoreSignaller : public IAnimationCoreSignalProvider,
 
 public:
     TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationCreated);
@@ -432,7 +432,7 @@ public:
         return CONNECT_SIGNAL(m_BeforeAnimationDeleted);
     }
     TSignalConnectionPtr ConnectAnimationDeleted(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+        const std::function<void(CUICDMAnimationHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle,
                                    Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationDeleted);
@@ -470,7 +470,7 @@ public:
         return CONNECT_SIGNAL(m_FirstKeyframeDynamic);
     }
 
-    void SendAnimationCreated(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
+    void SendAnimationCreated(CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inSlide,
                                       Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) override
@@ -483,7 +483,7 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_BeforeAnimationDeleted(inAnimation);
     }
-    void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
+    void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, Qt3DSDMSlideHandle inSlide,
                                       Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) override
@@ -639,30 +639,30 @@ TSignalItemPtr CreateActionCoreSignaller()
 
 class CActionSystemSignaller : public IActionSystemSignalProvider, public IActionSystemSignalSender
 {
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionCreated;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionDeleted;
+    boost::signal<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionCreated;
+    boost::signal<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionDeleted;
 
 public:
     TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionCreated);
     }
     TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionDeleted);
     }
 
-    void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    void SendActionCreated(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionCreated(inAction, inSlide, inOwner);
     }
-    void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    void SendActionDeleted(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
@@ -677,158 +677,158 @@ TSignalItemPtr CreateActionSystemSignaller()
 
 class CSlideSystemSignaller : public ISlideSystemSignalProvider, public ISlideSystemSignalSender
 {
-    boost::signal<void(CUICDMSlideHandle)> m_MasterCreated;
-    boost::signal<void(CUICDMSlideHandle)> m_MasterDeleted;
-    boost::signal<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> m_SlideCreated;
-    boost::signal<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> m_SlideDeleted;
-    boost::signal<void(CUICDMSlideHandle, int, int)> m_SlideRearranged;
-    boost::signal<void(CUICDMSlideHandle, float)> m_ComponentSeconds;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_InstanceAssociated;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_InstanceDissociated;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyLinked;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyUnlinked;
-    boost::signal<void(CUICDMSlideHandle, int, CUICDMSlideHandle, CUICDMSlideHandle)> m_ActiveSlide;
-
-    boost::signal<SValue(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
+    boost::signal<void(Qt3DSDMSlideHandle)> m_MasterCreated;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_MasterDeleted;
+    boost::signal<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> m_SlideCreated;
+    boost::signal<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> m_SlideDeleted;
+    boost::signal<void(Qt3DSDMSlideHandle, int, int)> m_SlideRearranged;
+    boost::signal<void(Qt3DSDMSlideHandle, float)> m_ComponentSeconds;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_InstanceAssociated;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_InstanceDissociated;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyLinked;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyUnlinked;
+    boost::signal<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle, Qt3DSDMSlideHandle)> m_ActiveSlide;
+
+    boost::signal<SValue(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
         m_ValueCreated;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
         m_ValueDestroyed;
 
 public:
     virtual TSignalConnectionPtr
-    ConnectMasterCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectMasterCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_MasterCreated);
     }
     virtual TSignalConnectionPtr
-    ConnectMasterDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectMasterDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_MasterDeleted);
     }
     TSignalConnectionPtr ConnectSlideCreated(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideCreated);
     }
     TSignalConnectionPtr ConnectSlideDeleted(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideDeleted);
     }
     virtual TSignalConnectionPtr
-    ConnectSlideRearranged(const std::function<void(CUICDMSlideHandle, int, int)> &inCallback) override
+    ConnectSlideRearranged(const std::function<void(Qt3DSDMSlideHandle, int, int)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideRearranged);
     }
     virtual TSignalConnectionPtr
-    ConnectComponentSeconds(const std::function<void(CUICDMSlideHandle, float)> &inCallback)
+    ConnectComponentSeconds(const std::function<void(Qt3DSDMSlideHandle, float)> &inCallback)
     {
         return CONNECT_SIGNAL(m_ComponentSeconds);
     }
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceAssociated);
     }
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceDissociated);
     }
     TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyLinked);
     }
     TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyUnlinked);
     }
     TSignalConnectionPtr ConnectActiveSlide(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle, CUICDMSlideHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle, Qt3DSDMSlideHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActiveSlide);
     }
     virtual TSignalConnectionPtr ConnectPropertyValueCreated(
-        const std::function<SValue(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<SValue(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                      const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_ValueCreated);
     }
     virtual TSignalConnectionPtr ConnectPropertyValueDestroyed(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_ValueDestroyed);
     }
 
-    void SendMasterCreated(CUICDMSlideHandle inMaster) override
+    void SendMasterCreated(Qt3DSDMSlideHandle inMaster) override
     {
         CHECK_SIGNALS_ENABLED();
         m_MasterCreated(inMaster);
     }
-    void SendMasterDeleted(CUICDMSlideHandle inMaster) override
+    void SendMasterDeleted(Qt3DSDMSlideHandle inMaster) override
     {
         CHECK_SIGNALS_ENABLED();
         m_MasterDeleted(inMaster);
     }
-    void SendSlideCreated(CUICDMSlideHandle inMaster, int inIndex,
-                                  CUICDMSlideHandle inSlide) override
+    void SendSlideCreated(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                  Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideCreated(inMaster, inIndex, inSlide);
     }
-    void SendSlideDeleted(CUICDMSlideHandle inMaster, int inIndex,
-                                  CUICDMSlideHandle inSlide) override
+    void SendSlideDeleted(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                  Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideDeleted(inMaster, inIndex, inSlide);
     }
-    void SendSlideRearranged(CUICDMSlideHandle inMaster, int inOldIndex, int inNewIndex) override
+    void SendSlideRearranged(Qt3DSDMSlideHandle inMaster, int inOldIndex, int inNewIndex) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideRearranged(inMaster, inOldIndex, inNewIndex);
     }
-    virtual void SendComponentSeconds(CUICDMSlideHandle inMaster, float inSeconds)
+    virtual void SendComponentSeconds(Qt3DSDMSlideHandle inMaster, float inSeconds)
     {
         CHECK_SIGNALS_ENABLED();
         m_ComponentSeconds(inMaster, inSeconds);
     }
-    void SendInstanceAssociated(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance) override
+    void SendInstanceAssociated(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceAssociated(inMaster, inInstance);
     }
-    void SendInstanceDissociated(CUICDMSlideHandle inMaster,
+    void SendInstanceDissociated(Qt3DSDMSlideHandle inMaster,
                                          Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDissociated(inMaster, inInstance);
     }
-    void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    void SendPropertyLinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                     Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyLinked(inMaster, inInstance, inProperty);
     }
-    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    void SendPropertyUnlinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyUnlinked(inMaster, inInstance, inProperty);
     }
-    void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex,
-                                 CUICDMSlideHandle inOldSlide, CUICDMSlideHandle inNewSlide) override
+    void SendActiveSlide(Qt3DSDMSlideHandle inMaster, int inIndex,
+                                 Qt3DSDMSlideHandle inOldSlide, Qt3DSDMSlideHandle inNewSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActiveSlide(inMaster, inIndex, inOldSlide, inNewSlide);
     }
 
-    virtual SValue SendPropertyValueCreated(CUICDMSlideHandle inSlide,
+    virtual SValue SendPropertyValueCreated(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance,
                                             Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
@@ -837,7 +837,7 @@ public:
             return m_ValueCreated(inSlide, inInstance, inProperty, inValue);
         return inValue;
     }
-    virtual void SendPropertyValueDestroyed(CUICDMSlideHandle inSlide,
+    virtual void SendPropertyValueDestroyed(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance,
                                             Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
@@ -1022,14 +1022,14 @@ class CStudioFullSystemSignaller : public IStudioFullSystemSignalProvider,
     boost::signal<void()> m_ChangeSetEnd;
     boost::signal<void()> m_AnimationBegin;
     boost::signal<void()> m_AnimationEnd;
-    boost::signal<void(CUICDMSlideHandle)> m_SlideCreated;
-    boost::signal<void(CUICDMSlideHandle)> m_SlideDeleted;
-    boost::signal<void(CUICDMSlideHandle, int, int)> m_SlideRearranged;
-    boost::signal<void(CUICDMSlideHandle)> m_ComponentSeconds;
-    boost::signal<void(CUICDMSlideHandle)> m_BeginComponentSeconds;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyLinked;
-    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyUnlinked;
-    boost::signal<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> m_ActiveSlide;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_SlideCreated;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_SlideDeleted;
+    boost::signal<void(Qt3DSDMSlideHandle, int, int)> m_SlideRearranged;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_ComponentSeconds;
+    boost::signal<void(Qt3DSDMSlideHandle)> m_BeginComponentSeconds;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyLinked;
+    boost::signal<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_PropertyUnlinked;
+    boost::signal<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> m_ActiveSlide;
     boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceCreated;
     boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceDeleted;
     boost::signal<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
@@ -1041,8 +1041,8 @@ class CStudioFullSystemSignaller : public IStudioFullSystemSignalProvider,
     boost::signal<void(CUICDMKeyframeHandle)> m_KeyframeUpdated;
     boost::signal<void(CUICDMAnimationHandle, bool)> m_ConnectFirstKeyframeDynamicSet;
     boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> m_InstancePropertyValue;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionCreated;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionDeleted;
+    boost::signal<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionCreated;
+    boost::signal<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionDeleted;
     boost::signal<void(CUICDMActionHandle)> m_TriggerObjectSet;
     boost::signal<void(CUICDMActionHandle)> m_TargetObjectSet;
     boost::signal<void(CUICDMActionHandle)> m_EventHandleSet;
@@ -1090,44 +1090,44 @@ public:
     }
 
     virtual TSignalConnectionPtr
-    ConnectSlideCreated(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectSlideCreated(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideCreated);
     }
     virtual TSignalConnectionPtr
-    ConnectSlideDeleted(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectSlideDeleted(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideDeleted);
     }
     virtual TSignalConnectionPtr
-    ConnectSlideRearranged(const std::function<void(CUICDMSlideHandle, int, int)> &inCallback) override
+    ConnectSlideRearranged(const std::function<void(Qt3DSDMSlideHandle, int, int)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_SlideRearranged);
     }
     virtual TSignalConnectionPtr
-    ConnectBeginComponentSeconds(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectBeginComponentSeconds(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_BeginComponentSeconds);
     }
     virtual TSignalConnectionPtr
-    ConnectComponentSeconds(const std::function<void(CUICDMSlideHandle)> &inCallback) override
+    ConnectComponentSeconds(const std::function<void(Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_ComponentSeconds);
     }
     TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyLinked);
     }
     TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
+        const std::function<void(Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyUnlinked);
     }
     TSignalConnectionPtr ConnectActiveSlide(
-        const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMSlideHandle, int, Qt3DSDMSlideHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActiveSlide);
     }
@@ -1182,13 +1182,13 @@ public:
     }
 
     TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionCreated);
     }
     TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionDeleted);
@@ -1307,44 +1307,44 @@ public:
         m_AnimationEnd();
     }
 
-    void SendSlideCreated(CUICDMSlideHandle inSlide) override
+    void SendSlideCreated(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideCreated(inSlide);
     }
-    void SendSlideDeleted(CUICDMSlideHandle inSlide) override
+    void SendSlideDeleted(Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideDeleted(inSlide);
     }
-    void SendSlideRearranged(CUICDMSlideHandle inMaster, int inOldIndex, int inNewIndex) override
+    void SendSlideRearranged(Qt3DSDMSlideHandle inMaster, int inOldIndex, int inNewIndex) override
     {
         CHECK_SIGNALS_ENABLED();
         m_SlideRearranged(inMaster, inOldIndex, inNewIndex);
     }
-    void SendBeginComponentSeconds(CUICDMSlideHandle inMaster) override
+    void SendBeginComponentSeconds(Qt3DSDMSlideHandle inMaster) override
     {
         CHECK_SIGNALS_ENABLED();
         m_BeginComponentSeconds(inMaster);
     }
-    void SendComponentSeconds(CUICDMSlideHandle inMaster) override
+    void SendComponentSeconds(Qt3DSDMSlideHandle inMaster) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ComponentSeconds(inMaster);
     }
-    void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    void SendPropertyLinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                     Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyLinked(inMaster, inInstance, inProperty);
     }
-    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+    void SendPropertyUnlinked(Qt3DSDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyUnlinked(inMaster, inInstance, inProperty);
     }
-    void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex, CUICDMSlideHandle inSlide) override
+    void SendActiveSlide(Qt3DSDMSlideHandle inMaster, int inIndex, Qt3DSDMSlideHandle inSlide) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActiveSlide(inMaster, inIndex, inSlide);
@@ -1406,13 +1406,13 @@ public:
         m_InstancePropertyValue(inInstance, inProperty);
     }
 
-    void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    void SendActionCreated(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionCreated(inAction, inSlide, inOwner);
     }
-    void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
+    void SendActionDeleted(CUICDMActionHandle inAction, Qt3DSDMSlideHandle inSlide,
                                    Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
diff --git a/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp b/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp
index af1d55f1..edd4c674 100644
--- a/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/SlideSystem.cpp
@@ -55,11 +55,11 @@ void SSlideSystem::SetPropertySystem(TPropertySystemPtr inPropertySystem)
     m_PropertySystem = inPropertySystem;
 }
 
-CUICDMSlideHandle SSlideSystem::CreateMasterSlide()
+Qt3DSDMSlideHandle SSlideSystem::CreateMasterSlide()
 {
     Qt3DSDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theSlideInstance, m_SlideInstance);
-    CUICDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
+    Qt3DSDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
     m_SlideGraphCore->CreateSlideGraph(retval);
     GetSignalSender()->SendMasterCreated(retval);
     return retval;
@@ -73,7 +73,7 @@ inline bool PropertyHandlePairEquals(const TPropertyHandlePropertyInfoPair &inPa
 
 void AddReferencedInstance(const TSlideEntry &inEntry,
                            const TPropertyHandlePropertyInfoPairList &inInfoPairList,
-                           CUICDMSlideHandle inSourceSlide, CUICDMSlideHandle inDestSlide,
+                           Qt3DSDMSlideHandle inSourceSlide, Qt3DSDMSlideHandle inDestSlide,
                            TInstanceHandleList &outInstances, TSlideEntryList &outReferencedEntries)
 {
     TPropertyHandlePropertyInfoPairList::const_iterator theFind =
@@ -95,7 +95,7 @@ void AddReferencedInstance(const TSlideEntry &inEntry,
     }
 }
 
-void CopySpecificAnimation(CUICDMSlideHandle inMaster, CUICDMSlideHandle inTarget,
+void CopySpecificAnimation(Qt3DSDMSlideHandle inMaster, Qt3DSDMSlideHandle inTarget,
                            TInstancePropertyPair inPropertyPair, TAnimationCorePtr inAnimationCore,
                            size_t inIndex)
 {
@@ -106,7 +106,7 @@ void CopySpecificAnimation(CUICDMSlideHandle inMaster, CUICDMSlideHandle inTarge
                       inPropertyPair.second, inIndex);
 }
 
-void CopyAnimationIfExist(CUICDMSlideHandle inMaster, CUICDMSlideHandle inTarget,
+void CopyAnimationIfExist(Qt3DSDMSlideHandle inMaster, Qt3DSDMSlideHandle inTarget,
                           TInstancePropertyPair inPropertyPair, TPropertySystemPtr inPropertySystem,
                           TAnimationCorePtr inAnimationCore)
 {
@@ -121,7 +121,7 @@ void CopyAnimationIfExist(CUICDMSlideHandle inMaster, CUICDMSlideHandle inTarget
 void SetEntryValueIfNotReferenced(const TSlideEntry &inEntry,
                                   const TInstanceHandleList &inReferencedInstances,
                                   const TSlideEntryList &inReferencedEntries,
-                                  CUICDMSlideHandle inSource, CUICDMSlideHandle inDestSlide,
+                                  Qt3DSDMSlideHandle inSource, Qt3DSDMSlideHandle inDestSlide,
                                   TPropertySystemPtr inPropertySystem, TSlideCorePtr inDestCore,
                                   TAnimationCorePtr inAnimationCore)
 {
@@ -143,17 +143,17 @@ void SetEntryValueIfNotReferenced(const TSlideEntry &inEntry,
                          inPropertySystem, inAnimationCore);
 }
 
-CUICDMSlideHandle SSlideSystem::CreateSlide(CUICDMSlideHandle inMaster, int inIndex)
+Qt3DSDMSlideHandle SSlideSystem::CreateSlide(Qt3DSDMSlideHandle inMaster, int inIndex)
 {
     return DuplicateSlide(inMaster, inIndex);
 }
 
-CUICDMSlideHandle SSlideSystem::DuplicateSlide(CUICDMSlideHandle inSourceSlide, int inIndex)
+Qt3DSDMSlideHandle SSlideSystem::DuplicateSlide(Qt3DSDMSlideHandle inSourceSlide, int inIndex)
 {
-    CUICDMSlideHandle theMaster = GetMasterSlide(inSourceSlide);
+    Qt3DSDMSlideHandle theMaster = GetMasterSlide(inSourceSlide);
     Qt3DSDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theSlideInstance, m_SlideInstance);
-    CUICDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
+    Qt3DSDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
 
     TSlideHandleList theChildren;
     m_SlideCore->GetChildSlides(theMaster, theChildren);
@@ -193,10 +193,10 @@ CUICDMSlideHandle SSlideSystem::DuplicateSlide(CUICDMSlideHandle inSourceSlide,
     return retval;
 }
 
-CUICDMSlideHandle SSlideSystem::GetMasterSlide(CUICDMSlideHandle inSlide) const
+Qt3DSDMSlideHandle SSlideSystem::GetMasterSlide(Qt3DSDMSlideHandle inSlide) const
 {
     if (inSlide.Valid() && m_SlideCore->IsSlide(inSlide)) {
-        CUICDMSlideHandle theParent = m_SlideCore->GetParentSlide(inSlide);
+        Qt3DSDMSlideHandle theParent = m_SlideCore->GetParentSlide(inSlide);
         if (theParent.Valid())
             return theParent;
         return inSlide;
@@ -204,9 +204,9 @@ CUICDMSlideHandle SSlideSystem::GetMasterSlide(CUICDMSlideHandle inSlide) const
     return 0;
 }
 
-bool SSlideSystem::IsMasterSlide(CUICDMSlideHandle inSlide) const
+bool SSlideSystem::IsMasterSlide(Qt3DSDMSlideHandle inSlide) const
 {
-    CUICDMSlideHandle theParent = m_SlideCore->GetParentSlide(inSlide);
+    Qt3DSDMSlideHandle theParent = m_SlideCore->GetParentSlide(inSlide);
     if (!theParent.Valid())
         return true;
     else
@@ -217,7 +217,7 @@ inline bool GraphGuidMatches(CUICDMSlideGraphHandle inGraph, TSlideGraphCorePtr
                              TSlideCorePtr inSlideCore, TDataCorePtr inDataCore,
                              Qt3DSDMPropertyHandle inProperty, SValue inValue)
 {
-    CUICDMSlideHandle theMaster = inSlideGraph->GetGraphRoot(inGraph);
+    Qt3DSDMSlideHandle theMaster = inSlideGraph->GetGraphRoot(inGraph);
     Qt3DSDMInstanceHandle theInstance = inSlideCore->GetSlideInstance(theMaster);
     SValue theValue;
     if (inDataCore->GetInstancePropertyValue(theInstance, inProperty, theValue)
@@ -226,7 +226,7 @@ inline bool GraphGuidMatches(CUICDMSlideGraphHandle inGraph, TSlideGraphCorePtr
     return false;
 }
 
-CUICDMSlideHandle SSlideSystem::GetMasterSlideByComponentGuid(SLong4 inGuid) const
+Qt3DSDMSlideHandle SSlideSystem::GetMasterSlideByComponentGuid(SLong4 inGuid) const
 {
     TSlideGraphHandleList theGraphs;
     m_SlideGraphCore->GetSlideGraphs(theGraphs);
@@ -255,7 +255,7 @@ void InsertIfReferencedProperty(const TSlideEntry &inEntry,
 
 void SSlideSystem::InsertEntryAndPropertyInstance(const TSlideEntry &inEntry,
                                                   TInstanceHandleList &inInstances,
-                                                  CUICDMSlideHandle inSlide)
+                                                  Qt3DSDMSlideHandle inSlide)
 {
     Qt3DSDMInstanceHandle theEntryInstance = get<0>(inEntry);
     if (find(inInstances.begin(), inInstances.end(), theEntryInstance) == inInstances.end()) {
@@ -290,7 +290,7 @@ void SSlideSystem::InsertEntryAndPropertyInstance(const TSlideEntry &inEntry,
 // Delete the referenced instances of this slide
 // This function is very similar to GetReferencedInstances
 // You change one function, you need to change the other function
-void SSlideSystem::DeleteReferencedInstances(CUICDMSlideHandle inSlide)
+void SSlideSystem::DeleteReferencedInstances(Qt3DSDMSlideHandle inSlide)
 {
     // Recursively delete the children of this slide
     // Usually the slide has children if it is a Master slide (for example when deleting a
@@ -329,7 +329,7 @@ void SSlideSystem::DeleteReferencedInstances(CUICDMSlideHandle inSlide)
 // Get the referenced instances of this slide
 // This function is very similar to DeleteReferencedInstances
 // You change one function, you need to change the other function
-void SSlideSystem::GetReferencedInstances(CUICDMSlideHandle inSlide,
+void SSlideSystem::GetReferencedInstances(Qt3DSDMSlideHandle inSlide,
                                           TInstanceHandleList &outReferencedInstances)
 {
     // Recursively get the children of this slide
@@ -360,9 +360,9 @@ void SSlideSystem::GetReferencedInstances(CUICDMSlideHandle inSlide,
                                  std::ref(outReferencedInstances), inSlide));
 }
 
-void SSlideSystem::DeleteSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex)
+void SSlideSystem::DeleteSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex)
 {
-    CUICDMSlideHandle theChild = GetSlideByIndex(inMaster, inIndex);
+    Qt3DSDMSlideHandle theChild = GetSlideByIndex(inMaster, inIndex);
     TInstanceHandleList theInstances;
     if (theChild.Valid()) {
         DeleteReferencedInstances(theChild);
@@ -376,17 +376,17 @@ void SSlideSystem::DeleteSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex
         GetSignalSender()->SendSlideDeleted(inMaster, (int)inIndex, theChild);
 }
 
-void SSlideSystem::GetSlideReferencedInstances(CUICDMSlideHandle inMaster, size_t inIndex,
+void SSlideSystem::GetSlideReferencedInstances(Qt3DSDMSlideHandle inMaster, size_t inIndex,
                                                TInstanceHandleList &outReferencedInstances)
 {
     outReferencedInstances.clear();
-    CUICDMSlideHandle theChild = GetSlideByIndex(inMaster, inIndex);
+    Qt3DSDMSlideHandle theChild = GetSlideByIndex(inMaster, inIndex);
     if (theChild.Valid()) {
         GetReferencedInstances(theChild, outReferencedInstances);
     }
 }
 
-CUICDMSlideHandle SSlideSystem::GetSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex) const
+Qt3DSDMSlideHandle SSlideSystem::GetSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex) const
 {
     if (inIndex == 0)
         return inMaster;
@@ -395,51 +395,51 @@ CUICDMSlideHandle SSlideSystem::GetSlideByIndex(CUICDMSlideHandle inMaster, size
     m_SlideCore->GetChildSlides(inMaster, theChildren);
     if (inIndex < theChildren.size())
         return theChildren[inIndex];
-    return CUICDMSlideHandle();
+    return Qt3DSDMSlideHandle();
 }
 
-void SSlideSystem::SetActiveSlide(CUICDMSlideHandle inMaster, size_t inIndex)
+void SSlideSystem::SetActiveSlide(Qt3DSDMSlideHandle inMaster, size_t inIndex)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(inMaster);
-    CUICDMSlideHandle theActiveSlide = inMaster;
+    Qt3DSDMSlideHandle theActiveSlide = inMaster;
     if (inIndex > 0)
         theActiveSlide = GetSlideByIndex(inMaster, inIndex);
-    CUICDMSlideHandle theOldSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
+    Qt3DSDMSlideHandle theOldSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
     m_SlideGraphCore->SetGraphActiveSlide(theGraph, theActiveSlide);
     GetSignalSender()->SendActiveSlide(inMaster, (int)inIndex, theOldSlide, theActiveSlide);
 }
 
-size_t SSlideSystem::GetSlideCount(CUICDMSlideHandle inMaster) const
+size_t SSlideSystem::GetSlideCount(Qt3DSDMSlideHandle inMaster) const
 {
     TSlideHandleList theChildren;
     m_SlideCore->GetChildSlides(inMaster, theChildren);
     return 1 + theChildren.size();
 }
 
-void SSlideSystem::RearrangeSlide(CUICDMSlideHandle inMaster, size_t inOldIndex, size_t inNewIndex)
+void SSlideSystem::RearrangeSlide(Qt3DSDMSlideHandle inMaster, size_t inOldIndex, size_t inNewIndex)
 {
     if (inOldIndex == 0)
         throw RearrangeSlideArgumentsMustNotBeZero(L"");
     TSlideHandleList theChildren;
     m_SlideCore->GetChildSlides(inMaster, theChildren);
-    CUICDMSlideHandle theChild = theChildren.at(inOldIndex - 1);
+    Qt3DSDMSlideHandle theChild = theChildren.at(inOldIndex - 1);
     m_SlideCore->DeriveSlide(theChild, inMaster, (int)inNewIndex - 1);
     GetSignalSender()->SendSlideRearranged(inMaster, (int)inOldIndex, (int)inNewIndex);
 }
 
-void SSlideSystem::SetComponentSeconds(CUICDMSlideHandle inSlide, float inSeconds)
+void SSlideSystem::SetComponentSeconds(Qt3DSDMSlideHandle inSlide, float inSeconds)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(GetMasterSlide(inSlide));
     m_SlideCore->SetSlideTime(m_SlideGraphCore->GetGraphActiveSlide(theGraph), inSeconds);
 }
 
-float SSlideSystem::GetComponentSeconds(CUICDMSlideHandle inSlide) const
+float SSlideSystem::GetComponentSeconds(Qt3DSDMSlideHandle inSlide) const
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(GetMasterSlide(inSlide));
     return m_SlideCore->GetSlideTime(m_SlideGraphCore->GetGraphActiveSlide(theGraph));
 }
 
-long SSlideSystem::GetComponentSecondsLong(CUICDMSlideHandle inSlide) const
+long SSlideSystem::GetComponentSecondsLong(Qt3DSDMSlideHandle inSlide) const
 {
     float seconds(GetComponentSeconds(inSlide));
     return static_cast<long>((seconds * 1000) + .5f);
@@ -456,11 +456,11 @@ SInstanceSlideInformation
 SSlideSystem::GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
-    CUICDMSlideHandle theAssociatedSlide(theGraphSlidePair.second);
+    Qt3DSDMSlideHandle theAssociatedSlide(theGraphSlidePair.second);
     if (theAssociatedSlide.Valid() == false)
         return SInstanceSlideInformation();
-    CUICDMSlideHandle theMasterSlide(GetMasterSlide(theGraphSlidePair.second));
-    CUICDMSlideHandle theActiveSlide(
+    Qt3DSDMSlideHandle theMasterSlide(GetMasterSlide(theGraphSlidePair.second));
+    Qt3DSDMSlideHandle theActiveSlide(
         m_SlideGraphCore->GetGraphActiveSlide(theGraphSlidePair.first));
     float seconds = m_SlideCore->GetSlideTime(theActiveSlide);
     long theMilliseconds = static_cast<long>((seconds * 1000) + .5f);
@@ -472,14 +472,14 @@ SSlideSystem::GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance) cons
  * Use the instance for storing information such as name, or the GUID of the object
  * this slide links to.
  */
-Qt3DSDMInstanceHandle SSlideSystem::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle SSlideSystem::GetSlideInstance(Qt3DSDMSlideHandle inSlide) const
 {
     return m_SlideCore->GetSlideInstance(inSlide);
 }
 /**
  *	Reverse lookup into the slide system so you can match slides to instances.
  */
-CUICDMSlideHandle SSlideSystem::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
+Qt3DSDMSlideHandle SSlideSystem::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
 {
     return m_SlideCore->GetSlideByInstance(inSlide);
 }
@@ -487,7 +487,7 @@ CUICDMSlideHandle SSlideSystem::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide
 /**
  *	Slide may be either a master slide
  */
-void SSlideSystem::AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
+void SSlideSystem::AssociateInstanceWithSlide(Qt3DSDMSlideHandle inSlide,
                                               Qt3DSDMInstanceHandle inInstance)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(GetMasterSlide(inSlide));
@@ -495,7 +495,7 @@ void SSlideSystem::AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
     GetSignalSender()->SendInstanceAssociated(inSlide, inInstance);
 }
 
-CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const
+Qt3DSDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const
 {
     return m_SlideGraphCore->GetAssociatedGraph(inInstance).second;
 }
@@ -505,7 +505,7 @@ CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInsta
  *slides for this component/scene
  *	TODO rename this to make it more clear
  */
-void SSlideSystem::GetAssociatedInstances(CUICDMSlideHandle inMaster,
+void SSlideSystem::GetAssociatedInstances(Qt3DSDMSlideHandle inMaster,
                                           TSlideInstancePairList &outAssociations) const
 {
     m_SlideGraphCore->GetAssociatedInstances(
@@ -515,10 +515,10 @@ void SSlideSystem::GetAssociatedInstances(CUICDMSlideHandle inMaster,
 /**
  *	Gets all the instances in this slide
  */
-void SSlideSystem::GetAssociatedInstances(CUICDMSlideHandle inSlide,
+void SSlideSystem::GetAssociatedInstances(Qt3DSDMSlideHandle inSlide,
                                           TInstanceHandleList &outAssociations) const
 {
-    CUICDMSlideHandle theMasterSlide = GetMasterSlide(inSlide);
+    Qt3DSDMSlideHandle theMasterSlide = GetMasterSlide(inSlide);
     TSlideInstancePairList theGraphInstances;
     m_SlideGraphCore->GetAssociatedInstances(m_SlideGraphCore->GetSlideGraph(theMasterSlide),
                                              theGraphInstances);
@@ -531,7 +531,7 @@ void SSlideSystem::GetAssociatedInstances(CUICDMSlideHandle inSlide,
     }
 }
 
-void DeleteInstanceIfExistsAsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void DeleteInstanceIfExistsAsProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                       Qt3DSDMPropertyHandle inProperty, TSlideCorePtr inSlideCore,
                                       TPropertyInstanceInfoPtr inPropertyInfoPtr,
                                       TDataCorePtr inDataCore)
@@ -547,7 +547,7 @@ void DeleteInstanceIfExistsAsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstance
 void SSlideSystem::LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetAssociatedGraph(inInstance).first;
-    CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
+    Qt3DSDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
     TPropertyHandlePropertyInfoPairList::const_iterator theFind =
         find_if<TPropertyHandlePropertyInfoPairList::const_iterator>(
             m_PropertyInfoPairList, std::bind(PropertyHandlePairEquals,
@@ -562,7 +562,7 @@ void SSlideSystem::LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropert
     GetSignalSender()->SendPropertyLinked(theSlide, inInstance, inProperty);
 }
 
-void ClearPropertyValueIfLinked(CUICDMSlideHandle inMaster, const TSlideHandleList &inChildren,
+void ClearPropertyValueIfLinked(Qt3DSDMSlideHandle inMaster, const TSlideHandleList &inChildren,
                                 Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                 TSlideCorePtr inSlideCore)
 {
@@ -575,7 +575,7 @@ void ClearPropertyValueIfLinked(CUICDMSlideHandle inMaster, const TSlideHandleLi
                                                  inProperty); // get it off non-master slides
 }
 
-void SetReferencedEntryValue(CUICDMSlideHandle inMaster, CUICDMSlideHandle inDestSlide,
+void SetReferencedEntryValue(Qt3DSDMSlideHandle inMaster, Qt3DSDMSlideHandle inDestSlide,
                              TPropertyInstanceInfoPtr inInfo, Qt3DSDMInstanceHandle inInstance,
                              Qt3DSDMPropertyHandle inProperty,
                              Qt3DSDMInstanceHandle inReferencedInstance, TSlideCorePtr inSlideCore)
@@ -588,7 +588,7 @@ void SetReferencedEntryValue(CUICDMSlideHandle inMaster, CUICDMSlideHandle inDes
 void SSlideSystem::UnlinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetAssociatedGraph(inInstance).first;
-    CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
+    Qt3DSDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
     SValue theValue;
     SValue theTempValue;
     if (!m_SlideCore->GetInstancePropertyValue(theSlide, inInstance, inProperty, theValue)) {
@@ -643,7 +643,7 @@ bool SSlideSystem::IsPropertyLinked(Qt3DSDMInstanceHandle inInstance,
     if (!theGraph.Valid())
         return false;
 
-    CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
+    Qt3DSDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
     if (theGraphSlidePair.second != theSlide)
         return false;
 
@@ -676,7 +676,7 @@ bool SSlideSystem::GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle i
     CUICDMSlideGraphHandle theGraph = theGraphSlidePair.first;
     if (!theGraph.Valid())
         return false;
-    CUICDMSlideHandle theSlide = GetSlideByIndex(m_SlideGraphCore->GetGraphRoot(theGraph), inSlide);
+    Qt3DSDMSlideHandle theSlide = GetSlideByIndex(m_SlideGraphCore->GetGraphRoot(theGraph), inSlide);
     if (!theSlide.Valid())
         return false;
     return m_SlideCore->GetSpecificInstancePropertyValue(theSlide, inInstance, inProperty,
@@ -696,7 +696,7 @@ void AddEntriesToHash(const TSlideEntryList &theSlideEntries, TSlideEntryHash &t
     }
 }
 
-void SSlideSystem::GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
+void SSlideSystem::GetUnionOfProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide2,
                                         TInstancePropertyPairList &outProperties) const
 {
     TSlideEntryHash theEntryHash;
@@ -711,21 +711,21 @@ void SSlideSystem::GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideH
     }
 }
 
-void SSlideSystem::SetActiveSlide(CUICDMSlideHandle inSlide)
+void SSlideSystem::SetActiveSlide(Qt3DSDMSlideHandle inSlide)
 {
-    CUICDMSlideHandle theMaster = GetMasterSlide(inSlide);
+    Qt3DSDMSlideHandle theMaster = GetMasterSlide(inSlide);
     int theIndex = GetSlideIndex(inSlide);
     SetActiveSlide(theMaster, theIndex);
 }
 
-CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
+Qt3DSDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
                                                    Qt3DSDMPropertyHandle inProperty) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     CUICDMSlideGraphHandle theGraph = theGraphSlidePair.first;
     if (!theGraph.Valid())
         return 0;
-    CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
+    Qt3DSDMSlideHandle theSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
     if (theSlide.Valid()) {
         if (m_SlideCore->ContainsProperty(theSlide, inInstance, inProperty))
             return theSlide;
@@ -737,35 +737,35 @@ CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInsta
     return 0;
 }
 
-bool SSlideSystem::SlideValid(CUICDMSlideHandle inSlide) const
+bool SSlideSystem::SlideValid(Qt3DSDMSlideHandle inSlide) const
 {
     return m_SlideCore->HandleValid(inSlide);
 }
 
-int SSlideSystem::GetSlideIndex(CUICDMSlideHandle inSlide) const
+int SSlideSystem::GetSlideIndex(Qt3DSDMSlideHandle inSlide) const
 {
-    CUICDMSlideHandle theMaster = GetMasterSlide(inSlide);
+    Qt3DSDMSlideHandle theMaster = GetMasterSlide(inSlide);
     if (inSlide.Valid() && inSlide != theMaster)
         return m_SlideCore->GetChildIndex(theMaster, inSlide) + 1;
     return 0;
 }
 
-int SSlideSystem::GetActiveSlideIndex(CUICDMSlideHandle inMaster) const
+int SSlideSystem::GetActiveSlideIndex(Qt3DSDMSlideHandle inMaster) const
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(inMaster);
-    CUICDMSlideHandle theActiveSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
+    Qt3DSDMSlideHandle theActiveSlide = m_SlideGraphCore->GetGraphActiveSlide(theGraph);
     if (theActiveSlide == inMaster)
         return 0;
     return GetSlideIndex(theActiveSlide);
 }
 
-CUICDMSlideHandle SSlideSystem::GetActiveSlide(CUICDMSlideHandle inMaster) const
+Qt3DSDMSlideHandle SSlideSystem::GetActiveSlide(Qt3DSDMSlideHandle inMaster) const
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(inMaster);
     return m_SlideGraphCore->GetGraphActiveSlide(theGraph);
 }
 
-Qt3DSDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide) const
 {
     TIntIntMap::const_iterator theIter = m_SlideSelectedInstances.find(inSlide);
     if (theIter != m_SlideSelectedInstances.end() && m_DataCore->IsInstance(theIter->second))
@@ -773,7 +773,7 @@ Qt3DSDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(CUICDMSlideHandle i
     return 0;
 }
 
-void SSlideSystem::SetSlideSelectedInstance(CUICDMSlideHandle inSlide,
+void SSlideSystem::SetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance)
 {
     m_SlideSelectedInstances[inSlide] = inInstance;
@@ -795,25 +795,25 @@ ISlideSystemSignalSender *SSlideSystem::GetSignalSender()
     return dynamic_cast<ISlideSystemSignalSender *>(m_Signaller.get());
 }
 
-qt3dsdm::CUICDMSlideHandle SSlideSystem::GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+qt3dsdm::Qt3DSDMSlideHandle SSlideSystem::GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
                                                           Qt3DSDMPropertyHandle inProperty)
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inHandle);
     if (!theGraphSlidePair.first.Valid())
-        return CUICDMSlideHandle();
+        return Qt3DSDMSlideHandle();
 
-    CUICDMSlideHandle theMaster = m_SlideGraphCore->GetGraphRoot(theGraphSlidePair.first);
+    Qt3DSDMSlideHandle theMaster = m_SlideGraphCore->GetGraphRoot(theGraphSlidePair.first);
     if (theGraphSlidePair.second != theMaster)
         return theGraphSlidePair.second;
 
-    CUICDMSlideHandle theActive = m_SlideGraphCore->GetGraphActiveSlide(theGraphSlidePair.first);
+    Qt3DSDMSlideHandle theActive = m_SlideGraphCore->GetGraphActiveSlide(theGraphSlidePair.first);
     if (m_SlideCore->ContainsProperty(theActive, inHandle, inProperty))
         return theActive;
 
     return theMaster;
 }
 
-bool SSlideSystem::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool SSlideSystem::GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance,
                                             Qt3DSDMPropertyHandle inProperty, SValue &outValue) const
 {
@@ -844,7 +844,7 @@ bool SSlideSystem::GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inIns
     return false;
 }
 
-void SSlideSystem::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+void SSlideSystem::ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                  Qt3DSDMInstanceHandle inInstance,
                                                  Qt3DSDMPropertyHandle inProperty,
                                                  const SValue &inValue)
diff --git a/src/Authoring/QT3DSDM/Systems/SlideSystem.h b/src/Authoring/QT3DSDM/Systems/SlideSystem.h
index a6ad8d8e..88d09dee 100644
--- a/src/Authoring/QT3DSDM/Systems/SlideSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/SlideSystem.h
@@ -75,24 +75,24 @@ struct SSlideSystem : public ISlideSystem
 
     void SetPropertySystem(TPropertySystemPtr inPropertySystem);
 
-    CUICDMSlideHandle CreateMasterSlide() override;
-    CUICDMSlideHandle CreateSlide(CUICDMSlideHandle inMaster, int inIndex = -1) override;
-    CUICDMSlideHandle DuplicateSlide(CUICDMSlideHandle inSourceSlide, int inDestIndex = -1) override;
-    CUICDMSlideHandle GetMasterSlide(CUICDMSlideHandle inSlide) const override;
-    bool IsMasterSlide(CUICDMSlideHandle inSlide) const override;
-    CUICDMSlideHandle GetMasterSlideByComponentGuid(SLong4 inGuid) const override;
+    Qt3DSDMSlideHandle CreateMasterSlide() override;
+    Qt3DSDMSlideHandle CreateSlide(Qt3DSDMSlideHandle inMaster, int inIndex = -1) override;
+    Qt3DSDMSlideHandle DuplicateSlide(Qt3DSDMSlideHandle inSourceSlide, int inDestIndex = -1) override;
+    Qt3DSDMSlideHandle GetMasterSlide(Qt3DSDMSlideHandle inSlide) const override;
+    bool IsMasterSlide(Qt3DSDMSlideHandle inSlide) const override;
+    Qt3DSDMSlideHandle GetMasterSlideByComponentGuid(SLong4 inGuid) const override;
     // Indexes are 1 based.  Index 0 refers to the master slide; you can't delete this.
-    void DeleteSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex) override;
-    void GetSlideReferencedInstances(CUICDMSlideHandle inMaster, size_t inIndex,
+    void DeleteSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex) override;
+    void GetSlideReferencedInstances(Qt3DSDMSlideHandle inMaster, size_t inIndex,
                                              TInstanceHandleList &outReferencedInstances) override;
-    CUICDMSlideHandle GetSlideByIndex(CUICDMSlideHandle inMaster, size_t inIndex) const override;
-    void SetActiveSlide(CUICDMSlideHandle inMaster, size_t inIndex) override;
-    size_t GetSlideCount(CUICDMSlideHandle inMaster) const override;
-    void RearrangeSlide(CUICDMSlideHandle inMaster, size_t inOldIndex, size_t inNewIndex) override;
-
-    void SetComponentSeconds(CUICDMSlideHandle inSlide, float inSeconds) override;
-    float GetComponentSeconds(CUICDMSlideHandle inSlide) const override;
-    long GetComponentSecondsLong(CUICDMSlideHandle inSlide) const override;
+    Qt3DSDMSlideHandle GetSlideByIndex(Qt3DSDMSlideHandle inMaster, size_t inIndex) const override;
+    void SetActiveSlide(Qt3DSDMSlideHandle inMaster, size_t inIndex) override;
+    size_t GetSlideCount(Qt3DSDMSlideHandle inMaster) const override;
+    void RearrangeSlide(Qt3DSDMSlideHandle inMaster, size_t inOldIndex, size_t inNewIndex) override;
+
+    void SetComponentSeconds(Qt3DSDMSlideHandle inSlide, float inSeconds) override;
+    float GetComponentSeconds(Qt3DSDMSlideHandle inSlide) const override;
+    long GetComponentSecondsLong(Qt3DSDMSlideHandle inSlide) const override;
     // For any given instance, find the current seconds via backtracking to the graph, finding the
     // active
     // slide, and return.
@@ -103,24 +103,24 @@ struct SSlideSystem : public ISlideSystem
      * Use the instance for storing information such as name, or the GUID of the object
      * this slide links to.
      */
-    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inInstance) const override;
+    Qt3DSDMInstanceHandle GetSlideInstance(Qt3DSDMSlideHandle inInstance) const override;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
+    Qt3DSDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
 
     /**
      *	Slide may be either a master slide or a normal slide.  This will associate this instance
      *	with this set of slides.  Property lookups (using the above IInstancePropertyCore interface)
      *	will now run through the slide set before hitting the main data core database.
      */
-    void AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
+    void AssociateInstanceWithSlide(Qt3DSDMSlideHandle inSlide,
                                             Qt3DSDMInstanceHandle inInstance) override;
-    CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const override;
+    Qt3DSDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const override;
     void GetAssociatedInstances(
-        CUICDMSlideHandle inMaster,
-        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const override;
-    void GetAssociatedInstances(CUICDMSlideHandle inSlide,
+        Qt3DSDMSlideHandle inMaster,
+        std::vector<std::pair<Qt3DSDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const override;
+    void GetAssociatedInstances(Qt3DSDMSlideHandle inSlide,
                                         TInstanceHandleList &outAssociations) const override;
     void LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
     void UnlinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
@@ -130,30 +130,30 @@ struct SSlideSystem : public ISlideSystem
                                      Qt3DSDMPropertyHandle inProperty) const override;
     bool GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle inInstance,
                                        Qt3DSDMPropertyHandle inProperty, SValue &outValue) override;
-    void GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide,
+    void GetUnionOfProperties(Qt3DSDMSlideHandle inSlide1, Qt3DSDMSlideHandle inSlide,
                                       TInstancePropertyPairList &outProperties) const override;
 
-    void SetActiveSlide(CUICDMSlideHandle inSlide) override;
-    CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
+    void SetActiveSlide(Qt3DSDMSlideHandle inSlide) override;
+    Qt3DSDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
                                                  Qt3DSDMPropertyHandle inProperty) const override;
 
-    bool SlideValid(CUICDMSlideHandle inSlide) const override;
-    int GetSlideIndex(CUICDMSlideHandle inSlide) const override;
-    int GetActiveSlideIndex(CUICDMSlideHandle inMaster) const override;
-    CUICDMSlideHandle GetActiveSlide(CUICDMSlideHandle inMaster) const override;
-    Qt3DSDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const override;
-    void SetSlideSelectedInstance(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance) override;
+    bool SlideValid(Qt3DSDMSlideHandle inSlide) const override;
+    int GetSlideIndex(Qt3DSDMSlideHandle inSlide) const override;
+    int GetActiveSlideIndex(Qt3DSDMSlideHandle inMaster) const override;
+    Qt3DSDMSlideHandle GetActiveSlide(Qt3DSDMSlideHandle inMaster) const override;
+    Qt3DSDMInstanceHandle GetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide) const override;
+    void SetSlideSelectedInstance(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance) override;
 
-    CUICDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+    Qt3DSDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
                                                  Qt3DSDMPropertyHandle inProperty) override;
 
-    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    bool GetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                           Qt3DSDMInstanceHandle inInstance,
                                           Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
     bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
                                                    Qt3DSDMPropertyHandle inProperty,
                                                    SValue &outValue) const override;
-    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
+    void ForceSetInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                Qt3DSDMInstanceHandle inInstance,
                                                Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) override;
@@ -168,9 +168,9 @@ private:
     // helper method
     void InsertEntryAndPropertyInstance(const TSlideEntry &inEntry,
                                         TInstanceHandleList &inInstances,
-                                        CUICDMSlideHandle inSlide);
-    void DeleteReferencedInstances(CUICDMSlideHandle inSlide);
-    void GetReferencedInstances(CUICDMSlideHandle inSlide,
+                                        Qt3DSDMSlideHandle inSlide);
+    void DeleteReferencedInstances(Qt3DSDMSlideHandle inSlide);
+    void GetReferencedInstances(Qt3DSDMSlideHandle inSlide,
                                 TInstanceHandleList &outReferencedInstances);
 };
 }
diff --git a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp
index 57045e5f..6685da3b 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.cpp
@@ -78,7 +78,7 @@ void CStudioAnimationSystem::ClearTemporaryAnimationValues(CUICDMAnimationHandle
              std::bind(AnimationFloatPairContainsAnimation, inAnimation, std::placeholders::_1));
 }
 
-inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle inSlide,
+inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, Qt3DSDMSlideHandle inSlide,
                                  Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     if (inInfo.m_Slide == inSlide && inInfo.m_Instance == inInstance
@@ -86,7 +86,7 @@ inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle
         return true;
     return false;
 }
-inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle inSlide,
+inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, Qt3DSDMSlideHandle inSlide,
                                  Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                  size_t inIndex)
 {
@@ -96,7 +96,7 @@ inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle
 }
 
 inline bool ApplyIfAnimationMatches(TAnimationFloatPair inAnimationFloatPair,
-                                    CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                     Qt3DSDMPropertyHandle inProperty,
                                     TAnimationCorePtr inAnimationCore, SValue &outValue)
 {
@@ -108,7 +108,7 @@ inline bool ApplyIfAnimationMatches(TAnimationFloatPair inAnimationFloatPair,
     return false;
 }
 
-void CStudioAnimationSystem::OverrideChannelIfAnimated(CUICDMSlideHandle inSlide,
+void CStudioAnimationSystem::OverrideChannelIfAnimated(Qt3DSDMSlideHandle inSlide,
                                                        Qt3DSDMInstanceHandle inInstance,
                                                        Qt3DSDMPropertyHandle inProperty,
                                                        size_t inIndex, float inSeconds,
@@ -124,7 +124,7 @@ void CStudioAnimationSystem::OverrideChannelIfAnimated(CUICDMSlideHandle inSlide
 }
 
 // Value must be *primed* first.
-bool CStudioAnimationSystem::GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CStudioAnimationSystem::GetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                               Qt3DSDMInstanceHandle inInstance,
                                                               Qt3DSDMPropertyHandle inProperty,
                                                               SValue &outValue) const
@@ -210,7 +210,7 @@ CUICDMKeyframeHandle CreateKeyframe(CUICDMAnimationHandle inAnimation, const SVa
                                   inSeconds, inAnimationCore, inEaseIn, inEaseOut);
 }
 
-void MaybeAddAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void MaybeAddAnimation(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                        Qt3DSDMPropertyHandle inProperty, CUICDMAnimationHandle inAnimation,
                        TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
 {
@@ -225,7 +225,7 @@ bool SortAnimationHandlesByIndex(CUICDMAnimationHandle lhs, CUICDMAnimationHandl
     return inCore->GetAnimationInfo(lhs).m_Index < inCore->GetAnimationInfo(rhs).m_Index;
 }
 
-void GetPresentAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void GetPresentAnimations(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                           Qt3DSDMPropertyHandle inProperty,
                           const TAnimationFloatPairList &inAnimationPairs,
                           TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
@@ -250,7 +250,7 @@ void GetPresentAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inIns
                         std::placeholders::_1, std::placeholders::_2, inAnimationCore));
 }
 
-void CreateAnimationAndAdd(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void CreateAnimationAndAdd(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                            Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                            TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
 {
@@ -277,7 +277,7 @@ bool AnimationExistsInPresentAnimations(const TAnimationFloatPair &inAnimation,
                             std::placeholders::_1));
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void DoKeyframeProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                         Qt3DSDMPropertyHandle inProperty, const SValue &inValue, float inTimeInSecs,
                         bool inDoDiffValue, TAnimationCorePtr inAnimationCore,
                         TAnimationFloatPairList &inAnimationFloatPairs, float inEaseIn,
@@ -306,7 +306,7 @@ void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInsta
     }
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void DoKeyframeProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                         Qt3DSDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
                         TAnimationCorePtr inAnimationCore, TSlideGraphCorePtr inSlideGraphCore,
                         TSlideCorePtr inSlideCore, TAnimationFloatPairList &inAnimationFloatPairs,
@@ -319,7 +319,7 @@ void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInsta
                        inAnimationCore, inAnimationFloatPairs, inEaseIn, inEaseOut);
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void DoKeyframeProperty(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                         Qt3DSDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
                         TAnimationCorePtr inAnimationCore, TSlideGraphCorePtr inSlideGraphCore,
                         TSlideCorePtr inSlideCore, TAnimationFloatPairList &inAnimationFloatPairs,
@@ -350,7 +350,7 @@ void InsertUniqueAnimationFloatPair(CUICDMAnimationHandle inAnimation,
                      std::bind(AnimationFloatPairContainsAnimation, inAnimation, std::placeholders::_1));
 }
 
-bool CStudioAnimationSystem::SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+bool CStudioAnimationSystem::SetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                               Qt3DSDMInstanceHandle inInstance,
                                                               Qt3DSDMPropertyHandle inProperty,
                                                               const SValue &inValue)
@@ -397,10 +397,10 @@ bool CStudioAnimationSystem::GetAutoKeyframe() const
     return m_AutoKeyframe;
 }
 
-CUICDMSlideHandle CStudioAnimationSystem::GetApplicableGraphAndSlide(
+Qt3DSDMSlideHandle CStudioAnimationSystem::GetApplicableGraphAndSlide(
     Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
 {
-    CUICDMSlideHandle theApplicableSlide;
+    Qt3DSDMSlideHandle theApplicableSlide;
     tuple<bool, size_t> arity = GetVariantAnimatableAndArity(inValue);
     if (get<0>(arity))
         theApplicableSlide = m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
@@ -434,7 +434,7 @@ void CStudioAnimationSystem::Animate(Qt3DSDMInstanceHandle inInstance,
 {
     SValue theValue;
     m_PropertySystem->GetInstancePropertyValue(inInstance, inProperty, theValue);
-    CUICDMSlideHandle theApplicableSlide =
+    Qt3DSDMSlideHandle theApplicableSlide =
         GetApplicableGraphAndSlide(inInstance, inProperty, theValue.toOldSkool());
     if (theApplicableSlide.Valid()) {
         // Check if previously we have set animation & keyframes
@@ -505,7 +505,7 @@ void CStudioAnimationSystem::KeyframeProperty(Qt3DSDMInstanceHandle inInstance,
 {
     SValue theValue;
     m_PropertySystem->GetInstancePropertyValue(inInstance, inProperty, theValue);
-    CUICDMSlideHandle theApplicableSlide =
+    Qt3DSDMSlideHandle theApplicableSlide =
         GetApplicableGraphAndSlide(inInstance, inProperty, theValue.toOldSkool());
     if (theApplicableSlide.Valid())
         DoKeyframeProperty(theApplicableSlide, inInstance, inProperty, theValue.toOldSkool(),
@@ -519,7 +519,7 @@ void CStudioAnimationSystem::SetOrCreateKeyframe(Qt3DSDMInstanceHandle inInstanc
                                                  size_t inNumInfos)
 {
     qt3dsdm::DataModelDataType::Value thePropertyType = m_PropertySystem->GetDataType(inProperty);
-    CUICDMSlideHandle theApplicableSlide;
+    Qt3DSDMSlideHandle theApplicableSlide;
     std::tuple<bool, size_t> arity = GetDatatypeAnimatableAndArity(thePropertyType);
     if (std::get<0>(arity)) {
         theApplicableSlide = m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
@@ -559,7 +559,7 @@ inline bool FindMatchingAnimation(CUICDMAnimationHandle inAnimation,
 CUICDMAnimationHandle CStudioAnimationSystem::GetControllingAnimation(
     Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty, size_t inIndex) const
 {
-    CUICDMSlideHandle theApplicableSlide =
+    Qt3DSDMSlideHandle theApplicableSlide =
         m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
     // first check our anim float pairs
     for (size_t idx = 0, end = m_AnimationFloatPairs.size(); idx < end; ++idx) {
diff --git a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h b/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h
index e11d274d..48b4bc3b 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/StudioAnimationSystem.h
@@ -103,11 +103,11 @@ public:
                                     Qt3DSDMPropertyHandle inProperty) const override;
     void SetInterpolation(bool inSmooth) override { m_SmoothInterpolation = inSmooth; }
 
-    bool GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+    bool GetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const override;
-    bool SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
+    bool SetAnimatedInstancePropertyValue(Qt3DSDMSlideHandle inSlide,
                                                   Qt3DSDMInstanceHandle inInstance,
                                                   Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue) override;
@@ -118,11 +118,11 @@ public:
 private:
     void OnAnimationDeleted(CUICDMAnimationHandle inAnimation);
 
-    CUICDMSlideHandle GetApplicableGraphAndSlide(Qt3DSDMInstanceHandle inInstance,
+    Qt3DSDMSlideHandle GetApplicableGraphAndSlide(Qt3DSDMInstanceHandle inInstance,
                                                  Qt3DSDMPropertyHandle inProperty,
                                                  const SValue &inValue);
 
-    void OverrideChannelIfAnimated(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    void OverrideChannelIfAnimated(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                    Qt3DSDMPropertyHandle inProperty, size_t inIndex, float inSeconds,
                                    bool &ioAnimated, SValue &outValue) const;
 };
diff --git a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp
index 146ff288..b8ee4494 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/StudioCoreSystem.cpp
@@ -56,14 +56,14 @@ inline bool AnimationPropertyMatches(CUICDMAnimationHandle inAnimation,
 }
 
 inline bool AnimationSlideMatches(CUICDMAnimationHandle inAnimation,
-                                  TAnimationCorePtr inAnimationCore, CUICDMSlideHandle inSlide)
+                                  TAnimationCorePtr inAnimationCore, Qt3DSDMSlideHandle inSlide)
 {
     return inSlide == inAnimationCore->GetAnimationInfo(inAnimation).m_Slide;
 }
 
 inline bool AnimationSlideInstancePropertyMatch(CUICDMAnimationHandle inAnimation,
                                                 TAnimationCorePtr inAnimationCore,
-                                                CUICDMSlideHandle inSlide,
+                                                Qt3DSDMSlideHandle inSlide,
                                                 Qt3DSDMInstanceHandle inInstance,
                                                 Qt3DSDMPropertyHandle inProperty)
 {
@@ -136,7 +136,7 @@ void CascadePropertyRemove(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHand
     EraseAnimationsThatMatch(inAnimationCore, thePredicate);
 }
 
-void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore,
+void CascadeSlideDelete(Qt3DSDMSlideHandle inSlide, TDataCorePtr inDataCore,
                         TSlideCorePtr inSlideCore, TSlideGraphCorePtr inSlideGraphCore,
                         TAnimationCorePtr inAnimationCore, TActionCorePtr inActionCore)
 {
@@ -155,7 +155,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore,
     }
 
     else {
-        CUICDMSlideHandle theMaster(inSlideCore->GetParentSlide(inSlide));
+        Qt3DSDMSlideHandle theMaster(inSlideCore->GetParentSlide(inSlide));
         if (theMaster.Valid()) {
             CUICDMSlideGraphHandle theGraph = inSlideGraphCore->GetSlideGraph(theMaster);
             if (theGraph.Valid()) {
@@ -174,7 +174,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore,
                 because the slide getting deleted is not currently active.  This is the mirror
                 of the fact that new slide *always* sets the active slide so it does make
                 logical sense.*/
-                CUICDMSlideHandle theNewActiveSlide =
+                Qt3DSDMSlideHandle theNewActiveSlide =
                     inSlideGraphCore->GetGraphActiveSlide(theGraph);
                 if (theNewActiveSlide == inSlide) {
                     TSlideHandleList theChildren;
@@ -202,7 +202,7 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore,
     EraseActions(inDataCore, inActionCore, theActions);
 }
 
-void CascadeSlidePropertyRemove(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+void CascadeSlidePropertyRemove(Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                 Qt3DSDMPropertyHandle inProperty, TAnimationCorePtr inAnimationCore)
 {
     EraseAnimationsThatMatch(inAnimationCore,
diff --git a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp
index 3d7144da..a89206cb 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/StudioFullSystem.cpp
@@ -60,7 +60,7 @@ inline void NotifyConsumer(TTransactionConsumerPtr inConsumer, TDoTransaction in
 }
 
 void NotifySlideCreated(TTransactionConsumerPtr &inConsumer,
-                        IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inSlide)
+                        IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inSlide)
 {
     NotifyConsumer(inConsumer,
                    bind(&IStudioFullSystemSignalSender::SendSlideCreated, inSender, inSlide),
@@ -68,7 +68,7 @@ void NotifySlideCreated(TTransactionConsumerPtr &inConsumer,
 }
 
 void NotifySlideDeleted(TTransactionConsumerPtr &inConsumer,
-                        IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inSlide)
+                        IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inSlide)
 {
     NotifyConsumer(inConsumer,
                    bind(&IStudioFullSystemSignalSender::SendSlideDeleted, inSender, inSlide),
@@ -76,7 +76,7 @@ void NotifySlideDeleted(TTransactionConsumerPtr &inConsumer,
 }
 
 void NotifySlideRearranged(TTransactionConsumerPtr &inConsumer,
-                           IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inSlide,
+                           IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inSlide,
                            int inOldIndex, int inNewIndex)
 {
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendSlideRearranged, inSender,
@@ -112,8 +112,8 @@ void NotifyInstancePropertyChanged(TTransactionConsumerPtr &inConsumer, TDataCor
     }
 }
 
-void RunAnimations(IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
-                   CUICDMSlideHandle inSlide, TAnimationCorePtr inAnimationCore,
+void RunAnimations(IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inMaster,
+                   Qt3DSDMSlideHandle inSlide, TAnimationCorePtr inAnimationCore,
                    TDataCorePtr inDataCore, TTransactionConsumerPtr &inConsumer)
 {
     TAnimationInfoList theAnimations;
@@ -127,12 +127,12 @@ void RunAnimations(IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle in
 }
 
 void NotifyComponentSeconds(TTransactionConsumerPtr &inConsumer,
-                            IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inSlide,
+                            IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inSlide,
                             TDataCorePtr inCore, TAnimationCorePtr inAnimationCore,
                             TStudioAnimationSystemPtr inAnimationSystem,
                             TSlideSystemPtr inSlideSystem)
 {
-    CUICDMSlideHandle theMaster = inSlideSystem->GetMasterSlide(inSlide);
+    Qt3DSDMSlideHandle theMaster = inSlideSystem->GetMasterSlide(inSlide);
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendBeginComponentSeconds,
                                     inSender, theMaster),
                    bind(&IStudioFullSystemSignalSender::SendComponentSeconds, inSender, theMaster));
@@ -145,7 +145,7 @@ void NotifyComponentSeconds(TTransactionConsumerPtr &inConsumer,
 }
 
 void NotifyPropertyLinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
-                          IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
+                          IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inMaster,
                           Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                           bool inAggregate)
 {
@@ -160,7 +160,7 @@ void NotifyPropertyLinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCo
 }
 
 void NotifyPropertyUnlinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
-                            IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
+                            IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inMaster,
                             Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                             bool inAggregate)
 {
@@ -175,8 +175,8 @@ void NotifyPropertyUnlinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr in
 }
 
 void NotifyActiveSlide(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
-                       IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
-                       int /*inIndex*/, CUICDMSlideHandle inOldSlide, CUICDMSlideHandle inNewSlide,
+                       IStudioFullSystemSignalSender *inSender, Qt3DSDMSlideHandle inMaster,
+                       int /*inIndex*/, Qt3DSDMSlideHandle inOldSlide, Qt3DSDMSlideHandle inNewSlide,
                        TAnimationCorePtr inAnimationCore, TSlideSystemPtr inSlideSystem)
 {
     TInstancePropertyPairList thePropertyList;
@@ -298,7 +298,7 @@ void NotifyInstanceDeleted(TTransactionConsumerPtr &inConsumer,
 
 void NotifyActionCreated(TTransactionConsumerPtr &inConsumer,
                          IStudioFullSystemSignalSender *inSender, CUICDMActionHandle inAction,
-                         CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
+                         Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
 {
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendActionCreated, inSender,
                                     inAction, inSlide, inInstance),
@@ -308,7 +308,7 @@ void NotifyActionCreated(TTransactionConsumerPtr &inConsumer,
 
 void NotifyActionDestroyed(TTransactionConsumerPtr &inConsumer,
                            IStudioFullSystemSignalSender *inSender, CUICDMActionHandle inAction,
-                           CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
+                           Qt3DSDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
 {
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendActionDeleted, inSender,
                                     inAction, inSlide, inInstance),
diff --git a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
index 1f4608c8..74f4c1a8 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
@@ -125,7 +125,7 @@ bool CStudioPropertySystem::GetInstancePropertyValue(Qt3DSDMInstanceHandle inIns
     if (!m_DataCore->IsProperty(inProperty))
         return false;
 
-    CUICDMSlideHandle theAnimationSlide;
+    Qt3DSDMSlideHandle theAnimationSlide;
     theAnimationSlide = m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
     SValue theTemp;
     bool retval = SetDefault(GetDataType(inProperty), theTemp);
@@ -146,7 +146,7 @@ void CStudioPropertySystem::SetInstancePropertyValue(Qt3DSDMInstanceHandle inIns
 {
     m_DataCore->CheckValue(inInstance, inProperty, inValue);
 
-    CUICDMSlideHandle theApplicableSlide;
+    Qt3DSDMSlideHandle theApplicableSlide;
     theApplicableSlide = m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
     if (theApplicableSlide.Valid()) {
         if (!m_StudioAnimationSystem->SetAnimatedInstancePropertyValue(
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
index fb9d50a2..8e8a2932 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
@@ -96,7 +96,7 @@ bool CBasicObjectDropSource::ValidateTarget(CDropTarget *inTarget)
             qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget->GetInstance();
             CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
             IDocumentReader &theReader(theDoc->GetDocumentReader());
-            qt3dsdm::CUICDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
+            qt3dsdm::Qt3DSDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
             ;
 
             if (!theReader.IsMasterSlide(toSlide))
@@ -128,7 +128,7 @@ bool CBasicObjectDropSource::CanCopy()
 
 CCmd *CBasicObjectDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                                    EDROPDESTINATION inDestType,
-                                                   qt3dsdm::CUICDMSlideHandle inSlide)
+                                                   qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     using namespace Q3DStudio;
     using qt3dsdm::ComposerObjectTypes;
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
index c5b55c84..14b6e62d 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
@@ -54,7 +54,7 @@ public:
 
     CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
-                                       qt3dsdm::CUICDMSlideHandle inSlide) override;
+                                       qt3dsdm::Qt3DSDMSlideHandle inSlide) override;
 
 protected:
     EPrimitiveType m_PrimitiveType;
diff --git a/src/Authoring/Studio/DragAndDrop/DropSource.h b/src/Authoring/Studio/DragAndDrop/DropSource.h
index 959fa7a1..a4473a2a 100644
--- a/src/Authoring/Studio/DragAndDrop/DropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/DropSource.h
@@ -82,7 +82,7 @@ public:
     virtual Qt::KeyboardModifiers GetCurrentFlags() const { return m_CurrentFlags; }
 
     virtual CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle, EDROPDESTINATION,
-                                       qt3dsdm::CUICDMSlideHandle)
+                                       qt3dsdm::Qt3DSDMSlideHandle)
     {
         return nullptr;
     }
diff --git a/src/Authoring/Studio/DragAndDrop/DropTarget.cpp b/src/Authoring/Studio/DragAndDrop/DropTarget.cpp
index 8657cedb..af132f12 100644
--- a/src/Authoring/Studio/DragAndDrop/DropTarget.cpp
+++ b/src/Authoring/Studio/DragAndDrop/DropTarget.cpp
@@ -52,6 +52,6 @@ bool CDropTarget::CanAddToMaster()
         return true;
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
     qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
-    qt3dsdm::CUICDMSlideHandle theTargetSlide = theSlideSystem->GetAssociatedSlide(GetInstance());
+    qt3dsdm::Qt3DSDMSlideHandle theTargetSlide = theSlideSystem->GetAssociatedSlide(GetInstance());
     return theTargetSlide && theSlideSystem->IsMasterSlide(theTargetSlide);
 }
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
index 527eeea2..6b55cc54 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
@@ -75,7 +75,7 @@ bool CFileDropSource::ValidateTarget(CDropTarget *inTarget)
             qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget->GetInstance();
             CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
             IDocumentReader &theReader(theDoc->GetDocumentReader());
-            qt3dsdm::CUICDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
+            qt3dsdm::Qt3DSDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
             ;
 
             if (!theReader.IsMasterSlide(toSlide))
@@ -140,7 +140,7 @@ bool CFileDropSource::CanCopy()
 
 CCmd *CFileDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                             EDROPDESTINATION inDestType,
-                                            qt3dsdm::CUICDMSlideHandle inSlide)
+                                            qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget;
 
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.h b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
index 8caad52c..b401c7ec 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
@@ -68,7 +68,7 @@ public:
 
     CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
-                                       qt3dsdm::CUICDMSlideHandle inSlide) override;
+                                       qt3dsdm::Qt3DSDMSlideHandle inSlide) override;
 };
 
 #endif // #ifndef __FILEDROPSOURCE_H__
diff --git a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
index 0951f3ab..b0901dcd 100644
--- a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
+++ b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
@@ -148,11 +148,11 @@ bool CSceneViewDropTarget::Drop(CDropSource &inSource)
     if (theTargetInstance.Valid()) {
         CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
         qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+        qt3dsdm::Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
         if (!theSlideSystem->IsMasterSlide(theSlide)
             && (inSource.GetCurrentFlags() & CHotKeys::MODIFIER_ALT)) {
             if (CanAddToMaster()) {
-                qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+                qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                     theSlideSystem->GetMasterSlide(theSlide);
                 if (theMasterSlideHandle.Valid())
                     theSlide = theMasterSlideHandle;
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
index 8f26695c..3f5a04b8 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
@@ -122,7 +122,7 @@ bool CTimeLineDropSource::ValidateTarget(CDropTarget *inTarget)
             theValidTarget &= (!inTarget->IsSelf(theHandle) && !inTarget->IsRelative(theHandle));
             qt3dsdm::ISlideSystem *theSlideSystem =
                 g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetSlideSystem();
-            qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(theHandle);
+            qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(theHandle);
             bool theIsMaster = theSlideSystem->IsMasterSlide(theSlide);
 
             theValidTarget &= !(theIsMaster && !inTarget->IsMaster());
@@ -146,7 +146,7 @@ inline void Rearrange(CDoc &inDoc, const qt3dsdm::TInstanceHandleList &inInstanc
 
 CCmd *CTimeLineDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                                 EDROPDESTINATION inDestType,
-                                                qt3dsdm::CUICDMSlideHandle inSlide)
+                                                qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
     CClientDataModelBridge *theBridge = theDoc->GetStudioSystem()->GetClientDataModelBridge();
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
index f4dd2913..9af1f960 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
@@ -60,7 +60,7 @@ public:
 
     CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
-                                       qt3dsdm::CUICDMSlideHandle inSlide) override;
+                                       qt3dsdm::Qt3DSDMSlideHandle inSlide) override;
 };
 
 #endif // #ifndef __TIMELINEDROPSOURCE_H__
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
index 9b5b3ee2..744cbc3c 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
@@ -84,11 +84,11 @@ bool CTimeLineDropTarget::Drop(CDropSource &inSource)
     if (theTargetInstance.Valid()) {
         CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
         qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+        qt3dsdm::Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
         if (!theSlideSystem->IsMasterSlide(theSlide)
             && (inSource.GetCurrentFlags() & CHotKeys::MODIFIER_ALT)) {
             if (CanAddToMaster()) {
-                qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+                qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                     theSlideSystem->GetMasterSlide(theSlide);
                 if (theMasterSlideHandle.Valid())
                     theSlide = theMasterSlideHandle;
@@ -174,7 +174,7 @@ bool CTimeLineDropTarget::IsMaster()
     else {
         qt3dsdm::ISlideSystem *theSlideSystem =
             g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(m_Instance);
+        qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(m_Instance);
         return theSlideSystem->IsMasterSlide(theSlide);
     }
 }
diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
index 8016966e..520a0ef9 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
@@ -159,7 +159,7 @@ qt3dsdm::IActionSystem *ActionModel::actionSystem() const
     return g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetActionSystem();
 }
 
-qt3dsdm::CUICDMSlideHandle ActionModel::activeSlide() const
+qt3dsdm::Qt3DSDMSlideHandle ActionModel::activeSlide() const
 {
     return g_StudioApp.GetCore()->GetDoc()->GetActiveSlide();
 }
diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.h b/src/Authoring/Studio/Palettes/Action/ActionModel.h
index dc504e38..12f94b5b 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.h
@@ -67,7 +67,7 @@ public:
 
 private:
     qt3dsdm::IActionSystem *actionSystem() const;
-    qt3dsdm::CUICDMSlideHandle activeSlide() const;
+    qt3dsdm::Qt3DSDMSlideHandle activeSlide() const;
     QString actionString(const qt3dsdm::CUICDMActionHandle &action) const;
 
     qt3dsdm::Qt3DSDMInstanceHandle m_handle;
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index 7657291a..91359832 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -561,7 +561,7 @@ void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
             theInstance = instances[0];
         break;
     case Q3DStudio::SelectedValueTypes::Slide: {
-        qt3dsdm::CUICDMSlideHandle theSlideHandle =
+        qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
             inSelectable.getData<Q3DStudio::SSlideInstanceWrapper>().m_Slide;
         // Get the owning component instance
         CClientDataModelBridge *theBridge = GetBridge();
@@ -575,15 +575,15 @@ void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
     setItem(theInstance);
 }
 
-void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
+void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     CDoc *theDoc = GetDoc();
     qt3dsdm::CStudioSystem *theStudioSystem = theDoc->GetStudioSystem();
 
-    qt3dsdm::CUICDMSlideHandle theCurrentSlide = theDoc->GetActiveSlide();
-    qt3dsdm::CUICDMSlideHandle theMasterSlideOfAction =
+    qt3dsdm::Qt3DSDMSlideHandle theCurrentSlide = theDoc->GetActiveSlide();
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlideOfAction =
         theStudioSystem->GetSlideSystem()->GetMasterSlide(inSlide);
-    qt3dsdm::CUICDMSlideHandle theMasterOfCurrentSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterOfCurrentSlide =
         theStudioSystem->GetSlideSystem()->GetMasterSlide(theCurrentSlide);
 
     if (inOwner == m_itemHandle && // the action is added to current viewed instance
@@ -597,7 +597,7 @@ void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CU
     }
 }
 
-void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
+void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inSlide);
     Q_UNUSED(inOwner);
@@ -811,8 +811,6 @@ void ActionView::initialize()
     rootContext()->setContextProperty("_actionView"_L1, this);
     rootContext()->setContextProperty("_resDir"_L1, resourceImageUrl());
     rootContext()->setContextProperty("_tabOrderHandler"_L1, tabOrderHandler());
-    rootContext()->setContextProperty("_mouseHelper"_L1, &m_mouseHelper);
-
     qmlRegisterUncreatableType<qt3dsdm::HandlerArgumentType>("Qt3DStudio", 1, 0, "HandlerArgumentType",
                                                           "HandlerArgumentType is an enum container"_L1);
     qmlRegisterUncreatableType<qt3dsdm::DataModelDataType>("Qt3DStudio", 1, 0, "DataModelDataType",
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h
index 36680ede..8dbaf35f 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.h
@@ -47,7 +47,6 @@
 #include "Qt3DSDMStudioSystem.h"
 #include "Qt3DSDMMetaDataTypes.h"
 #include "TabOrderHandler.h"
-#include "MouseHelper.h"
 
 class ActionModel;
 class CClientDataModelBridge;
@@ -135,9 +134,9 @@ public:
     void OnSelectionSet(Q3DStudio::SSelectedValue inSelectable);
 
     // Action callback
-    void OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                        qt3dsdm::Qt3DSDMInstanceHandle inOwner);
-    void OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                          qt3dsdm::Qt3DSDMInstanceHandle inOwner);
     void OnActionModified(qt3dsdm::CUICDMActionHandle inAction);
     void OnHandlerArgumentModified(qt3dsdm::CUICDMHandlerArgHandle inHandlerArgument);
@@ -197,7 +196,6 @@ private:
     QVariantList m_handlerArguments;
     QTimer m_actionChangedCompressionTimer;
     QString m_firedEvent;
-    MouseHelper m_mouseHelper;
 };
 
 #endif // ACTIONVIEW_H
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 487bfae7..f4073a9a 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -140,8 +140,8 @@ static std::pair<bool, bool> getSlideCharacteristics(qt3dsdm::Qt3DSDMInstanceHan
                                                      const qt3dsdm::ISlideSystem &slideSystem)
 {
     // Get the slide from the instance.
-    qt3dsdm::CUICDMSlideHandle slide = slideCore.GetSlideByInstance(instance);
-    qt3dsdm::CUICDMSlideHandle master = slideSystem.GetMasterSlide(slide);
+    qt3dsdm::Qt3DSDMSlideHandle slide = slideCore.GetSlideByInstance(instance);
+    qt3dsdm::Qt3DSDMSlideHandle master = slideSystem.GetMasterSlide(slide);
     int index = (int)slideSystem.GetSlideIndex(slide);
     int count = (int)slideSystem.GetSlideCount(master);
     bool hasNextSlide = index > 0 && index < count - 1;
@@ -844,7 +844,7 @@ void InspectorControlModel::setPropertyAnimated(long instance, int handle, bool
     g_StudioApp.GetCore()->ExecuteCommand(cmd);
 }
 
-void InspectorControlModel::onSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster,
+void InspectorControlModel::onSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster,
                                               int inOldIndex, int inNewIndex)
 {
     Q_UNUSED(inMaster);
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
index dfa68839..afc0d9af 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
@@ -125,7 +125,7 @@ public:
     Q_INVOKABLE void setPropertyAnimated(long instance, int handle, bool animated);
 
 private:
-    void onSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex,
+    void onSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex,
                            int inNewIndex);
 
 
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
index d4453123..fc98bbae 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
@@ -161,7 +161,7 @@ qt3dsdm::Qt3DSDMInstanceHandle ObjectListModel::handleForIndex(const QModelIndex
     return static_cast<qt3dsdm::Qt3DSDMInstanceHandle>(index.internalId());
 }
 
-qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle, const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
+qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::Qt3DSDMSlideHandle &slideHandle, const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
 {
     auto slideSystem = m_core->GetDoc()->GetStudioSystem()->GetSlideSystem();
     auto currentMaster = slideSystem->GetMasterSlide(slideHandle);
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
index 333cac85..3b063d00 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
@@ -66,7 +66,7 @@ public:
 private:
     qt3dsdm::Qt3DSDMInstanceHandle handleForIndex(const QModelIndex &index) const;
 
-    qt3dsdm::TInstanceHandleList childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle,
+    qt3dsdm::TInstanceHandleList childrenList(const qt3dsdm::Qt3DSDMSlideHandle &slideHandle,
                                                     const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
 
     QString nameForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
@@ -74,7 +74,7 @@ private:
     QModelIndex indexForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle, const QModelIndex &startIndex = {}) const;
 
     CCore *m_core;
-    qt3dsdm::CUICDMSlideHandle m_slideHandle;
+    qt3dsdm::Qt3DSDMSlideHandle m_slideHandle;
     qt3dsdm::Qt3DSDMInstanceHandle m_baseHandle;
     IObjectReferenceHelper *m_objRefHelper;
 };
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
index e4dc38a4..6b189638 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
@@ -292,7 +292,7 @@ bool CUICDMInspectable::IsValid() const
 bool CUICDMInspectable::IsMaster()
 {
     ISlideSystem *theSlideSystem = m_Core->GetDoc()->GetStudioSystem()->GetSlideSystem();
-    qt3dsdm::CUICDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(m_Instance);
+    qt3dsdm::Qt3DSDMSlideHandle theSlideHandle = theSlideSystem->GetAssociatedSlide(m_Instance);
     if (theSlideHandle.Valid())
         return theSlideSystem->IsMasterSlide(theSlideHandle);
     // Slide handle may not be valid if we are selecting the Scene or if we are inside Component and
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
index 4ce998ef..5bc20956 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp
@@ -76,7 +76,7 @@ bool SlideModel::setData(const QModelIndex &index, const QVariant &value, int ro
         break;
     }
     case HandleRole: {
-        slideHandle = value.value<qt3dsdm::CUICDMSlideHandle>();
+        slideHandle = value.value<qt3dsdm::Qt3DSDMSlideHandle>();
         Q_EMIT dataChanged(index, index, {HandleRole, NameRole});
         break;
     }
@@ -202,7 +202,7 @@ void SlideModel::addNewSlide(int row)
     const auto handle = (row < m_slides.size()) ? m_slides[row] : m_slides.last();
 
     const auto instanceHandle = GetBridge()->GetOwningComponentInstance(handle);
-    qt3dsdm::CUICDMSlideHandle theMasterSlide = GetBridge()->GetComponentSlide(instanceHandle, 0);
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide = GetBridge()->GetComponentSlide(instanceHandle, 0);
 
     beginInsertRows({}, row, row);
     m_slides.insert(row, Q3DStudio::SCOPED_DOCUMENT_EDITOR(*GetDoc(),
@@ -230,7 +230,7 @@ bool SlideModel::hasSlideWithName(const QString &name) const
     return false;
 }
 
-QString SlideModel::slideName(const qt3dsdm::CUICDMSlideHandle &handle) const
+QString SlideModel::slideName(const qt3dsdm::Qt3DSDMSlideHandle &handle) const
 {
     auto doc = GetDoc();
     if (!doc->IsValid())
@@ -239,7 +239,7 @@ QString SlideModel::slideName(const qt3dsdm::CUICDMSlideHandle &handle) const
     return GetBridge()->GetName(instanceHandle).toQString();
 }
 
-void SlideModel::setSlideName(const qt3dsdm::CUICDMSlideHandle &handle, const QString &name)
+void SlideModel::setSlideName(const qt3dsdm::Qt3DSDMSlideHandle &handle, const QString &name)
 {
     const auto oldName = slideName(handle);
     if (oldName != name && !name.trimmed().isEmpty()) {
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.h b/src/Authoring/Studio/Palettes/Slide/SlideModel.h
index 4aec0070..b5da9670 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideModel.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.h
@@ -68,12 +68,12 @@ public:
 
 private:
     bool hasSlideWithName(const QString &name) const;
-    QString slideName(const qt3dsdm::CUICDMSlideHandle &handle) const;
-    void setSlideName(const qt3dsdm::CUICDMSlideHandle &handle, const QString &name);
+    QString slideName(const qt3dsdm::Qt3DSDMSlideHandle &handle) const;
+    void setSlideName(const qt3dsdm::Qt3DSDMSlideHandle &handle, const QString &name);
     inline CDoc *GetDoc() const;
     inline CClientDataModelBridge *GetBridge() const;
 
-    QVector<qt3dsdm::CUICDMSlideHandle> m_slides;
+    QVector<qt3dsdm::Qt3DSDMSlideHandle> m_slides;
     int m_selectedRow = -1;
 };
 
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index 11e8b357..dfe9b7a1 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -84,7 +84,7 @@ void SlideView::setShowMasterSlide(bool show)
     CDoc *theDoc = GetDoc();
     qt3dsdm::Qt3DSDMInstanceHandle theRoot = theDoc->GetActiveRootInstance();
     CClientDataModelBridge *theBridge = GetBridge();
-    qt3dsdm::CUICDMSlideHandle theNewActiveSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theNewActiveSlide =
         theBridge->GetOrCreateGraphRoot(theRoot); // this will return the master slide
     qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
     if (m_CurrentModel != m_MasterSlideModel) {
@@ -177,8 +177,8 @@ void SlideView::OnClosingPresentation()
     clearSlideList();
 }
 
-void SlideView::OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int inIndex,
-                              const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex,
+                              const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
     // When the active slide changes, we need to update our button and mode
     if (inMaster.Valid()) {
@@ -188,17 +188,17 @@ void SlideView::OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int in
     }
 }
 
-void SlideView::OnNewSlide(const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnNewSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
 
 }
 
-void SlideView::OnDeleteSlide(const qt3dsdm::CUICDMSlideHandle &inSlide)
+void SlideView::OnDeleteSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide)
 {
 
 }
 
-void SlideView::OnSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex, int inNewIndex)
+void SlideView::OnSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex, int inNewIndex)
 {
 }
 
@@ -218,7 +218,7 @@ void SlideView::clearSlideList()
     m_SlidesModel->clear();
 }
 
-void SlideView::setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle)
+void SlideView::setActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle)
 {
     // Make sure we are in the correct master mode based on the inActiveSlideHandle
     // If we changed mode, then we need to force a rebuild
@@ -238,7 +238,7 @@ void SlideView::setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHa
     }
 }
 
-void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle)
+void SlideView::rebuildSlideList(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle)
 {
     // Clear out the existing slides
     clearSlideList();
@@ -250,11 +250,11 @@ void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlide
 
         // Get the Master Slide handle and the slide count
         qt3dsdm::ISlideSystem *theSlideSystem = GetSlideSystem();
-        qt3dsdm::CUICDMSlideHandle theMasterSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
             theSlideSystem->GetMasterSlide(inActiveSlideHandle);
 
         // update handle for master slide
-        qt3dsdm::CUICDMSlideHandle theMasterSlideHandle =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlideHandle =
                 theSlideSystem->GetSlideByIndex(theMasterSlide, 0);
         m_MasterSlideModel->setData(m_MasterSlideModel->index(0, 0),
                                     QVariant::fromValue(theMasterSlideHandle),
@@ -267,7 +267,7 @@ void SlideView::rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlide
         m_SlidesModel->insertRows(0, theSlideCount - 1, {});
         int row = 0;
         for (long theSlideIndex = 1; theSlideIndex < theSlideCount; ++theSlideIndex) {
-            qt3dsdm::CUICDMSlideHandle theSlideHandle =
+            qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
                     theSlideSystem->GetSlideByIndex(theMasterSlide, theSlideIndex);
             auto index = m_SlidesModel->index(row, 0);
             m_SlidesModel->setData(index,
@@ -302,12 +302,12 @@ qt3dsdm::ISlideSystem *SlideView::GetSlideSystem()
     return GetDoc()->GetStudioSystem()->GetSlideSystem();
 }
 
-long SlideView::GetSlideIndex(const qt3dsdm::CUICDMSlideHandle &inSlideHandle)
+long SlideView::GetSlideIndex(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle)
 {
     return GetSlideSystem()->GetSlideIndex(inSlideHandle);
 }
 
-bool SlideView::isMaster(const qt3dsdm::CUICDMSlideHandle &inSlideHandle)
+bool SlideView::isMaster(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle)
 {
     return (0 == GetSlideIndex(inSlideHandle));
 }
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h
index 4f42e160..677fcb78 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h
@@ -76,23 +76,23 @@ Q_SIGNALS:
 
 protected:
     // UICDM callbacks
-    virtual void OnActiveSlide(const qt3dsdm::CUICDMSlideHandle &inMaster, int inIndex,
-                               const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnNewSlide(const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnDeleteSlide(const qt3dsdm::CUICDMSlideHandle &inSlide);
-    virtual void OnSlideRearranged(const qt3dsdm::CUICDMSlideHandle &inMaster, int inOldIndex,
+    virtual void OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex,
+                               const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnNewSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnDeleteSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
+    virtual void OnSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inOldIndex,
                                    int inNewIndex);
 
 private:
     void initialize();
     void clearSlideList();
-    void setActiveSlide(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle);
+    void setActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle);
     inline CDoc *GetDoc();
     inline CClientDataModelBridge *GetBridge();
     inline qt3dsdm::ISlideSystem *GetSlideSystem();
-    long GetSlideIndex(const qt3dsdm::CUICDMSlideHandle &inSlideHandle);
-    bool isMaster(const qt3dsdm::CUICDMSlideHandle &inSlideHandle);
-    void rebuildSlideList(const qt3dsdm::CUICDMSlideHandle &inActiveSlideHandle);
+    long GetSlideIndex(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle);
+    bool isMaster(const qt3dsdm::Qt3DSDMSlideHandle &inSlideHandle);
+    void rebuildSlideList(const qt3dsdm::Qt3DSDMSlideHandle &inActiveSlideHandle);
 
     SlideModel *m_CurrentModel = nullptr;
     SlideModel *m_MasterSlideModel = nullptr;
@@ -107,7 +107,7 @@ private:
     TIntIntMap m_MasterSlideReturnPointers;
 
     qt3dsdm::Qt3DSDMInstanceHandle m_ActiveRoot; ///< the object containing the slides to be inspected.
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle
 };
 
 #endif // SLIDEVIEW_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
index f248216d..d420bc4b 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
@@ -73,13 +73,13 @@ bool CGroupTimelineItemBinding::OpenAssociatedEditor()
 
         qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
         Q3DStudio::CId theId = m_StudioSystem->GetClientDataModelBridge()->GetGUID(theInstance);
-        qt3dsdm::CUICDMSlideHandle theMasterSlide =
+        qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
             theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
 
         if (theMasterSlide.Valid()) {
-            CUICDMSlideHandle theActiveSlide = theSlideSystem->GetActiveSlide(theMasterSlide);
+            Qt3DSDMSlideHandle theActiveSlide = theSlideSystem->GetActiveSlide(theMasterSlide);
 
-            CCmd *theCmd = new CCmdGeneric<CDoc, CUICDMSlideHandle>(
+            CCmd *theCmd = new CCmdGeneric<CDoc, Qt3DSDMSlideHandle>(
                 m_TransMgr->GetDoc(), &CDoc::NotifyActiveSlideChanged,
                 &CDoc::NotifyActiveSlideChanged, theActiveSlide, NULL, "");
             theCmd->SetUndoable(false);
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
index e8a2c476..5f6f29f4 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
@@ -137,7 +137,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
@@ -180,9 +180,9 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                             if (thePropGuid == theGuid)
                                 theIsMatch = true;
                         }
-                        CUICDMSlideHandle theSlide =
+                        Qt3DSDMSlideHandle theSlide =
                             theSlideSystem->GetAssociatedSlide(theChildInstance);
-                        CUICDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theSlide);
+                        Qt3DSDMSlideHandle theMasterSlide = theSlideSystem->GetMasterSlide(theSlide);
                         if (theIsMatch == false && theSlide.Valid()
                             && theSlideCore->GetSpecificInstancePropertyValue(
                                    theSlide, theInstance, theProperty, theValue)) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 995d7cd2..44d792c1 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -233,7 +233,7 @@ bool CUICDMTimelineItemBinding::HasAction(bool inMaster)
     TActionHandleList theActions;
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
 
-    CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+    Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
     qt3dsdm::ISlideCore &theSlideCore(*m_StudioSystem->GetSlideCore());
     if (theSlideCore.IsSlide(theSlide)) {
         if (inMaster)
@@ -254,7 +254,7 @@ bool CUICDMTimelineItemBinding::ChildrenHasAction(bool inMaster)
     IActionCore *theActionCore(m_StudioSystem->GetActionCore());
     CClientDataModelBridge *theBridge(m_StudioSystem->GetClientDataModelBridge());
 
-    CUICDMSlideHandle theSlide = theDoc->GetActiveSlide();
+    Qt3DSDMSlideHandle theSlide = theDoc->GetActiveSlide();
     qt3dsdm::ISlideCore &theSlideCore(*m_StudioSystem->GetSlideCore());
     if (theSlideCore.IsSlide(theSlide)) {
         if (inMaster)
@@ -295,7 +295,7 @@ bool CUICDMTimelineItemBinding::ComponentHasAction(bool inMaster)
         return false;
 
     Q3DStudio::CId theAssetId = theBridge->GetGUID(m_DataHandle);
-    CUICDMSlideHandle theMasterSlide =
+    Qt3DSDMSlideHandle theMasterSlide =
         m_StudioSystem->GetSlideSystem()->GetMasterSlideByComponentGuid(GuidtoSLong4(theAssetId));
 
     TSlideInstancePairList theGraphInstances;
@@ -432,7 +432,7 @@ long CUICDMTimelineItemBinding::GetChildrenCount()
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         return (long)theChildren.GetCount();
@@ -445,7 +445,7 @@ ITimelineItemBinding *CUICDMTimelineItemBinding::GetChild(long inIndex)
     qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
-        CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
+        Qt3DSDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
         GetAssetChildrenInTimeParent(theInstance, m_TransMgr->GetDoc(), AmITimeParent(),
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
@@ -1197,7 +1197,7 @@ void CUICDMTimelineItemBinding::OnAddChild(Qt3DSDMInstanceHandle inInstance)
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
     ISlideSystem *theSlideSystem = m_StudioSystem->GetSlideSystem();
 
-    qt3dsdm::CUICDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
+    qt3dsdm::Qt3DSDMSlideHandle theSlide = theSlideSystem->GetAssociatedSlide(inInstance);
     if (theBridge->IsInActiveComponent(inInstance)
         && (theSlideSystem->IsMasterSlide(theSlide) || theSlide == theDoc->GetActiveSlide())) {
         // Only add if the asset is in the current active component, and it's a master asset or in
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
index b1de8aeb..7823fe15 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
@@ -562,7 +562,7 @@ bool CUICDMTimelineItemProperty::CreateKeyframeIfNonExistent(
     return true;
 }
 
-void CUICDMTimelineItemProperty::OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
+void CUICDMTimelineItemProperty::OnPropertyLinkStatusChanged(qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                                              qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                              qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
index 2c0c17f4..a6231e9d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
@@ -94,7 +94,7 @@ protected:
     void InitializeCachedVariables(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     bool CreateKeyframeIfNonExistent(qt3dsdm::CUICDMKeyframeHandle inKeyframe,
                                      qt3dsdm::CUICDMAnimationHandle inOwningAnimation);
-    void OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnPropertyLinkStatusChanged(qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                      qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                      qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void CreateKeyframes();
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
index e158e945..2e973175 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
@@ -53,7 +53,7 @@ CSlideTimelineItemBinding::CSlideTimelineItemBinding(CTimelineTranslationManager
                                                      Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr)
 {
-    qt3dsdm::CUICDMSlideHandle theSlideHandle =
+    qt3dsdm::Qt3DSDMSlideHandle theSlideHandle =
         m_StudioSystem->GetSlideSystem()->GetSlideByInstance(inDataHandle);
 
     // Get the owning component of m_SlideHandle.
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
index 8d4ca0e7..0532098f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
@@ -74,7 +74,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = theBridge->GetGUID(inInstance);
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     ASSERT(theMasterSlide.Valid()); // it should be valid because inAsset should be OBJTYPE_SCENE or
                                     // non-library OBJTYPE_COMPONENT
@@ -93,7 +93,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
     if (theIsMaster)
         outBreadCrumb.m_String += ::LoadResourceString(IDS_OBJTYPE_MASTER).toQString();
     else {
-        CUICDMSlideHandle theActiveSlide =
+        Qt3DSDMSlideHandle theActiveSlide =
             theSlideSystem->GetSlideByIndex(theMasterSlide, theActiveIndex);
         Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theActiveSlide);
         ASSERT(theInstanceHandle.Valid());
@@ -224,12 +224,12 @@ void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::Qt3DSDMInstanceHandle i
                     std::placeholders::_1, std::placeholders::_2, inInstance, theNameProp, theSetter)));
 
     // Listen to name changes on the non-master Slides
-    qt3dsdm::CUICDMSlideHandle theMasterSlide =
+    qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
     long theSlideCount = (long)theSlideSystem->GetSlideCount(theMasterSlide);
 
     for (long theIndex = 1; theIndex < theSlideCount; ++theIndex) {
-        CUICDMSlideHandle theSlide = theSlideSystem->GetSlideByIndex(theMasterSlide, theIndex);
+        Qt3DSDMSlideHandle theSlide = theSlideSystem->GetSlideByIndex(theMasterSlide, theIndex);
         Qt3DSDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(theSlide);
         m_Connections.push_back(theEngine->ConnectInstancePropertyValue(
             std::bind(qt3dsdm::MaybackCallbackInstancePropertyValue<std::function<void(
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
index 78f3adc8..d54ab6fb 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
@@ -494,7 +494,7 @@ void CTimelineTranslationManager::OnChildMoved(int /*inParent*/, int inChild, lo
  * update the icon that shows action association status
  */
 void CTimelineTranslationManager::OnActionEvent(qt3dsdm::CUICDMActionHandle inAction,
-                                                qt3dsdm::CUICDMSlideHandle inSlide,
+                                                qt3dsdm::Qt3DSDMSlideHandle inSlide,
                                                 qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inAction);
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
index 29bdcbd7..32c767ac 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
@@ -141,7 +141,7 @@ public:
     void OnChildRemoved(int inParent, int inChild, long inIndex);
     void OnChildMoved(int inParent, int inChild, long inOldIndex, long inNewIndex);
 
-    void OnActionEvent(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
+    void OnActionEvent(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::Qt3DSDMSlideHandle inSlide,
                        qt3dsdm::Qt3DSDMInstanceHandle inOwner);
 
     // Helper function to iterate over all bindings
@@ -157,4 +157,4 @@ protected:
     ITimelineItemBinding *EnsureLoaded(qt3dsdm::Qt3DSDMInstanceHandle inHandle);
 };
 
-#endif // INCLUDED_TIMELINE_TRANSLATIONMANAGER_H
\ No newline at end of file
+#endif // INCLUDED_TIMELINE_TRANSLATIONMANAGER_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
index 94d5458f..985fe420 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
@@ -156,7 +156,7 @@ void CTimelineControl::ClearView()
  * root of the doc.
  * @param inState the state to be viewed as the root asset.
  */
-void CTimelineControl::ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::ViewSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_ActiveSlide = inSlide;
 
@@ -190,7 +190,7 @@ void CTimelineControl::ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide)
  * Notification from the StudioFullSystem signal provider that a we have a new active slide.
  * This will populate this view with the new context.
  */
-void CTimelineControl::OnActiveSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::OnActiveSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     ClearView();
     ViewSlide(inSlide);
@@ -238,7 +238,7 @@ void CTimelineControl::OnClosingPresentation()
 /**
  * Accessor for the root object being displayed in this view.
  */
-qt3dsdm::CUICDMSlideHandle CTimelineControl::GetActiveSlide()
+qt3dsdm::Qt3DSDMSlideHandle CTimelineControl::GetActiveSlide()
 {
     return m_ActiveSlide;
 }
@@ -561,7 +561,7 @@ void CTimelineControl::OnSavingPresentation(const CUICFile *inNewPresentationFil
 /**
  * Notification from the StudioFullSystem signal provider that a slide has been deleted.
  */
-void CTimelineControl::OnDeleteSlide(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineControl::OnDeleteSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_TimelineLayout->DeleteTimelineRatio(inSlide);
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
index 17fbccf1..67120690 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
@@ -107,8 +107,8 @@ public:
     ISnappingListProvider *GetSnappingListProvider() const override;
 
     void ClearView();
-    void ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide);
-    qt3dsdm::CUICDMSlideHandle GetActiveSlide();
+    void ViewSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
+    qt3dsdm::Qt3DSDMSlideHandle GetActiveSlide();
 
     CTimelineTimelineLayout *GetTimelineLayout();
     CTimelineTreeLayout *GetTreeLayout();
@@ -132,8 +132,8 @@ protected:
     void HideInsertionMarkers();
 
     // UICDM callbacks
-    void OnActiveSlide(qt3dsdm::CUICDMSlideHandle inSlide);
-    void OnDeleteSlide(qt3dsdm::CUICDMSlideHandle inSlide);
+    void OnActiveSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
+    void OnDeleteSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
     // Helper functions
     inline CDoc *GetDoc();
@@ -142,7 +142,7 @@ protected:
     CTimelineSplitter *m_Splitter;
     CTimelineTreeLayout *m_TreeLayout;
     CTimelineTimelineLayout *m_TimelineLayout;
-    qt3dsdm::CUICDMSlideHandle m_ActiveSlide;
+    qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide;
     CInsertionLine
         *m_InsertionLine; ///< Drag-and-drop insertion line for dropping between timeline items
     CInsertionOverlay
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
index 22cf720c..27606d84 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.cpp
@@ -312,7 +312,7 @@ void CTimelineTimelineLayout::OnTimelineLayoutChanged()
  *	Deletes the time zoom ratio for a particular slide.
  *	@param inContext the time context of that slide to delete
  */
-void CTimelineTimelineLayout::DeleteTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide)
+void CTimelineTimelineLayout::DeleteTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     m_TimelineRatio.erase(inSlide);
 }
@@ -330,7 +330,7 @@ void CTimelineTimelineLayout::ClearAllTimeRatios()
  *	@param inContext the time context of that slide to retrieve zoom ratio
  *  @return the zoom ratio, or -1 if it's not found
  */
-double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide)
+double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide)
 {
     TSlideRatioMap::iterator theResult = m_TimelineRatio.find(inSlide);
     if (theResult != m_TimelineRatio.end())
@@ -344,7 +344,7 @@ double CTimelineTimelineLayout::GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSl
  *	@param inContext the time context of that slide
  *  @param inRatio the zoom factor
  */
-void CTimelineTimelineLayout::SetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide, double inRatio)
+void CTimelineTimelineLayout::SetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide, double inRatio)
 {
     m_TimelineRatio[inSlide] = inRatio;
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
index c7b16f4a..08d48505 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineTimelineLayout.h
@@ -71,7 +71,7 @@ class CTimelineTimelineLayout : public CControl,
                                 public ISnappingListProvider
 {
     typedef std::vector<CTimelineRow *> TTimelineRowList;
-    typedef std::map<qt3dsdm::CUICDMSlideHandle, double> TSlideRatioMap;
+    typedef std::map<qt3dsdm::Qt3DSDMSlideHandle, double> TSlideRatioMap;
 
 public:
     static const long END_BUFFER_SIZE = 20;
@@ -116,15 +116,15 @@ public:
     void SetTimeRatio(double inTimeRatio);
     void OnTimelineLayoutChanged();
 
-    void DeleteTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide);
+    void DeleteTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide);
     void ClearAllTimeRatios();
-    double GetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide);
+    double GetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
     // ISnappingListProvider
     void PopulateSnappingList(CSnapper *inSnappingList) override;
 
 protected:
-    void SetTimelineRatio(qt3dsdm::CUICDMSlideHandle inSlide, double inRatio);
+    void SetTimelineRatio(qt3dsdm::Qt3DSDMSlideHandle inSlide, double inRatio);
 
     long GetMaximumTimebarTime();
     void OnScalingZoomIn();
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h
index e6e153aa..fb99f269 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.h
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h
@@ -390,9 +390,9 @@ namespace studio {
         QT3DSVec4 m_selectedGuideFillColor;
 
         STranslation(IStudioRenderer &inRenderer, IUICRenderContext &inContext);
-        void MarkBeginComponentSeconds(qt3dsdm::CUICDMSlideHandle) { ++m_ComponentSecondsDepth; }
+        void MarkBeginComponentSeconds(qt3dsdm::Qt3DSDMSlideHandle) { ++m_ComponentSecondsDepth; }
 
-        void MarkComponentSeconds(qt3dsdm::CUICDMSlideHandle)
+        void MarkComponentSeconds(qt3dsdm::Qt3DSDMSlideHandle)
         {
             m_ComponentSecondsDepth = NVMax(0, m_ComponentSecondsDepth - 1);
             if (m_ComponentSecondsDepth == 0)
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
index 6916f4b4..99f77c3e 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
@@ -1341,7 +1341,7 @@ CInspectableBase *CStudioApp::GetInspectableFromSelectable(Q3DStudio::SSelectedV
             if (m_Core->GetDoc()->GetDocumentReader().IsInstance(theSelectedInstance)) {
                 CClientDataModelBridge *theBridge =
                     theDoc->GetStudioSystem()->GetClientDataModelBridge();
-                qt3dsdm::CUICDMSlideHandle theCurrentActiveSlide = theDoc->GetActiveSlide();
+                qt3dsdm::Qt3DSDMSlideHandle theCurrentActiveSlide = theDoc->GetActiveSlide();
 
                 // Slide, scene or component
                 if (theSelectedInstance
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.h b/src/Authoring/Studio/_Win/Application/StudioApp.h
index 6d475b88..78ca679e 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.h
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.h
@@ -132,7 +132,7 @@ protected:
     CDialogs *m_Dialogs;
     long m_PlaybackTime; ///< Stores the playhead's starting position so that it can be restored
     ///after playing the presentation for a little while
-    qt3dsdm::CUICDMSlideHandle
+    qt3dsdm::Qt3DSDMSlideHandle
         m_PlaybackOriginalSlide; ///< Stores the current slide handle before playback started.
 
     std::shared_ptr<Q3DStudio::ITickTock> m_TickTock;