Rename instance and property handles to Qt3DS

Task-number: QT3DS-18
Change-Id: Id93959e382dd9285590fdf979c71a459e7657e01
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

164 files changed, 2691 insertions, 2691 deletions

diff --git a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
index 435ec7ab..d49153dc 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.cpp
@@ -45,7 +45,7 @@ CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inS
 {
 }
 
-CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance)
+CCmdActivateSlide::CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     : m_Doc(inDoc)
     , m_ForceRefresh(true)
 {
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
index 3a91292f..4191e342 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdActivateSlide.h
@@ -46,7 +46,7 @@ class CCmdActivateSlide : public CNonModifyingCmd
 {
 public:
     CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlideHandle);
-    CCmdActivateSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance);
+    CCmdActivateSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     virtual ~CCmdActivateSlide();
 
     unsigned long Do() override;
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
index 0f091008..66a0a97d 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.h
@@ -43,9 +43,9 @@ struct CTransactionConsumer;
 struct SApplicationState
 {
     bool m_Dirty;
-    qt3dsdm::CUICDMInstanceHandle m_SelectedInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_SelectedInstance;
     qt3dsdm::CUICDMSlideHandle m_ActiveSlide;
-    qt3dsdm::CUICDMInstanceHandle m_ActiveLayer;
+    qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer;
 
     SApplicationState()
         : m_Dirty(false)
@@ -76,8 +76,8 @@ public:
     void DataModelRollback();
     void RunDoNotifications();
     void RunUndoNotifications();
-    void CheckForSelectionChange(CUICDMInstanceHandle inOldInstance,
-                                 CUICDMInstanceHandle inNewInstance);
+    void CheckForSelectionChange(Qt3DSDMInstanceHandle inOldInstance,
+                                 Qt3DSDMInstanceHandle inNewInstance);
 
 protected:
     std::shared_ptr<CTransactionConsumer> m_Consumer;
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeanimate.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeanimate.h
index 90371356..ccca10de 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeanimate.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeanimate.h
@@ -48,12 +48,12 @@ class CCmdDataModelAnimate : public CCmd, public qt3dsdm::CmdDataModel
 {
 protected: // Members
     CDoc *m_Doc;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
-    qt3dsdm::CUICDMPropertyHandle m_Property;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMPropertyHandle m_Property;
 
 public: // Construction
-    CCmdDataModelAnimate(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
-                         qt3dsdm::CUICDMPropertyHandle inProperty)
+    CCmdDataModelAnimate(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                         qt3dsdm::Qt3DSDMPropertyHandle inProperty)
         : qt3dsdm::CmdDataModel(*inDoc)
         , m_Doc(inDoc)
         , m_Instance(inInstance)
@@ -104,12 +104,12 @@ class CCmdDataModelDeanimate : public CCmd, public qt3dsdm::CmdDataModel
 {
 protected: // Members
     CDoc *m_Doc;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
-    qt3dsdm::CUICDMPropertyHandle m_Property;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMPropertyHandle m_Property;
 
 public: // Construction
-    CCmdDataModelDeanimate(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMPropertyHandle inProperty)
+    CCmdDataModelDeanimate(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMPropertyHandle inProperty)
         : qt3dsdm::CmdDataModel(*inDoc)
         , m_Doc(inDoc)
         , m_Instance(inInstance)
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
index f2ec3163..9c6035df 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelDeleteInstance.h
@@ -44,10 +44,10 @@ class CCmdDataModelDeleteInstance : public CCmd, public qt3dsdm::CmdDataModel
 {
 protected: // Members
     CDoc *m_Doc;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
 
 public: // Construction
-    CCmdDataModelDeleteInstance(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance)
+    CCmdDataModelDeleteInstance(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         : qt3dsdm::CmdDataModel(*inDoc)
         , m_Doc(inDoc)
         , m_Instance(inInstance)
@@ -93,10 +93,10 @@ class CCmdDataModelDeleteComponentInstance : public CCmd, public qt3dsdm::CmdDat
 {
 protected: // Members
     CDoc *m_Doc;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
 
 public: // Construction
-    CCmdDataModelDeleteComponentInstance(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance)
+    CCmdDataModelDeleteComponentInstance(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         : CmdDataModel(*inDoc)
         , m_Doc(inDoc)
         , m_Instance(inInstance)
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelInsertKeyframe.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelInsertKeyframe.h
index b267871f..90e28de1 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelInsertKeyframe.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelInsertKeyframe.h
@@ -50,12 +50,12 @@ class CCmdDataModelInsertKeyframe : public CCmd, public qt3dsdm::CmdDataModel
 public:
     struct STimeKeyframeData
     {
-        qt3dsdm::CUICDMPropertyHandle m_Property;
+        qt3dsdm::Qt3DSDMPropertyHandle m_Property;
         float m_KeyframeTime;
         qt3dsdm::SGetOrSetKeyframeInfo m_Infos[3];
         size_t m_ValidInfoCount;
 
-        STimeKeyframeData(qt3dsdm::CUICDMPropertyHandle inProperty, float inKeyframeTime,
+        STimeKeyframeData(qt3dsdm::Qt3DSDMPropertyHandle inProperty, float inKeyframeTime,
                           qt3dsdm::SGetOrSetKeyframeInfo *inInfos, size_t inInfoCount)
             : m_Property(inProperty)
             , m_KeyframeTime(inKeyframeTime)
@@ -72,13 +72,13 @@ protected:
 
 protected: // Members
     CDoc *m_Doc;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
     TKeyframeDataList m_KeyframeDataList;
 
 public: // Construction
     //@param inTime is in secs
-    CCmdDataModelInsertKeyframe(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
-                                qt3dsdm::CUICDMPropertyHandle inProperty, float inKeyframeTime,
+    CCmdDataModelInsertKeyframe(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                qt3dsdm::Qt3DSDMPropertyHandle inProperty, float inKeyframeTime,
                                 qt3dsdm::SGetOrSetKeyframeInfo *inInfos, size_t inInfoCount)
         : qt3dsdm::CmdDataModel(*inDoc)
         , m_Doc(inDoc)
@@ -88,7 +88,7 @@ public: // Construction
     }
     ~CCmdDataModelInsertKeyframe() {}
 
-    void AddKeyframeData(qt3dsdm::CUICDMPropertyHandle inProperty, float inTime,
+    void AddKeyframeData(qt3dsdm::Qt3DSDMPropertyHandle inProperty, float inTime,
                          qt3dsdm::SGetOrSetKeyframeInfo *inInfos, size_t inInfoCount)
     {
         m_KeyframeDataList.push_back(STimeKeyframeData(inProperty, inTime, inInfos, inInfoCount));
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
index a0007b0e..d1253765 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.cpp
@@ -145,7 +145,7 @@ void CCmdLocateReference::LocateReference()
  * @param inInstance		the instance to update
  * @param inSpecificSlide	the slide to update, if valid
  */
-void CCmdLocateReference::UpdateSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CCmdLocateReference::UpdateSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                            qt3dsdm::CUICDMSlideHandle inSpecificSlide)
 {
     // Get the sourcepath value
@@ -168,7 +168,7 @@ void CCmdLocateReference::UpdateSourcePath(qt3dsdm::CUICDMInstanceHandle inInsta
  * @param outPath			the sourcepath without the identifier
  * @param outIdentifier		the identifier
  */
-void CCmdLocateReference::GetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CCmdLocateReference::GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                         qt3dsdm::CUICDMSlideHandle inSpecificSlide,
                                         Q3DStudio::CFilePath &outPath,
                                         Q3DStudio::CString &outIdentifier)
@@ -208,7 +208,7 @@ void CCmdLocateReference::GetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance
  * @param inPath			the sourcepath without the identifier
  * @param inIdentifier		the identifier
  */
-void CCmdLocateReference::SetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CCmdLocateReference::SetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                         qt3dsdm::CUICDMSlideHandle 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 b231b6d8..048a4ece 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdLocateReference.h
@@ -89,12 +89,12 @@ public:
 
 protected:
     void LocateReference();
-    void UpdateSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void UpdateSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                           qt3dsdm::CUICDMSlideHandle inSpecificSlide = 0);
-    void GetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                        qt3dsdm::CUICDMSlideHandle inSpecificSlide, Q3DStudio::CFilePath &outPath,
                        Q3DStudio::CString &outIdentifier);
-    void SetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void SetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                        qt3dsdm::CUICDMSlideHandle inSpecificSlide, const Q3DStudio::CFilePath &inPath,
                        const Q3DStudio::CString &inIdentifier);
 
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
index c50b7f15..c69c387d 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
@@ -120,13 +120,13 @@ void CDispatch::FireEndDataModelNotifications()
     }
 }
 
-void CDispatch::FireImmediateRefreshInstance(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDispatch::FireImmediateRefreshInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     m_DataModelListeners.FireEvent(&IDataModelListener::OnImmediateRefreshInstanceSingle,
                                    inInstance);
 }
 
-void CDispatch::FireImmediateRefreshInstance(qt3dsdm::CUICDMInstanceHandle *inInstances,
+void CDispatch::FireImmediateRefreshInstance(qt3dsdm::Qt3DSDMInstanceHandle *inInstances,
                                              long inInstanceCount)
 {
     m_DataModelListeners.FireEvent(&IDataModelListener::OnImmediateRefreshInstanceMultiple,
@@ -143,7 +143,7 @@ void CDispatch::RemoveReloadListener(IReloadListener *inListener)
     m_ReloadListeners.RemoveListener(inListener);
 }
 
-void CDispatch::FireReloadEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDispatch::FireReloadEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     m_ReloadListeners.FireEvent(&IReloadListener::OnReloadEffectInstance, inInstance);
 }
@@ -335,7 +335,7 @@ void CDispatch::FireOnSavingPresentation(const CUICFile *inNewPresentationFile)
                                             inNewPresentationFile);
 }
 
-void CDispatch::FireOnExportingAsset(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDispatch::FireOnExportingAsset(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnExportingAsset,
                                             inInstance);
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.h b/src/Authoring/Client/Code/Core/Core/Dispatch.h
index e01df4fb..142fd6f1 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.h
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.h
@@ -100,13 +100,13 @@ public:
     // is dragged (or when multiple keyframes are dragged.
     // Most views should ignore this or ensure they filter the message by at least their instance.
     // Inproperty may be 0 in which case it should be assumed all properties may have changed
-    void FireImmediateRefreshInstance(qt3dsdm::CUICDMInstanceHandle inInstance);
-    void FireImmediateRefreshInstance(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    void FireImmediateRefreshInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    void FireImmediateRefreshInstance(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                       long inInstanceCount);
 
     void AddReloadListener(IReloadListener *inListener);
     void RemoveReloadListener(IReloadListener *inListener);
-    void FireReloadEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void FireReloadEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
     void AddDocumentBufferCacheListener(IDocumentBufferCacheListener *inListener);
     void RemoveDocumentBufferCacheListener(IDocumentBufferCacheListener *inListener);
@@ -138,7 +138,7 @@ public:
     void FireOnNewPresentation();
     void FireOnClosingPresentation();
     void FireOnSavingPresentation(const CUICFile *inNewPresentationFile = NULL);
-    void FireOnExportingAsset(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void FireOnExportingAsset(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void FireOnPresentationModifiedExternally();
 
     void AddClientPlayChangeListener(CClientPlayChangeListener *inListener);
@@ -250,9 +250,9 @@ struct CDispatchDataModelNotificationScope
 struct CDispatchDataModelImmediateScope
 {
     CDispatch &m_Dispatch;
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
 
-    CDispatchDataModelImmediateScope(CDispatch &dispatch, qt3dsdm::CUICDMInstanceHandle instance)
+    CDispatchDataModelImmediateScope(CDispatch &dispatch, qt3dsdm::Qt3DSDMInstanceHandle instance)
         : m_Dispatch(dispatch)
         , m_Instance(instance)
     {
diff --git a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
index bd94ccba..e4bcd5b4 100644
--- a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
+++ b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
@@ -184,7 +184,7 @@ public:
         Q_UNUSED(inNewPresentationFile);
     }
 
-    virtual void OnExportingAsset(qt3dsdm::CUICDMInstanceHandle inInstance)
+    virtual void OnExportingAsset(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         Q_UNUSED(inInstance);
     }
@@ -307,16 +307,16 @@ public:
 
     // Fired during 3d drag or mouse move events (or keyframe drag) or likewise
     // events so that views that need to update based on the new data can.
-    virtual void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) = 0;
+    virtual void OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance) = 0;
     // Same thing, but fired when more than one instance is being refreshed.
-    virtual void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    virtual void OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                                     long inInstanceCount) = 0;
 };
 
 class IReloadListener
 {
 public:
-    virtual void OnReloadEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance) = 0;
+    virtual void OnReloadEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) = 0;
 };
 
 class IDocumentBufferCacheListener
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
index 0c3a442d..6fb5dba9 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
@@ -110,7 +110,7 @@ CUICDMSlideHandle CClientDataModelBridge::CreateNonMasterSlide(CUICDMSlideHandle
                                                                Q3DStudio::CId inGuid,
                                                                const Q3DStudio::CString &inName)
 {
-    CUICDMInstanceHandle theInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle theInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theInstance, m_SlideItem.m_Instance);
     m_DataCore->SetInstancePropertyValue(theInstance, m_SlideItem.m_ComponentId,
                                          GuidToLong4(inGuid));
@@ -121,8 +121,8 @@ CUICDMSlideHandle CClientDataModelBridge::CreateNonMasterSlide(CUICDMSlideHandle
 }
 
 // Get the Scene or Component Asset of inAsset by querying the Parent
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetSceneOrComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstance)
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetSceneOrComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (IsSceneInstance(inInstance) || IsComponentInstance(inInstance))
         return inInstance;
@@ -133,8 +133,8 @@ CClientDataModelBridge::GetSceneOrComponentInstance(qt3dsdm::CUICDMInstanceHandl
         // Special case for Image because Image is a property of Material. Find which Material uses
         // this image.
         // This portion of code may never get executed though, but just in case...
-        qt3dsdm::CUICDMInstanceHandle theParentInstance;
-        qt3dsdm::CUICDMPropertyHandle theProperty;
+        qt3dsdm::Qt3DSDMInstanceHandle theParentInstance;
+        qt3dsdm::Qt3DSDMPropertyHandle theProperty;
         if (!GetMaterialFromImageInstance(inInstance, theParentInstance, theProperty)) {
             GetLayerFromImageProbeInstance(inInstance, theParentInstance, theProperty);
         }
@@ -147,11 +147,11 @@ CClientDataModelBridge::GetSceneOrComponentInstance(qt3dsdm::CUICDMInstanceHandl
 }
 
 CUICDMSlideGraphHandle
-CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::CUICDMInstanceHandle inInstance)
+CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
-    qt3dsdm::CUICDMInstanceHandle theSceneComponentInstance = GetSceneOrComponentInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theSceneComponentInstance = GetSceneOrComponentInstance(inInstance);
     Q3DStudio::CId theGuid = GetGUID(theSceneComponentInstance);
-    CUICDMInstanceHandle existing = GetInstanceByGUIDDerivedFrom(
+    Qt3DSDMInstanceHandle existing = GetInstanceByGUIDDerivedFrom(
         GuidToLong4(theGuid), m_SlideItem.m_Instance, m_SlideItem.m_ComponentId);
     if (existing.Valid()) {
         // There is an implicit assumption here that the slide graph is one level deep, i.e. only
@@ -163,7 +163,7 @@ CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::CUICDMInstanceHandle inInstanc
         return m_SlideGraphCore->GetSlideGraph(theSlide);
     }
     ClearCache();
-    CUICDMInstanceHandle rootInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle rootInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(rootInstance, m_SlideItem.m_Instance);
     m_DataCore->SetInstancePropertyValue(rootInstance, m_SlideItem.m_ComponentId,
                                          GuidToLong4(theGuid));
@@ -180,7 +180,7 @@ CClientDataModelBridge::GetOrCreateGraph(qt3dsdm::CUICDMInstanceHandle inInstanc
 }
 
 CUICDMSlideHandle
-CClientDataModelBridge::GetOrCreateGraphRoot(qt3dsdm::CUICDMInstanceHandle inInstance)
+CClientDataModelBridge::GetOrCreateGraphRoot(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     return m_SlideGraphCore->GetGraphRoot(GetOrCreateGraph(inInstance));
 }
@@ -197,15 +197,15 @@ CUICDMSlideHandle GetSlideByIndex(CUICDMSlideGraphHandle inGraph, int inIndex,
     return theSlides.at(inIndex);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::CreateAssetInstance(Q3DStudio::CId &inId,
+Qt3DSDMInstanceHandle CClientDataModelBridge::CreateAssetInstance(Q3DStudio::CId &inId,
                                                                  EStudioObjectType inObjectType)
 {
-    CUICDMInstanceHandle existing = GetInstanceByGUID(inId);
+    Qt3DSDMInstanceHandle existing = GetInstanceByGUID(inId);
     if (existing.Valid())
         return existing;
 
     ClearCache();
-    CUICDMInstanceHandle theNewInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle theNewInstance = m_DataCore->CreateInstance();
     switch (inObjectType) {
     case OBJTYPE_MATERIAL:
         m_DataCore->DeriveInstance(theNewInstance, m_DefaultMaterial.m_Instance);
@@ -266,43 +266,43 @@ CUICDMInstanceHandle CClientDataModelBridge::CreateAssetInstance(Q3DStudio::CId
     return theNewInstance;
 }
 
-qt3dsdm::CUICDMInstanceHandle CClientDataModelBridge::GetSlideInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetSlideInstance()
 {
     return m_SlideItem.m_Instance;
 }
 
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetSlideComponentIdProperty()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetSlideComponentIdProperty()
 {
     return m_SlideItem.m_ComponentId;
 }
 
-qt3dsdm::CUICDMInstanceHandle CClientDataModelBridge::GetActionInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetActionInstance()
 {
     return m_ActionItem.m_Instance;
 }
 
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetActionEyeball()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetActionEyeball()
 {
     return m_ActionItem.m_ActionEyeball;
 }
 
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetImportId()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetImportId()
 {
     return m_SceneAsset.m_ImportId;
 }
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetNameProperty()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetNameProperty()
 {
     return GetObjectDefinitions().m_Named.m_NameProp;
 }
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetIdProperty()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetIdProperty()
 {
     return GetObjectDefinitions().m_Guided.m_GuidProp;
 }
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetTypeProperty()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetTypeProperty()
 {
     return GetObjectDefinitions().m_Typed.m_TypeProp;
 }
-qt3dsdm::CUICDMPropertyHandle CClientDataModelBridge::GetSourcePathProperty()
+qt3dsdm::Qt3DSDMPropertyHandle CClientDataModelBridge::GetSourcePathProperty()
 {
     return m_SceneAsset.m_SourcePath;
 }
@@ -321,8 +321,8 @@ bool CClientDataModelBridge::IsInternalProperty(const TCharStr &inPropertyName)
 // Find the owning component. Note: inInstanceHandle may or may not have a client representation,
 // e.g. Images do not, so we can't use CAsset::GetControllingComponent.
 // Returns NULL if can't find one or its in the scene.
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstanceHandle)
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     int theSlideIndex;
     return GetOwningComponentInstance(inInstanceHandle, theSlideIndex);
@@ -331,8 +331,8 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle
 // Find the owning component. Note: inInstanceHandle may or may not have a client representation,
 // e.g. Images do not, so we can't use CAsset::GetControllingComponent.
 // Returns NULL if can't find one or its in the scene.
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstanceHandle,
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle,
                                                    int &outSlideIndex)
 {
     if (!inInstanceHandle.Valid())
@@ -349,7 +349,7 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle
 
 // Find the owning component of the Slide Handle
 // Returns NULL if can't find one.
-qt3dsdm::CUICDMInstanceHandle
+qt3dsdm::Qt3DSDMInstanceHandle
 CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle,
                                                    int &outSlideIndex)
 {
@@ -366,7 +366,7 @@ CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle in
 
 // Find the owning component of the Slide Handle
 // Returns NULL if can't find one.
-qt3dsdm::CUICDMInstanceHandle
+qt3dsdm::Qt3DSDMInstanceHandle
 CClientDataModelBridge::GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle)
 {
     int theSlideIndex;
@@ -384,7 +384,7 @@ SLong4 CClientDataModelBridge::GetComponentGuid(qt3dsdm::CUICDMSlideHandle inSli
     if (!theMasterSlideHandle.Valid())
         return theComponentGuid;
 
-    CUICDMInstanceHandle theOwningComponentInstance =
+    Qt3DSDMInstanceHandle theOwningComponentInstance =
         theSlideSystem->GetSlideInstance(theMasterSlideHandle);
     if (!theOwningComponentInstance.Valid())
         return theComponentGuid;
@@ -404,7 +404,7 @@ SLong4 CClientDataModelBridge::GetComponentGuid(qt3dsdm::CUICDMSlideHandle inSli
  *	1. It's eyeball is on
  *	2. the current time falls within it's timebar
  */
-bool CClientDataModelBridge::IsActive(qt3dsdm::CUICDMInstanceHandle inInstanceHandle,
+bool CClientDataModelBridge::IsActive(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle,
                                       long inCurrentTime)
 {
     // Check the eyeball
@@ -435,7 +435,7 @@ bool CClientDataModelBridge::IsActive(qt3dsdm::CUICDMInstanceHandle inInstanceHa
  *	@param	inAsset		the controlling component (component or scene)
  */
 qt3dsdm::CUICDMSlideHandle
-CClientDataModelBridge::GetComponentActiveSlide(qt3dsdm::CUICDMInstanceHandle inComponent)
+CClientDataModelBridge::GetComponentActiveSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent)
 {
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = GetGUID(inComponent);
@@ -445,7 +445,7 @@ CClientDataModelBridge::GetComponentActiveSlide(qt3dsdm::CUICDMInstanceHandle in
 }
 
 qt3dsdm::CUICDMSlideHandle
-CClientDataModelBridge::GetComponentSlide(qt3dsdm::CUICDMInstanceHandle inComponent, long inIndex)
+CClientDataModelBridge::GetComponentSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent, long inIndex)
 {
     ISlideSystem *theSlideSystem = m_Doc->GetStudioSystem()->GetSlideSystem();
     Q3DStudio::CId theId = GetGUID(inComponent);
@@ -455,7 +455,7 @@ CClientDataModelBridge::GetComponentSlide(qt3dsdm::CUICDMInstanceHandle inCompon
 }
 
 //
-void CClientDataModelBridge::SetName(qt3dsdm::CUICDMInstanceHandle inInstanceHandle,
+void CClientDataModelBridge::SetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle,
                                      const Q3DStudio::CString &inName)
 {
     TDataStrPtr theName(new CDataStr(inName));
@@ -472,7 +472,7 @@ void CClientDataModelBridge::SetName(qt3dsdm::CUICDMInstanceHandle inInstanceHan
     }
 }
 
-Q3DStudio::CString CClientDataModelBridge::GetName(qt3dsdm::CUICDMInstanceHandle inInstanceHandle)
+Q3DStudio::CString CClientDataModelBridge::GetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
     TDataStrPtr theString;
@@ -486,12 +486,12 @@ Q3DStudio::CString CClientDataModelBridge::GetName(qt3dsdm::CUICDMInstanceHandle
     return (theString) ? Q3DStudio::CString(theString->GetData()) : "";
 }
 
-bool CClientDataModelBridge::IsActiveComponent(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsActiveComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace qt3dsdm;
     using namespace Q3DStudio;
     CDoc &theDoc(*m_Doc);
-    CUICDMInstanceHandle theInstance = inInstance;
+    Qt3DSDMInstanceHandle theInstance = inInstance;
     CUICDMSlideHandle theSlide = theDoc.GetActiveSlide();
     SLong4 theGuid = GetComponentGuid(theSlide);
     CId theActiveComponentId(theGuid.m_Longs[0], theGuid.m_Longs[1], theGuid.m_Longs[2],
@@ -501,11 +501,11 @@ bool CClientDataModelBridge::IsActiveComponent(qt3dsdm::CUICDMInstanceHandle inI
 }
 
 // Helper for getting the type as a wstring... returns "" if it can't figure things out
-std::wstring GetInstanceType(IPropertySystem *inPropertySystem, CUICDMInstanceHandle inInstance)
+std::wstring GetInstanceType(IPropertySystem *inPropertySystem, Qt3DSDMInstanceHandle inInstance)
 {
     std::wstring theReturn(L"");
     try {
-        CUICDMPropertyHandle theProperty =
+        Qt3DSDMPropertyHandle theProperty =
             inPropertySystem->GetAggregateInstancePropertyByName(inInstance, L"type");
         SValue theTypeValue;
         if (theProperty
@@ -521,8 +521,8 @@ std::wstring GetInstanceType(IPropertySystem *inPropertySystem, CUICDMInstanceHa
 
 // Find which material that uses this image instance
 bool CClientDataModelBridge::GetMaterialFromImageInstance(
-    qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::CUICDMInstanceHandle &outMaterialInstance,
-    qt3dsdm::CUICDMPropertyHandle &outProperty)
+    qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMInstanceHandle &outMaterialInstance,
+    qt3dsdm::Qt3DSDMPropertyHandle &outProperty)
 {
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
     SLong4 theDeletedImageLong4 =
@@ -533,7 +533,7 @@ bool CClientDataModelBridge::GetMaterialFromImageInstance(
         theInstances, m_DefaultMaterial.m_Instance); // Get all default material instances
     size_t theInstanceCount = theInstances.size();
     for (size_t theInstanceIndex = 0; theInstanceIndex < theInstanceCount; ++theInstanceIndex) {
-        CUICDMInstanceHandle theInstance = theInstances[theInstanceIndex];
+        Qt3DSDMInstanceHandle theInstance = theInstances[theInstanceIndex];
         std::wstring theWideTypeString(GetInstanceType(thePropertySystem, theInstance));
         if (theWideTypeString == L"Material") {
             TPropertyHandleList theProperties;
@@ -541,7 +541,7 @@ bool CClientDataModelBridge::GetMaterialFromImageInstance(
             size_t thePropertyCount = theProperties.size();
             for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount;
                  ++thePropertyIndex) {
-                CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+                Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
                 AdditionalMetaDataType::Value theAdditionalMetaDataType =
                     thePropertySystem->GetAdditionalMetaDataType(theInstance, theProperty);
 
@@ -562,7 +562,7 @@ bool CClientDataModelBridge::GetMaterialFromImageInstance(
         theInstances, m_CustomMaterial.m_Instance); // Get all custom material instances
     theInstanceCount = theInstances.size();
     for (size_t theInstanceIndex = 0; theInstanceIndex < theInstanceCount; ++theInstanceIndex) {
-        CUICDMInstanceHandle theInstance = theInstances[theInstanceIndex];
+        Qt3DSDMInstanceHandle theInstance = theInstances[theInstanceIndex];
         std::wstring theWideTypeString(GetInstanceType(thePropertySystem, theInstance));
         if (theWideTypeString == L"CustomMaterial") {
             TPropertyHandleList theProperties;
@@ -570,7 +570,7 @@ bool CClientDataModelBridge::GetMaterialFromImageInstance(
             size_t thePropertyCount = theProperties.size();
             for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount;
                  ++thePropertyIndex) {
-                CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+                Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
                 AdditionalMetaDataType::Value theAdditionalMetaDataType =
                     thePropertySystem->GetAdditionalMetaDataType(theInstance, theProperty);
 
@@ -590,8 +590,8 @@ bool CClientDataModelBridge::GetMaterialFromImageInstance(
 }
 
 bool CClientDataModelBridge::GetLayerFromImageProbeInstance(
-    qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::CUICDMInstanceHandle &outLayerInstance,
-    qt3dsdm::CUICDMPropertyHandle &outProperty)
+    qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMInstanceHandle &outLayerInstance,
+    qt3dsdm::Qt3DSDMPropertyHandle &outProperty)
 {
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
     SLong4 theDeletedImageLong4 =
@@ -603,7 +603,7 @@ bool CClientDataModelBridge::GetLayerFromImageProbeInstance(
     size_t theInstanceCount = theInstances.size();
 
     for (size_t theInstanceIndex = 0; theInstanceIndex < theInstanceCount; ++theInstanceIndex) {
-        CUICDMInstanceHandle theInstance = theInstances[theInstanceIndex];
+        Qt3DSDMInstanceHandle theInstance = theInstances[theInstanceIndex];
         std::wstring theWideTypeString(GetInstanceType(thePropertySystem, theInstance));
         if (theWideTypeString == L"Layer") {
             // Layer should have only one image property, which is the light probe, but this is a
@@ -614,7 +614,7 @@ bool CClientDataModelBridge::GetLayerFromImageProbeInstance(
             size_t thePropertyCount = theProperties.size();
             for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount;
                  ++thePropertyIndex) {
-                CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+                Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
                 AdditionalMetaDataType::Value theAdditionalMetaDataType =
                     thePropertySystem->GetAdditionalMetaDataType(theInstance, theProperty);
 
@@ -656,8 +656,8 @@ void CClientDataModelBridge::ClearCache()
 
 // requirement: inInstance must be derived from instance that has Guid property!
 bool CClientDataModelBridge::DerivedGuidMatches(IDataCore &inDataCore,
-                                                CUICDMInstanceHandle inInstance,
-                                                CUICDMPropertyHandle inProperty, SLong4 inGuid)
+                                                Qt3DSDMInstanceHandle inInstance,
+                                                Qt3DSDMPropertyHandle inProperty, SLong4 inGuid)
 {
     SValue theLong4;
     if (inDataCore.GetInstancePropertyValue(inInstance, inProperty, theLong4)
@@ -667,13 +667,13 @@ bool CClientDataModelBridge::DerivedGuidMatches(IDataCore &inDataCore,
     return false;
 }
 
-qt3dsdm::CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(const Q3DStudio::CId &inId)
+qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(const Q3DStudio::CId &inId)
 {
     return GetInstanceByGUID(GuidToLong4(inId));
 }
 
-void CClientDataModelBridge::ClearInstanceGUIDCache(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                    qt3dsdm::CUICDMPropertyHandle inProperty)
+void CClientDataModelBridge::ClearInstanceGUIDCache(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                    qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     if (inProperty == GetObjectDefinitions().m_Guided.m_GuidProp) {
         TInstanceToGUIDHash::iterator theEntry(m_CachedInstanceToGUIDHash.find(inInstance));
@@ -684,7 +684,7 @@ void CClientDataModelBridge::ClearInstanceGUIDCache(qt3dsdm::CUICDMInstanceHandl
     }
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(SLong4 inLong4)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(SLong4 inLong4)
 {
     if (inLong4 == SLong4(0, 0, 0, 0))
         return 0;
@@ -708,7 +708,7 @@ CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(SLong4 inLong4)
             m_CachedGUIDToInstancesHash.erase(theEntry);
         }
     }
-    CUICDMInstanceHandle retval = MaybeCacheGetInstanceByGUIDDerivedFrom(
+    Qt3DSDMInstanceHandle retval = MaybeCacheGetInstanceByGUIDDerivedFrom(
         inLong4, m_CachedGuidInstances, GetObjectDefinitions().m_Guided.m_Instance,
         GetObjectDefinitions().m_Guided.m_GuidProp);
     m_CachedGUIDToInstancesHash.insert(std::make_pair(inLong4, retval));
@@ -716,7 +716,7 @@ CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUID(SLong4 inLong4)
     return retval;
 }
 
-qt3dsdm::SLong4 CClientDataModelBridge::GetInstanceGUID(qt3dsdm::CUICDMInstanceHandle inInstance)
+qt3dsdm::SLong4 CClientDataModelBridge::GetInstanceGUID(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     std::pair<TInstanceToGUIDHash::iterator, bool> theEntry(
         m_CachedInstanceToGUIDHash.insert(std::make_pair(inInstance, SLong4())));
@@ -739,7 +739,7 @@ qt3dsdm::SLong4 CClientDataModelBridge::GetInstanceGUID(qt3dsdm::CUICDMInstanceH
     return theEntry.first->second;
 }
 
-void CClientDataModelBridge::SetInstanceGUID(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CClientDataModelBridge::SetInstanceGUID(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                              qt3dsdm::SLong4 inGuid)
 {
     m_DataCore->SetInstancePropertyValue(inInstance, GetObjectDefinitions().m_Guided.m_GuidProp,
@@ -747,68 +747,68 @@ void CClientDataModelBridge::SetInstanceGUID(qt3dsdm::CUICDMInstanceHandle inIns
     m_CachedGUIDToInstancesHash.clear();
     m_CachedInstanceToGUIDHash.clear();
     erase_if(m_CachedGuidInstances,
-             std::bind(std::equal_to<qt3dsdm::CUICDMInstanceHandle>(), inInstance,
+             std::bind(std::equal_to<qt3dsdm::Qt3DSDMInstanceHandle>(), inInstance,
                        std::placeholders::_1));
     erase_if(m_CacheImageInstances,
-             std::bind(std::equal_to<qt3dsdm::CUICDMInstanceHandle>(), inInstance,
+             std::bind(std::equal_to<qt3dsdm::Qt3DSDMInstanceHandle>(), inInstance,
                        std::placeholders::_1));
     erase_if(m_CacheMaterialInstances,
-             std::bind(std::equal_to<qt3dsdm::CUICDMInstanceHandle>(), inInstance,
+             std::bind(std::equal_to<qt3dsdm::Qt3DSDMInstanceHandle>(), inInstance,
                        std::placeholders::_1));
     erase_if(m_CacheModelInstances,
-             std::bind(std::equal_to<qt3dsdm::CUICDMInstanceHandle>(), inInstance,
+             std::bind(std::equal_to<qt3dsdm::Qt3DSDMInstanceHandle>(), inInstance,
                        std::placeholders::_1));
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetImageInstanceByGUID(const Q3DStudio::CId &inId)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetImageInstanceByGUID(const Q3DStudio::CId &inId)
 {
     return GetImageInstanceByGUID(GuidToLong4(inId));
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetImageInstanceByGUID(SLong4 inLong4)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetImageInstanceByGUID(SLong4 inLong4)
 {
     if (inLong4 == SLong4(0, 0, 0, 0)) // invalid GUID
         return 0;
     return GetInstanceByGUID(inLong4);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetMaterialInstanceByGUID(const Q3DStudio::CId &inId)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetMaterialInstanceByGUID(const Q3DStudio::CId &inId)
 {
     return GetMaterialInstanceByGUID(GuidToLong4(inId));
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetMaterialInstanceByGUID(SLong4 inLong4)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetMaterialInstanceByGUID(SLong4 inLong4)
 {
     return MaybeCacheGetInstanceByGUIDDerivedFrom(inLong4, m_CacheMaterialInstances,
                                                   m_DefaultMaterial.m_Instance,
                                                   GetObjectDefinitions().m_Guided.m_GuidProp);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetModelInstanceByGUID(const Q3DStudio::CId &inId)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetModelInstanceByGUID(const Q3DStudio::CId &inId)
 {
     return GetModelInstanceByGUID(GuidToLong4(inId));
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetModelInstanceByGUID(SLong4 inLong4)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetModelInstanceByGUID(SLong4 inLong4)
 {
     return MaybeCacheGetInstanceByGUIDDerivedFrom(inLong4, m_CacheModelInstances,
                                                   m_Model.m_Instance,
                                                   GetObjectDefinitions().m_Guided.m_GuidProp);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetComponentInstanceByGUID(const Q3DStudio::CId &inId)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetComponentInstanceByGUID(const Q3DStudio::CId &inId)
 {
     return GetComponentInstanceByGUID(GuidToLong4(inId));
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetComponentInstanceByGUID(SLong4 inLong4)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetComponentInstanceByGUID(SLong4 inLong4)
 {
     return GetInstanceByGUIDDerivedFrom(inLong4, m_SlideItem.m_Instance, m_SlideItem.m_ComponentId);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::MaybeCacheGetInstanceByGUIDDerivedFrom(
-    SLong4 inLong4, TInstanceHandleList &ioCacheInstances, CUICDMInstanceHandle inParentHandle,
-    CUICDMPropertyHandle inProperty)
+Qt3DSDMInstanceHandle CClientDataModelBridge::MaybeCacheGetInstanceByGUIDDerivedFrom(
+    SLong4 inLong4, TInstanceHandleList &ioCacheInstances, Qt3DSDMInstanceHandle inParentHandle,
+    Qt3DSDMPropertyHandle inProperty)
 {
     if (m_CacheEnabled) {
         if (ioCacheInstances.empty())
@@ -818,8 +818,8 @@ CUICDMInstanceHandle CClientDataModelBridge::MaybeCacheGetInstanceByGUIDDerivedF
         return GetInstanceByGUIDDerivedFrom(inLong4, inParentHandle, inProperty);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
-    SLong4 inLong4, CUICDMInstanceHandle inParentHandle, CUICDMPropertyHandle inProperty)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
+    SLong4 inLong4, Qt3DSDMInstanceHandle inParentHandle, Qt3DSDMPropertyHandle inProperty)
 {
     // Run through all the instances derived from parent, and if a guid matches return that
     // instance.
@@ -828,8 +828,8 @@ CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
     return GetInstanceByGUIDDerivedFrom(inLong4, instances, inProperty);
 }
 
-CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
-    SLong4 inLong4, const TInstanceHandleList &instances, CUICDMPropertyHandle inProperty)
+Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
+    SLong4 inLong4, const TInstanceHandleList &instances, Qt3DSDMPropertyHandle inProperty)
 {
     // Run through all the instances derived from parent, and if a guid matches return that
     // instance.
@@ -842,8 +842,8 @@ CUICDMInstanceHandle CClientDataModelBridge::GetInstanceByGUIDDerivedFrom(
     return 0;
 }
 
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetInstance(qt3dsdm::CUICDMInstanceHandle inRoot,
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetInstance(qt3dsdm::Qt3DSDMInstanceHandle inRoot,
                                     const qt3dsdm::SObjectRefType &inValue)
 {
     using namespace qt3dsdm;
@@ -869,7 +869,7 @@ CClientDataModelBridge::GetInstance(qt3dsdm::CUICDMInstanceHandle inRoot,
 // if it's long, it's the instance handle stored as long
 // if it's long4, it's the GUID
 // if it's a string, it's a path and so we need to decode the path to find the asset
-qt3dsdm::CUICDMInstanceHandle CClientDataModelBridge::GetInstance(qt3dsdm::CUICDMInstanceHandle inRoot,
+qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstance(qt3dsdm::Qt3DSDMInstanceHandle inRoot,
                                                                 const qt3dsdm::SValue &inValue)
 {
     using namespace qt3dsdm;
@@ -877,12 +877,12 @@ qt3dsdm::CUICDMInstanceHandle CClientDataModelBridge::GetInstance(qt3dsdm::CUICD
     return GetInstance(inRoot, ConvertToObjectRef(inValue));
 }
 
-std::pair<qt3dsdm::CUICDMInstanceHandle, qt3dsdm::SLong4>
-CClientDataModelBridge::CreateImageInstance(qt3dsdm::CUICDMInstanceHandle inSourceInstance,
-                                            CUICDMPropertyHandle inSlot,
+std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
+CClientDataModelBridge::CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
+                                            Qt3DSDMPropertyHandle inSlot,
                                             CUICDMSlideHandle inUICDMSlide)
 {
-    CUICDMInstanceHandle theNewInstance =
+    Qt3DSDMInstanceHandle theNewInstance =
         m_Doc->GetStudioSystem()
             ->GetPropertySystem()
             ->CreateInstance(); // this should call CDataCoreProducer::CreateInstance(). If there is
@@ -929,8 +929,8 @@ CClientDataModelBridge::CreateImageInstance(qt3dsdm::CUICDMInstanceHandle inSour
     return std::make_pair(theNewInstance, theInstanceLong4);
 }
 
-Q3DStudio::CId CClientDataModelBridge::GetId(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                             qt3dsdm::CUICDMPropertyHandle inProperty) const
+Q3DStudio::CId CClientDataModelBridge::GetId(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                             qt3dsdm::Qt3DSDMPropertyHandle inProperty) const
 {
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
     SValue theSourceValue;
@@ -949,15 +949,15 @@ Q3DStudio::CId CClientDataModelBridge::GetId(qt3dsdm::CUICDMInstanceHandle inIns
 }
 
 // Check whether this instance is inside the current active component
-bool CClientDataModelBridge::IsInActiveComponent(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsInActiveComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
-    qt3dsdm::CUICDMInstanceHandle theActiveRoot = m_Doc->GetActiveRootInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theActiveRoot = m_Doc->GetActiveRootInstance();
     return (theActiveRoot == GetOwningComponentInstance(inInstance));
 }
 
 // Check whether inInstance is inside inComponentInstance
-bool CClientDataModelBridge::IsInComponent(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                           qt3dsdm::CUICDMInstanceHandle inComponentInstance)
+bool CClientDataModelBridge::IsInComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                           qt3dsdm::Qt3DSDMInstanceHandle inComponentInstance)
 {
     return (GetOwningComponentInstance(inInstance) == inComponentInstance);
 }
@@ -970,14 +970,14 @@ bool CClientDataModelBridge::IsInComponent(qt3dsdm::CUICDMInstanceHandle inInsta
  * @param inIsFirstCall true if the child is to be ignored as being a component.
  * @return the parent component, or this if the parent is NULL.
  */
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetParentComponent(qt3dsdm::CUICDMInstanceHandle inInstance,
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetParentComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                            bool inIsFirstCall /*= true*/)
 {
     if (!inIsFirstCall && (IsSceneInstance(inInstance) || IsComponentInstance(inInstance)))
         return inInstance;
 
-    qt3dsdm::CUICDMInstanceHandle theParentInstance = GetParentInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theParentInstance = GetParentInstance(inInstance);
     if (theParentInstance.Valid())
         return GetParentComponent(theParentInstance, false);
     else
@@ -994,8 +994,8 @@ CClientDataModelBridge::GetParentComponent(qt3dsdm::CUICDMInstanceHandle inInsta
  *	@return a unique name that no other child has.
  */
 Q3DStudio::CString
-CClientDataModelBridge::GetUniqueChildName(qt3dsdm::CUICDMInstanceHandle inParent,
-                                           qt3dsdm::CUICDMInstanceHandle inInstance,
+CClientDataModelBridge::GetUniqueChildName(qt3dsdm::Qt3DSDMInstanceHandle inParent,
+                                           qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                            Q3DStudio::CString inDesiredName)
 {
     // fyi, if we get abc123, theBaseName gets abc and theBaseIndex gets 123
@@ -1023,7 +1023,7 @@ CClientDataModelBridge::GetUniqueChildName(qt3dsdm::CUICDMInstanceHandle inParen
         }
     }
 
-    qt3dsdm::CUICDMInstanceHandle theExistingChild = 0;
+    qt3dsdm::Qt3DSDMInstanceHandle theExistingChild = 0;
     // If there is a base name then use it
     if (theBaseName.Length() > 0)
         theExistingChild = GetChildByName(inParent, inDesiredName);
@@ -1050,10 +1050,10 @@ CClientDataModelBridge::GetUniqueChildName(qt3dsdm::CUICDMInstanceHandle inParen
     return theUniqueName;
 }
 
-bool CClientDataModelBridge::CheckNameUnique(qt3dsdm::CUICDMInstanceHandle inInstance,
+bool CClientDataModelBridge::CheckNameUnique(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                              Q3DStudio::CString inDesiredName)
 {
-    qt3dsdm::CUICDMInstanceHandle theExistingChild = 0;
+    qt3dsdm::Qt3DSDMInstanceHandle theExistingChild = 0;
     if (inDesiredName.Length() > 0)
         theExistingChild = GetChildByName(GetParentInstance(inInstance), inDesiredName);
 
@@ -1065,7 +1065,7 @@ bool CClientDataModelBridge::CheckNameUnique(qt3dsdm::CUICDMInstanceHandle inIns
  *	Get SourcePath value for this instance
  */
 Q3DStudio::CString
-CClientDataModelBridge::GetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance) const
+CClientDataModelBridge::GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     if (inInstance.Valid()) {
         qt3dsdm::SValue theValue;
@@ -1101,8 +1101,8 @@ inline void AddSourcePathToList(std::set<Q3DStudio::CString> &ioSourcePathList,
 /**
  *	Get list of values from all instances derived from inParentInstance
  */
-std::vector<SValue> CClientDataModelBridge::GetValueList(CUICDMInstanceHandle inParentInstance,
-                                                         CUICDMPropertyHandle inProperty,
+std::vector<SValue> CClientDataModelBridge::GetValueList(Qt3DSDMInstanceHandle inParentInstance,
+                                                         Qt3DSDMPropertyHandle inProperty,
                                                          IValueFilter *inFilter) const
 {
     std::vector<SValue> theValueList;
@@ -1127,8 +1127,8 @@ std::vector<SValue> CClientDataModelBridge::GetValueList(CUICDMInstanceHandle in
 /**
  *	Get list of values from all slides
  */
-void CClientDataModelBridge::GetValueListFromAllSlides(CUICDMInstanceHandle inInstance,
-                                                       CUICDMPropertyHandle inProperty,
+void CClientDataModelBridge::GetValueListFromAllSlides(Qt3DSDMInstanceHandle inInstance,
+                                                       Qt3DSDMPropertyHandle inProperty,
                                                        std::vector<SValue> &outValueList,
                                                        IValueFilter *inFilter) const
 {
@@ -1173,8 +1173,8 @@ struct SValueListFilter : public IValueFilter
         : m_Bridge(bridge)
     {
     }
-    bool KeepValue(qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMPropertyHandle /*inProperty*/,
+    bool KeepValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMPropertyHandle /*inProperty*/,
                            const qt3dsdm::SValue & /*inValue*/) override
     {
         return !m_Bridge.IsLayerInstance(inInstance);
@@ -1255,7 +1255,7 @@ std::set<Q3DStudio::CString> CClientDataModelBridge::GetFontFileList() const
 }
 
 static void GetDynamicObjecTextures(IDataCore &inDataCore, IPropertySystem &inPropertySystem,
-                                    CUICDMInstanceHandle inBaseInstance,
+                                    Qt3DSDMInstanceHandle inBaseInstance,
                                     std::vector<SValue> &outValues,
                                     const CClientDataModelBridge &inBridge)
 {
@@ -1268,7 +1268,7 @@ static void GetDynamicObjecTextures(IDataCore &inDataCore, IPropertySystem &inPr
     IPropertySystem *thePropertySystem = &inPropertySystem;
     for (TInstanceHandleList::const_iterator theIter = theDerivedInstances.begin();
          theIter != theDerivedInstances.end(); ++theIter) {
-        CUICDMInstanceHandle theInstance = *theIter;
+        Qt3DSDMInstanceHandle theInstance = *theIter;
 
         // Skip the parent instance
         // This works because when we import a custom material, we create a new class that is
@@ -1289,7 +1289,7 @@ static void GetDynamicObjecTextures(IDataCore &inDataCore, IPropertySystem &inPr
         thePropertySystem->GetAggregateInstanceProperties(theInstance, theProperties);
         size_t thePropertyCount = theProperties.size();
         for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount; ++thePropertyIndex) {
-            CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+            Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
             qt3dsdm::AdditionalMetaDataType::Value theAdditionalMetaDataType =
                 thePropertySystem->GetAdditionalMetaDataType(theInstance, theProperty);
             if (theAdditionalMetaDataType == AdditionalMetaDataType::Texture) {
@@ -1326,7 +1326,7 @@ std::set<Q3DStudio::CString> CClientDataModelBridge::GetDynamicObjectTextureList
     return theSourcePathList;
 }
 
-bool CClientDataModelBridge::IsLockedAtAll(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsLockedAtAll(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     qt3dsdm::SValue theValue;
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
@@ -1337,7 +1337,7 @@ bool CClientDataModelBridge::IsLockedAtAll(qt3dsdm::CUICDMInstanceHandle inInsta
     return false;
 }
 
-bool CClientDataModelBridge::IsDuplicateable(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsDuplicateable(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!inInstance.Valid())
         return false;
@@ -1354,7 +1354,7 @@ bool CClientDataModelBridge::IsDuplicateable(qt3dsdm::CUICDMInstanceHandle inIns
         return !IsLockedAtAll(inInstance);
 }
 
-bool CClientDataModelBridge::IsMultiSelectable(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsMultiSelectable(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!m_DataCore->IsInstance(inInstance))
         return false;
@@ -1376,7 +1376,7 @@ bool CClientDataModelBridge::IsMultiSelectable(qt3dsdm::CUICDMInstanceHandle inI
     return !IsLockedAtAll(inInstance);
 }
 
-bool CClientDataModelBridge::CanDelete(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!inInstance.Valid())
         return false;
@@ -1434,7 +1434,7 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::CUICDMInstanceHandle inInstance)
     }
 }
 
-bool CClientDataModelBridge::IsMaster(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CClientDataModelBridge::IsMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (IsSceneInstance(inInstance))
         return true;
@@ -1449,8 +1449,8 @@ bool CClientDataModelBridge::IsMaster(qt3dsdm::CUICDMInstanceHandle inInstance)
 /**
  *	Get the layer that this instance lies in.
  */
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetResidingLayer(qt3dsdm::CUICDMInstanceHandle inInstance)
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetResidingLayer(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!inInstance.Valid())
         return 0;
@@ -1458,7 +1458,7 @@ CClientDataModelBridge::GetResidingLayer(qt3dsdm::CUICDMInstanceHandle inInstanc
     if (IsLayerInstance(inInstance))
         return inInstance;
     else {
-        qt3dsdm::CUICDMInstanceHandle theParent = GetParentInstance(inInstance);
+        qt3dsdm::Qt3DSDMInstanceHandle theParent = GetParentInstance(inInstance);
         if (theParent.Valid())
             return GetResidingLayer(theParent);
         else
@@ -1474,32 +1474,32 @@ CClientDataModelBridge::GetResidingLayer(qt3dsdm::CUICDMInstanceHandle inInstanc
  *	@param inName the name of the child object to fetch.
  *	@return the child that was found.
  */
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetChildByName(qt3dsdm::CUICDMInstanceHandle inParent,
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetChildByName(qt3dsdm::Qt3DSDMInstanceHandle inParent,
                                        Q3DStudio::CString inName)
 {
     Q3DStudio::CGraphIterator theChildren;
     GetAssetChildren(m_Doc, inParent, theChildren);
 
     for (; !theChildren.IsDone(); ++theChildren) {
-        qt3dsdm::CUICDMInstanceHandle theChildInstance = theChildren.GetCurrent();
+        qt3dsdm::Qt3DSDMInstanceHandle theChildInstance = theChildren.GetCurrent();
         if (GetName(theChildInstance) == inName)
             return theChildInstance;
     }
     return 0;
 }
 
-Q3DStudio::CId CClientDataModelBridge::GetGUID(qt3dsdm::CUICDMInstanceHandle inInstance) const
+Q3DStudio::CId CClientDataModelBridge::GetGUID(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return GetId(inInstance, GetObjectDefinitions().m_Guided.m_GuidProp);
 }
 
-qt3dsdm::CUICDMInstanceHandle
-CClientDataModelBridge::GetParentInstance(qt3dsdm::CUICDMInstanceHandle inInstance)
+qt3dsdm::Qt3DSDMInstanceHandle
+CClientDataModelBridge::GetParentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (IsImageInstance(inInstance)) {
-        qt3dsdm::CUICDMInstanceHandle theParentInstance;
-        qt3dsdm::CUICDMPropertyHandle theProperty;
+        qt3dsdm::Qt3DSDMInstanceHandle theParentInstance;
+        qt3dsdm::Qt3DSDMPropertyHandle theProperty;
         if (!GetMaterialFromImageInstance(inInstance, theParentInstance, theProperty))
             this->GetLayerFromImageProbeInstance(inInstance, theParentInstance, theProperty);
         return theParentInstance;
@@ -1512,7 +1512,7 @@ CClientDataModelBridge::GetParentInstance(qt3dsdm::CUICDMInstanceHandle inInstan
     }
 }
 
-EStudioObjectType CClientDataModelBridge::GetObjectType(qt3dsdm::CUICDMInstanceHandle inInstance)
+EStudioObjectType CClientDataModelBridge::GetObjectType(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     SValue theTypeValue;
     IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
@@ -1567,102 +1567,102 @@ EStudioObjectType CClientDataModelBridge::GetObjectType(qt3dsdm::CUICDMInstanceH
     }
 }
 
-bool CClientDataModelBridge::IsBehaviorInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsBehaviorInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Behavior.m_Instance);
 }
 
-bool CClientDataModelBridge::IsCameraInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsCameraInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Camera.m_Instance);
 }
 
-bool CClientDataModelBridge::IsGroupInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsGroupInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Group.m_Instance);
 }
 
-bool CClientDataModelBridge::IsActionInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsActionInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_ActionItem.m_Instance);
 }
 
-bool CClientDataModelBridge::IsComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Component.m_Instance);
 }
 
-bool CClientDataModelBridge::IsLayerInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsLayerInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Layer.m_Instance);
 }
 
-bool CClientDataModelBridge::IsLightInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsLightInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Light.m_Instance);
 }
-bool CClientDataModelBridge::IsModelInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsModelInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Model.m_Instance);
 }
 
-bool CClientDataModelBridge::IsMaterialBaseInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsMaterialBaseInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_MaterialBase.m_Instance);
 }
 
-bool CClientDataModelBridge::IsMaterialInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsMaterialInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_DefaultMaterial.m_Instance);
 }
 
-bool CClientDataModelBridge::IsImageInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_SceneImage.m_Instance);
 }
 
-bool CClientDataModelBridge::IsSceneInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsSceneInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Scene.m_Instance);
 }
 
-bool CClientDataModelBridge::IsTextInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsTextInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Text.m_Instance);
 }
 
-bool CClientDataModelBridge::IsEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Effect.m_Instance);
 }
 
-bool CClientDataModelBridge::IsRenderPluginInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsRenderPluginInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_RenderPlugin.m_Instance);
 }
 
-bool CClientDataModelBridge::IsCustomMaterialInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsCustomMaterialInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_CustomMaterial.m_Instance);
 }
 
 bool CClientDataModelBridge::IsReferencedMaterialInstance(
-    qt3dsdm::CUICDMInstanceHandle inInstance) const
+    qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(
         inInstance, m_ObjectDefinitions->m_ReferencedMaterial.m_Instance);
 }
 
-bool CClientDataModelBridge::IsLightmapsInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsLightmapsInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Lightmaps.m_Instance);
 }
 
-bool CClientDataModelBridge::IsNodeType(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsNodeType(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, m_Node.m_Instance);
 }
-bool CClientDataModelBridge::IsSceneGraphInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const
+bool CClientDataModelBridge::IsSceneGraphInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     if (m_DataCore->IsInstance(inInstance) == false)
         return false;
@@ -1672,7 +1672,7 @@ bool CClientDataModelBridge::IsSceneGraphInstance(qt3dsdm::CUICDMInstanceHandle
         || IsEffectInstance(inInstance) || IsBehaviorInstance(inInstance);
 }
 
-bool SActionInvalidProperty::operator()(qt3dsdm::CUICDMPropertyHandle inProperty)
+bool SActionInvalidProperty::operator()(qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     using namespace qt3dsdm;
     AdditionalMetaDataType::Value theType =
@@ -1685,7 +1685,7 @@ bool SActionInvalidProperty::operator()(qt3dsdm::CUICDMPropertyHandle inProperty
 }
 
 // Get all actions that used this instance as either the trigger or target object
-void CClientDataModelBridge::GetReferencedActions(CUICDMInstanceHandle inReferencedInstance,
+void CClientDataModelBridge::GetReferencedActions(Qt3DSDMInstanceHandle inReferencedInstance,
                                                   long inReferencedMode,
                                                   TActionHandleList &outActions)
 {
@@ -1713,7 +1713,7 @@ void CClientDataModelBridge::GetReferencedActions(CUICDMInstanceHandle inReferen
 }
 
 void CClientDataModelBridge::UpdateHandlerArgumentValue(qt3dsdm::HandlerArgumentType::Value inArgType,
-                                                        qt3dsdm::CUICDMInstanceHandle inTargetObject,
+                                                        qt3dsdm::Qt3DSDMInstanceHandle inTargetObject,
                                                         qt3dsdm::SValue inOrigValue,
                                                         qt3dsdm::SValue inNewValue)
 {
@@ -1736,7 +1736,7 @@ void CClientDataModelBridge::UpdateHandlerArgumentValue(qt3dsdm::HandlerArgument
     }
 }
 
-std::wstring CClientDataModelBridge::GetDefaultHandler(CUICDMInstanceHandle inInstance,
+std::wstring CClientDataModelBridge::GetDefaultHandler(Qt3DSDMInstanceHandle inInstance,
                                                        std::wstring inOldHandler)
 {
     IMetaData *theMetaData = m_Doc->GetStudioSystem()->GetActionMetaData();
@@ -1768,7 +1768,7 @@ std::wstring CClientDataModelBridge::GetDefaultHandler(CUICDMInstanceHandle inIn
     return theHandlerName;
 }
 
-std::wstring CClientDataModelBridge::GetDefaultEvent(CUICDMInstanceHandle inInstance,
+std::wstring CClientDataModelBridge::GetDefaultEvent(Qt3DSDMInstanceHandle inInstance,
                                                      std::wstring inOldEvent)
 {
     IMetaData *theMetaData = m_Doc->GetStudioSystem()->GetActionMetaData();
@@ -1827,7 +1827,7 @@ void CClientDataModelBridge::ResetHandlerArguments(CUICDMActionHandle inAction,
                 break;
             case HandlerArgumentType::Property: {
                 SActionInfo theActionInfo = theActionCore->GetActionInfo(inAction);
-                CUICDMInstanceHandle theTargetObject =
+                Qt3DSDMInstanceHandle theTargetObject =
                     GetInstance(theActionInfo.m_Owner, theActionInfo.m_TargetObject);
                 qt3dsdm::TPropertyHandleList theProperties;
                 m_DataCore->GetAggregateInstanceProperties(theTargetObject, theProperties);
@@ -1855,8 +1855,8 @@ void CClientDataModelBridge::ResetHandlerArguments(CUICDMActionHandle inAction,
         const SActionInfo &theActionInfo = theActionCore->GetActionInfo(inAction);
         DataModelDataType::Value theDataType = DataModelDataType::None;
         CUICDMHandlerArgHandle theDependentArg = 0;
-        CUICDMInstanceHandle theDependentInstance;
-        CUICDMPropertyHandle theDependentProperty;
+        Qt3DSDMInstanceHandle theDependentInstance;
+        Qt3DSDMPropertyHandle theDependentProperty;
         for (THandlerArgHandleList::const_iterator theIterator =
                  theActionInfo.m_HandlerArgs.begin();
              theIterator != theActionInfo.m_HandlerArgs.end(); ++theIterator) {
@@ -1894,11 +1894,11 @@ void CClientDataModelBridge::ResetHandlerArguments(qt3dsdm::CUICDMActionHandle i
 }
 
 qt3dsdm::CUICDMEventHandle
-CClientDataModelBridge::ResolveEvent(qt3dsdm::CUICDMInstanceHandle inResolveRoot,
+CClientDataModelBridge::ResolveEvent(qt3dsdm::Qt3DSDMInstanceHandle inResolveRoot,
                                      const qt3dsdm::SObjectRefType &inResolution,
                                      const std::wstring &inEventName)
 {
-    CUICDMInstanceHandle theInstance = GetInstance(inResolveRoot, inResolution);
+    Qt3DSDMInstanceHandle theInstance = GetInstance(inResolveRoot, inResolution);
     if (theInstance.Valid() == false)
         return 0;
     IMetaData &theMetaData(*m_Doc->GetStudioSystem()->GetActionMetaData());
@@ -1906,11 +1906,11 @@ CClientDataModelBridge::ResolveEvent(qt3dsdm::CUICDMInstanceHandle inResolveRoot
 }
 
 qt3dsdm::CUICDMHandlerHandle
-CClientDataModelBridge::ResolveHandler(qt3dsdm::CUICDMInstanceHandle inResolveRoot,
+CClientDataModelBridge::ResolveHandler(qt3dsdm::Qt3DSDMInstanceHandle inResolveRoot,
                                        const qt3dsdm::SObjectRefType &inResolution,
                                        const std::wstring &inHandlerName)
 {
-    CUICDMInstanceHandle theInstance = GetInstance(inResolveRoot, inResolution);
+    Qt3DSDMInstanceHandle theInstance = GetInstance(inResolveRoot, inResolution);
     if (theInstance.Valid() == false)
         return 0;
     IMetaData &theMetaData(*m_Doc->GetStudioSystem()->GetActionMetaData());
@@ -1941,11 +1941,11 @@ void CClientDataModelBridge::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHa
         // this property
         const SActionInfo &theActionInfo =
             theActionCore->GetActionInfo(theHandlerArgument.m_Action);
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             GetInstance(theActionInfo.m_Owner, theActionInfo.m_TargetObject);
         TCharStr thePropertyName =
             qt3dsdm::get<qt3dsdm::TDataStrPtr>(theHandlerArgument.m_Value)->GetData();
-        CUICDMPropertyHandle thePropertyHandle =
+        Qt3DSDMPropertyHandle thePropertyHandle =
             GetAggregateInstancePropertyByName(theInstance, thePropertyName);
         DataModelDataType::Value theDataType = thePropertySystem->GetDataType(thePropertyHandle);
 
@@ -1965,8 +1965,8 @@ void CClientDataModelBridge::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHa
 }
 
 void CClientDataModelBridge::GetActionDependentProperty(CUICDMActionHandle inAction,
-                                                        CUICDMInstanceHandle &outInstance,
-                                                        CUICDMPropertyHandle &outProperty)
+                                                        Qt3DSDMInstanceHandle &outInstance,
+                                                        Qt3DSDMPropertyHandle &outProperty)
 {
     IActionCore *theActionCore = m_Doc->GetStudioSystem()->GetActionCore();
     const SActionInfo &theActionInfo = theActionCore->GetActionInfo(inAction);
@@ -1988,7 +1988,7 @@ void CClientDataModelBridge::GetSlideNamesOfAction(qt3dsdm::CUICDMActionHandle i
                                                    std::list<Q3DStudio::CString> &outSlideNames)
 {
     SActionInfo theActionInfo = m_Doc->GetStudioSystem()->GetActionCore()->GetActionInfo(inAction);
-    CUICDMInstanceHandle theTargetInstance =
+    Qt3DSDMInstanceHandle theTargetInstance =
         GetInstance(theActionInfo.m_Owner, theActionInfo.m_TargetObject);
     Q3DStudio::CId theTargetId = GetGUID(theTargetInstance);
 
@@ -2002,14 +2002,14 @@ void CClientDataModelBridge::GetSlideNamesOfAction(qt3dsdm::CUICDMActionHandle i
     {
         CUICDMSlideHandle theSlideHandle =
             theSlideSystem->GetSlideByIndex(theMasterSlide, theSlideIndex);
-        CUICDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theSlideHandle);
+        Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theSlideHandle);
         outSlideNames.push_back(GetName(theInstanceHandle));
     }
 }
 
 void CClientDataModelBridge::SetArgTypeDependentDefaultValue(
     CUICDMHandlerArgHandle inHandlerArgument, DataModelDataType::Value inDataType,
-    CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+    Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     SValue theValue;
     SetDefault(inDataType, theValue);
@@ -2028,7 +2028,7 @@ void CClientDataModelBridge::SetArgTypeDependentDefaultValue(
     m_Doc->GetStudioSystem()->GetActionCore()->SetHandlerArgumentValue(inHandlerArgument, theValue);
 }
 
-void CClientDataModelBridge::GetEvents(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CClientDataModelBridge::GetEvents(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                        qt3dsdm::TEventHandleList &outEvents)
 {
     if (m_Doc->GetStudioSystem()->IsInstance(inInstance))
@@ -2042,7 +2042,7 @@ qt3dsdm::SEventInfo CClientDataModelBridge::GetEventInfo(qt3dsdm::CUICDMEventHan
     return m_Doc->GetStudioSystem()->GetActionMetaData()->GetEventInfo(inEvent);
 }
 
-void CClientDataModelBridge::GetHandlers(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CClientDataModelBridge::GetHandlers(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                          qt3dsdm::THandlerHandleList &outHandles)
 {
     if (m_Doc->GetStudioSystem()->IsInstance(inInstance))
@@ -2056,8 +2056,8 @@ qt3dsdm::SHandlerInfo CClientDataModelBridge::GetHandlerInfo(qt3dsdm::CUICDMHand
     return m_Doc->GetStudioSystem()->GetActionMetaData()->GetHandlerInfo(inHandler);
 }
 
-CUICDMPropertyHandle
-CClientDataModelBridge::GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle
+CClientDataModelBridge::GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                            const TCharStr &inPropertyName)
 {
     return m_DataCore->GetAggregateInstancePropertyByName(inInstance, inPropertyName);
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
index dcd7af38..11c57eac 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
@@ -95,21 +95,21 @@ typedef qt3dsdm::SComposerObjectDefinition<qt3dsdm::ComposerObjectTypes::Path> S
 struct IValueFilter
 {
     virtual ~IValueFilter() {}
-    virtual bool KeepValue(qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMPropertyHandle inProperty,
+    virtual bool KeepValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                            const qt3dsdm::SValue &inValue) = 0;
 };
 
 struct SActionInvalidProperty
 {
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
     qt3dsdm::IPropertySystem &m_PropertySystem;
-    SActionInvalidProperty(qt3dsdm::IPropertySystem &ps, qt3dsdm::CUICDMInstanceHandle inInstance)
+    SActionInvalidProperty(qt3dsdm::IPropertySystem &ps, qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         : m_Instance(inInstance)
         , m_PropertySystem(ps)
     {
     }
-    bool operator()(qt3dsdm::CUICDMPropertyHandle inProperty);
+    bool operator()(qt3dsdm::Qt3DSDMPropertyHandle inProperty);
 };
 
 class CClientDataModelBridge
@@ -150,7 +150,7 @@ class CClientDataModelBridge
     // cache to increase performance
     bool m_CacheEnabled;
 
-    typedef std::unordered_map<qt3dsdm::SLong4, qt3dsdm::CUICDMInstanceHandle, SLong4Hasher>
+    typedef std::unordered_map<qt3dsdm::SLong4, qt3dsdm::Qt3DSDMInstanceHandle, SLong4Hasher>
         TGUIDInstanceHash;
     typedef std::unordered_map<int, qt3dsdm::SLong4> TInstanceToGUIDHash;
 
@@ -173,19 +173,19 @@ public:
                            CDoc *inDoc);
     virtual ~CClientDataModelBridge();
 
-    virtual qt3dsdm::CUICDMInstanceHandle CreateAssetInstance(Q3DStudio::CId &inId,
+    virtual qt3dsdm::Qt3DSDMInstanceHandle CreateAssetInstance(Q3DStudio::CId &inId,
                                                             EStudioObjectType inObjectType);
-    virtual qt3dsdm::CUICDMSlideGraphHandle GetOrCreateGraph(qt3dsdm::CUICDMInstanceHandle inInstance);
-    virtual qt3dsdm::CUICDMSlideHandle GetOrCreateGraphRoot(qt3dsdm::CUICDMInstanceHandle inInstance);
-    virtual qt3dsdm::CUICDMInstanceHandle GetSlideInstance();
-    virtual qt3dsdm::CUICDMPropertyHandle GetSlideComponentIdProperty();
-    virtual qt3dsdm::CUICDMPropertyHandle GetNameProperty();
-    virtual qt3dsdm::CUICDMPropertyHandle GetIdProperty();
-    virtual qt3dsdm::CUICDMPropertyHandle GetTypeProperty();
-    virtual qt3dsdm::CUICDMPropertyHandle GetSourcePathProperty();
-    virtual qt3dsdm::CUICDMInstanceHandle GetActionInstance();
-    virtual qt3dsdm::CUICDMPropertyHandle GetActionEyeball();
-    virtual qt3dsdm::CUICDMPropertyHandle GetImportId();
+    virtual qt3dsdm::CUICDMSlideGraphHandle GetOrCreateGraph(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    virtual qt3dsdm::CUICDMSlideHandle GetOrCreateGraphRoot(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetSlideInstance();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetSlideComponentIdProperty();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetNameProperty();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetIdProperty();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetTypeProperty();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetSourcePathProperty();
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetActionInstance();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetActionEyeball();
+    virtual qt3dsdm::Qt3DSDMPropertyHandle GetImportId();
 
     virtual qt3dsdm::SComposerObjectDefinitions &GetObjectDefinitions()
     {
@@ -198,21 +198,21 @@ public:
 
     virtual bool IsInternalProperty(const qt3dsdm::TCharStr &inPropertyName) const;
 
-    virtual qt3dsdm::CUICDMInstanceHandle
-    GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstanceHandle);
-    virtual qt3dsdm::CUICDMInstanceHandle
-    GetOwningComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstanceHandle, int &outSlideIndex);
-    virtual qt3dsdm::CUICDMInstanceHandle
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
+    GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
+    GetOwningComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, int &outSlideIndex);
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
     GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle, int &outSlideIndex);
-    virtual qt3dsdm::CUICDMInstanceHandle
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
     GetOwningComponentInstance(qt3dsdm::CUICDMSlideHandle inSlideHandle);
     virtual qt3dsdm::SLong4 GetComponentGuid(qt3dsdm::CUICDMSlideHandle inSlideHandle);
 
-    virtual bool IsActive(qt3dsdm::CUICDMInstanceHandle inInstanceHandle, long inCurrentTime);
+    virtual bool IsActive(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, long inCurrentTime);
 
     virtual qt3dsdm::CUICDMSlideHandle
-    GetComponentActiveSlide(qt3dsdm::CUICDMInstanceHandle inComponent);
-    virtual qt3dsdm::CUICDMSlideHandle GetComponentSlide(qt3dsdm::CUICDMInstanceHandle inComponent,
+    GetComponentActiveSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent);
+    virtual qt3dsdm::CUICDMSlideHandle GetComponentSlide(qt3dsdm::Qt3DSDMInstanceHandle inComponent,
                                                        long inIndex);
 
     const SDataModelDefaultMaterial &GetDefaultMaterial() const { return m_DefaultMaterial; }
@@ -235,36 +235,36 @@ public:
     const SDataModelLightmaps &GetLightmaps() const { return m_Lightmaps; }
 
     // Is this the instance that owns the document's currently active slide?
-    bool IsActiveComponent(qt3dsdm::CUICDMInstanceHandle inInstance);
+    bool IsActiveComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
 public: // Operations which likely don't belong on this class
-    virtual bool GetMaterialFromImageInstance(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                              qt3dsdm::CUICDMInstanceHandle &outMaterialInstance,
-                                              qt3dsdm::CUICDMPropertyHandle &outProperty);
-    virtual bool GetLayerFromImageProbeInstance(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                qt3dsdm::CUICDMInstanceHandle &outLayerInstance,
-                                                qt3dsdm::CUICDMPropertyHandle &outProperty);
+    virtual bool GetMaterialFromImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                              qt3dsdm::Qt3DSDMInstanceHandle &outMaterialInstance,
+                                              qt3dsdm::Qt3DSDMPropertyHandle &outProperty);
+    virtual bool GetLayerFromImageProbeInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                qt3dsdm::Qt3DSDMInstanceHandle &outLayerInstance,
+                                                qt3dsdm::Qt3DSDMPropertyHandle &outProperty);
 
 public: // Bridging to Actions. These needs to be here as UICDM has no hierarchy info and we need to
         // resolve the path to idenitfy the object referenced
     // We should really reconsider to have the hierachcy store outside of UICDM.
-    void GetReferencedActions(qt3dsdm::CUICDMInstanceHandle inReferencedInstance,
+    void GetReferencedActions(qt3dsdm::Qt3DSDMInstanceHandle inReferencedInstance,
                               long inReferencedMode, qt3dsdm::TActionHandleList &outActions);
     void UpdateHandlerArgumentValue(qt3dsdm::HandlerArgumentType::Value inArgType,
-                                    qt3dsdm::CUICDMInstanceHandle inTargetObject,
+                                    qt3dsdm::Qt3DSDMInstanceHandle inTargetObject,
                                     qt3dsdm::SValue inOrigValue, qt3dsdm::SValue inNewValue);
-    std::wstring GetDefaultHandler(qt3dsdm::CUICDMInstanceHandle inInstance,
+    std::wstring GetDefaultHandler(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                    std::wstring inOldHandler = L"");
-    std::wstring GetDefaultEvent(qt3dsdm::CUICDMInstanceHandle inInstance,
+    std::wstring GetDefaultEvent(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                  std::wstring inOldEvent = L"");
     void ResetHandlerArguments(qt3dsdm::CUICDMActionHandle inAction,
                                qt3dsdm::CUICDMHandlerHandle inHandler);
     // Resolve the path
     void ResetHandlerArguments(qt3dsdm::CUICDMActionHandle inAction, const std::wstring &inHandler);
-    qt3dsdm::CUICDMEventHandle ResolveEvent(qt3dsdm::CUICDMInstanceHandle inResolveRoot,
+    qt3dsdm::CUICDMEventHandle ResolveEvent(qt3dsdm::Qt3DSDMInstanceHandle inResolveRoot,
                                           const qt3dsdm::SObjectRefType &inResolution,
                                           const std::wstring &inEventName);
-    qt3dsdm::CUICDMHandlerHandle ResolveHandler(qt3dsdm::CUICDMInstanceHandle inResolveRoot,
+    qt3dsdm::CUICDMHandlerHandle ResolveHandler(qt3dsdm::Qt3DSDMInstanceHandle inResolveRoot,
                                               const qt3dsdm::SObjectRefType &inResolution,
                                               const std::wstring &inHandlerName);
     qt3dsdm::CUICDMEventHandle ResolveEvent(const qt3dsdm::SActionInfo &inInfo);
@@ -272,44 +272,44 @@ public: // Bridging to Actions. These needs to be here as UICDM has no hierarchy
     void SetHandlerArgumentValue(qt3dsdm::CUICDMHandlerArgHandle inHandlerArgument,
                                  const qt3dsdm::SValue &inValue);
     void GetActionDependentProperty(qt3dsdm::CUICDMActionHandle inAction,
-                                    qt3dsdm::CUICDMInstanceHandle &outInstance,
-                                    qt3dsdm::CUICDMPropertyHandle &outProperty);
+                                    qt3dsdm::Qt3DSDMInstanceHandle &outInstance,
+                                    qt3dsdm::Qt3DSDMPropertyHandle &outProperty);
     void GetSlideNamesOfAction(qt3dsdm::CUICDMActionHandle inAction,
                                std::list<Q3DStudio::CString> &outSlideNames);
 
 protected:
     void SetArgTypeDependentDefaultValue(qt3dsdm::CUICDMHandlerArgHandle inHandlerArgument,
                                          qt3dsdm::DataModelDataType::Value inDataType,
-                                         qt3dsdm::CUICDMInstanceHandle inInstance,
-                                         qt3dsdm::CUICDMPropertyHandle inProperty);
+                                         qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                         qt3dsdm::Qt3DSDMPropertyHandle inProperty);
 
 public: // TODO: We should really consider having CStudioCoreSystem or CStudioFullSystem manages the
         // MetaData, so that we can query directly from within
-    void GetEvents(qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::TEventHandleList &outEvents);
+    void GetEvents(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::TEventHandleList &outEvents);
     qt3dsdm::SEventInfo GetEventInfo(qt3dsdm::CUICDMEventHandle inEvent);
 
-    void GetHandlers(qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::THandlerHandleList &outHandles);
+    void GetHandlers(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::THandlerHandleList &outHandles);
     qt3dsdm::SHandlerInfo GetHandlerInfo(qt3dsdm::CUICDMHandlerHandle inHandler);
 
-    qt3dsdm::CUICDMPropertyHandle
-    GetAggregateInstancePropertyByName(qt3dsdm::CUICDMInstanceHandle inInstance,
+    qt3dsdm::Qt3DSDMPropertyHandle
+    GetAggregateInstancePropertyByName(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                        const qt3dsdm::TCharStr &inStr);
 
 private:
-    qt3dsdm::CUICDMInstanceHandle
-    GetInstanceByGUIDDerivedFrom(qt3dsdm::SLong4 inLong4, qt3dsdm::CUICDMInstanceHandle inParentHandle,
-                                 qt3dsdm::CUICDMPropertyHandle inProperty);
-    qt3dsdm::CUICDMInstanceHandle
+    qt3dsdm::Qt3DSDMInstanceHandle
+    GetInstanceByGUIDDerivedFrom(qt3dsdm::SLong4 inLong4, qt3dsdm::Qt3DSDMInstanceHandle inParentHandle,
+                                 qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    qt3dsdm::Qt3DSDMInstanceHandle
     GetInstanceByGUIDDerivedFrom(qt3dsdm::SLong4 inLong4, const qt3dsdm::TInstanceHandleList &instances,
-                                 qt3dsdm::CUICDMPropertyHandle inProperty);
-    qt3dsdm::CUICDMInstanceHandle MaybeCacheGetInstanceByGUIDDerivedFrom(
+                                 qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    qt3dsdm::Qt3DSDMInstanceHandle MaybeCacheGetInstanceByGUIDDerivedFrom(
         qt3dsdm::SLong4 inLong4, qt3dsdm::TInstanceHandleList &ioCacheInstances,
-        qt3dsdm::CUICDMInstanceHandle inParentHandle, qt3dsdm::CUICDMPropertyHandle inProperty);
+        qt3dsdm::Qt3DSDMInstanceHandle inParentHandle, qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     static bool DerivedGuidMatches(qt3dsdm::IDataCore &inDataCore,
-                                   qt3dsdm::CUICDMInstanceHandle inInstance,
-                                   qt3dsdm::CUICDMPropertyHandle inProperty, qt3dsdm::SLong4 inGuid);
+                                   qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                   qt3dsdm::Qt3DSDMPropertyHandle inProperty, qt3dsdm::SLong4 inGuid);
     void ClearCache();
-    qt3dsdm::CUICDMInstanceHandle GetSceneOrComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetSceneOrComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     qt3dsdm::CUICDMSlideHandle CreateNonMasterSlide(qt3dsdm::CUICDMSlideHandle inMasterSlide,
                                                   Q3DStudio::CId inGuid,
                                                   const Q3DStudio::CString &inName);
@@ -317,102 +317,102 @@ private:
 public: // helpers
     void BeginRender(); // enable cache to increase performance
     void EndRender(); // disable cache
-    qt3dsdm::CUICDMInstanceHandle GetInstanceByGUID(const Q3DStudio::CId &inId);
-    qt3dsdm::CUICDMInstanceHandle GetInstanceByGUID(qt3dsdm::SLong4 inLong4);
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstanceByGUID(const Q3DStudio::CId &inId);
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstanceByGUID(qt3dsdm::SLong4 inLong4);
     // GUIDS are auto-generated, but is sometimes necessary to hard-set a specific guid
-    qt3dsdm::SLong4 GetInstanceGUID(qt3dsdm::CUICDMInstanceHandle);
-    void SetInstanceGUID(qt3dsdm::CUICDMInstanceHandle, qt3dsdm::SLong4 inGuid);
-    void ClearInstanceGUIDCache(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                qt3dsdm::CUICDMPropertyHandle inProperty);
-    qt3dsdm::CUICDMInstanceHandle GetImageInstanceByGUID(const Q3DStudio::CId &inId);
-    qt3dsdm::CUICDMInstanceHandle GetImageInstanceByGUID(qt3dsdm::SLong4 inLong4);
-    qt3dsdm::CUICDMInstanceHandle GetMaterialInstanceByGUID(const Q3DStudio::CId &inId);
-    qt3dsdm::CUICDMInstanceHandle GetMaterialInstanceByGUID(qt3dsdm::SLong4 inLong4);
-    qt3dsdm::CUICDMInstanceHandle GetModelInstanceByGUID(const Q3DStudio::CId &inId);
-    qt3dsdm::CUICDMInstanceHandle GetModelInstanceByGUID(qt3dsdm::SLong4 inLong4);
-    qt3dsdm::CUICDMInstanceHandle GetComponentInstanceByGUID(const Q3DStudio::CId &inId);
-    qt3dsdm::CUICDMInstanceHandle GetComponentInstanceByGUID(qt3dsdm::SLong4 inLong4);
-    qt3dsdm::CUICDMInstanceHandle GetInstance(qt3dsdm::CUICDMInstanceHandle inRoot,
+    qt3dsdm::SLong4 GetInstanceGUID(qt3dsdm::Qt3DSDMInstanceHandle);
+    void SetInstanceGUID(qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4 inGuid);
+    void ClearInstanceGUIDCache(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    qt3dsdm::Qt3DSDMInstanceHandle GetImageInstanceByGUID(const Q3DStudio::CId &inId);
+    qt3dsdm::Qt3DSDMInstanceHandle GetImageInstanceByGUID(qt3dsdm::SLong4 inLong4);
+    qt3dsdm::Qt3DSDMInstanceHandle GetMaterialInstanceByGUID(const Q3DStudio::CId &inId);
+    qt3dsdm::Qt3DSDMInstanceHandle GetMaterialInstanceByGUID(qt3dsdm::SLong4 inLong4);
+    qt3dsdm::Qt3DSDMInstanceHandle GetModelInstanceByGUID(const Q3DStudio::CId &inId);
+    qt3dsdm::Qt3DSDMInstanceHandle GetModelInstanceByGUID(qt3dsdm::SLong4 inLong4);
+    qt3dsdm::Qt3DSDMInstanceHandle GetComponentInstanceByGUID(const Q3DStudio::CId &inId);
+    qt3dsdm::Qt3DSDMInstanceHandle GetComponentInstanceByGUID(qt3dsdm::SLong4 inLong4);
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstance(qt3dsdm::Qt3DSDMInstanceHandle inRoot,
                                             const qt3dsdm::SValue &inValue);
-    qt3dsdm::CUICDMInstanceHandle GetInstance(qt3dsdm::CUICDMInstanceHandle inRoot,
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstance(qt3dsdm::Qt3DSDMInstanceHandle inRoot,
                                             const qt3dsdm::SObjectRefType &inValue);
     qt3dsdm::TInstanceHandleList GetItemBaseInstances() const;
 
-    std::pair<qt3dsdm::CUICDMInstanceHandle, qt3dsdm::SLong4>
-    CreateImageInstance(qt3dsdm::CUICDMInstanceHandle inSourceInstance,
-                        qt3dsdm::CUICDMPropertyHandle inSlot, qt3dsdm::CUICDMSlideHandle inUICDMSlide);
+    std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
+    CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
+                        qt3dsdm::Qt3DSDMPropertyHandle inSlot, qt3dsdm::CUICDMSlideHandle inUICDMSlide);
 
-    void SetName(qt3dsdm::CUICDMInstanceHandle inInstanceHandle, const Q3DStudio::CString &inName);
-    Q3DStudio::CString GetName(qt3dsdm::CUICDMInstanceHandle inInstanceHandle);
+    void SetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, const Q3DStudio::CString &inName);
+    Q3DStudio::CString GetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
 
     // Convenience functions to get GUID property value from instance handle
 private:
-    Q3DStudio::CId GetId(qt3dsdm::CUICDMInstanceHandle inInstance,
-                         qt3dsdm::CUICDMPropertyHandle inProperty) const;
+    Q3DStudio::CId GetId(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                         qt3dsdm::Qt3DSDMPropertyHandle inProperty) const;
 
     // Helper for old methods in CAsset
 public:
-    bool IsInActiveComponent(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool IsInComponent(qt3dsdm::CUICDMInstanceHandle inInstance,
-                       qt3dsdm::CUICDMInstanceHandle inComponentInstance);
-    qt3dsdm::CUICDMInstanceHandle GetParentComponent(qt3dsdm::CUICDMInstanceHandle inInstance,
+    bool IsInActiveComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool IsInComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                       qt3dsdm::Qt3DSDMInstanceHandle inComponentInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetParentComponent(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                    bool inIsFirstCall = true);
-    Q3DStudio::CString GetUniqueChildName(qt3dsdm::CUICDMInstanceHandle inParent,
-                                          qt3dsdm::CUICDMInstanceHandle inInstance,
+    Q3DStudio::CString GetUniqueChildName(qt3dsdm::Qt3DSDMInstanceHandle inParent,
+                                          qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                           Q3DStudio::CString inDesiredName);
-    bool CheckNameUnique(qt3dsdm::CUICDMInstanceHandle inInstance, Q3DStudio::CString inDesiredName);
-    Q3DStudio::CString GetSourcePath(qt3dsdm::CUICDMInstanceHandle inInstance) const;
+    bool CheckNameUnique(qt3dsdm::Qt3DSDMInstanceHandle inInstance, Q3DStudio::CString inDesiredName);
+    Q3DStudio::CString GetSourcePath(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
     std::set<Q3DStudio::CString> GetSourcePathList() const;
     std::set<Q3DStudio::CString> GetFontFileList() const;
     std::set<Q3DStudio::CString> GetDynamicObjectTextureList() const;
-    bool IsLockedAtAll(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool IsDuplicateable(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool IsMultiSelectable(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool CanDelete(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool IsMaster(qt3dsdm::CUICDMInstanceHandle inInstance);
-    qt3dsdm::CUICDMInstanceHandle GetResidingLayer(qt3dsdm::CUICDMInstanceHandle inInstance);
-    void GetValueListFromAllSlides(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                   qt3dsdm::CUICDMPropertyHandle inProperty,
+    bool IsLockedAtAll(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool IsDuplicateable(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool IsMultiSelectable(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool IsMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetResidingLayer(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    void GetValueListFromAllSlides(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                   qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                    std::vector<qt3dsdm::SValue> &outValueList,
                                    IValueFilter *inFilter = NULL) const;
 
 protected:
-    qt3dsdm::CUICDMInstanceHandle GetChildByName(qt3dsdm::CUICDMInstanceHandle inParent,
+    qt3dsdm::Qt3DSDMInstanceHandle GetChildByName(qt3dsdm::Qt3DSDMInstanceHandle inParent,
                                                Q3DStudio::CString inChildName);
     std::vector<qt3dsdm::SValue>
-    GetValueList(qt3dsdm::CUICDMInstanceHandle inParentInstance,
-                                         qt3dsdm::CUICDMPropertyHandle inProperty,
+    GetValueList(qt3dsdm::Qt3DSDMInstanceHandle inParentInstance,
+                                         qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                          IValueFilter *inFilter = NULL) const;
 
 public:
-    Q3DStudio::CId GetGUID(qt3dsdm::CUICDMInstanceHandle inInstance) const;
+    Q3DStudio::CId GetGUID(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
 
-    qt3dsdm::CUICDMInstanceHandle GetParentInstance(qt3dsdm::CUICDMInstanceHandle inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetParentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
     // TODO: EStudioObjectType and EASSETTYPE can't co-exist, one must go. Think EStudioObjectType
     // should win since things are better classified
-    EStudioObjectType GetObjectType(qt3dsdm::CUICDMInstanceHandle inInstance);
-    bool IsBehaviorInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsCameraInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsGroupInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsActionInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsComponentInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsLayerInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsLightInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsModelInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsMaterialBaseInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsMaterialInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsReferencedMaterialInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsImageInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsSceneInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsTextInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsRenderPluginInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsCustomMaterialInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsLightmapsInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    bool IsNodeType(qt3dsdm::CUICDMInstanceHandle inInstance) const;
+    EStudioObjectType GetObjectType(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    bool IsBehaviorInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsCameraInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsGroupInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsActionInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsComponentInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsLayerInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsLightInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsModelInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsMaterialBaseInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsMaterialInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsReferencedMaterialInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsSceneInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsTextInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsRenderPluginInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsCustomMaterialInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsLightmapsInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    bool IsNodeType(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
     // Returns true if this instance would be in the scene graph
-    bool IsSceneGraphInstance(qt3dsdm::CUICDMInstanceHandle inInstance) const;
+    bool IsSceneGraphInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
 };
 
 inline qt3dsdm::SLong4 GuidtoSLong4(const Q3DStudio::CId &inId)
diff --git a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
index 131ac1ef..ab2a80a7 100644
--- a/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ComposerEditorInterface.cpp
@@ -86,10 +86,10 @@ struct SComposerImportBase
 
 struct SComposerImportInterface : public SComposerImportBase, public IComposerEditorInterface
 {
-    typedef eastl::hash_map<TImportId, CUICDMInstanceHandle, STCharPtrHash, STCharPtrEqualTo>
+    typedef eastl::hash_map<TImportId, Qt3DSDMInstanceHandle, STCharPtrHash, STCharPtrEqualTo>
         TImportInstanceMap;
-    CUICDMInstanceHandle m_Parent;
-    CUICDMInstanceHandle m_Root;
+    Qt3DSDMInstanceHandle m_Parent;
+    Qt3DSDMInstanceHandle m_Root;
     CUICDMSlideHandle m_Slide;
     Q3DStudio::CString m_TypeBuffer;
     qt3ds::QT3DSI32 m_StartTime;
@@ -134,7 +134,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
             std::make_shared<CDataStr>((const wchar_t *)m_Relativeimportfile));
     }
 
-    CUICDMInstanceHandle FindInstance(TImportId inImportHdl) override
+    Qt3DSDMInstanceHandle FindInstance(TImportId inImportHdl) override
     {
         TImportInstanceMap::const_iterator entry(m_ImportToInstanceMap.find(inImportHdl));
         if (entry != m_ImportToInstanceMap.end())
@@ -142,7 +142,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
         return 0;
     }
 
-    void AddInstanceMap(CUICDMInstanceHandle instanceHandle, TImportId inImportId) override
+    void AddInstanceMap(Qt3DSDMInstanceHandle instanceHandle, TImportId inImportId) override
     {
         if (inImportId == NULL || *inImportId == 0) {
             assert(0);
@@ -155,7 +155,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
         (void)success;
         assert(success);
     }
-    CUICDMInstanceHandle GetRoot() override { return m_Root; }
+    Qt3DSDMInstanceHandle GetRoot() override { return m_Root; }
 
     const Q3DStudio::CFilePath &GetDestImportFile() override { return m_DestImportFile; }
 
@@ -167,10 +167,10 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
 
     void RemoveChild(TImportId parent, TImportId child) override
     {
-        CUICDMInstanceHandle childHandle = FindInstance(child);
-        CUICDMInstanceHandle parentHandle = FindInstance(parent);
+        Qt3DSDMInstanceHandle childHandle = FindInstance(child);
+        Qt3DSDMInstanceHandle parentHandle = FindInstance(parent);
         if (childHandle.Valid() && parentHandle.Valid()) {
-            CUICDMInstanceHandle parentId = m_Editor.GetParent(childHandle);
+            Qt3DSDMInstanceHandle parentId = m_Editor.GetParent(childHandle);
             // If the child was moved, we don't remove it.  Only on the case where
             // it has it's original parent.
             if (parentId == parentHandle)
@@ -180,12 +180,12 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
 
     void RemoveInstance(TImportId inInstance) override
     {
-        CUICDMInstanceHandle instance = FindInstance(inInstance);
+        Qt3DSDMInstanceHandle instance = FindInstance(inInstance);
         if (instance.Valid())
             m_Editor.DeleteInstance(instance);
     }
 
-    CUICDMInstanceHandle CreateInstance(ComposerObjectTypes::Enum type, CUICDMInstanceHandle parent,
+    Qt3DSDMInstanceHandle CreateInstance(ComposerObjectTypes::Enum type, Qt3DSDMInstanceHandle parent,
                                         TImportId inImportId)
     {
         if (parent.Valid() == false) {
@@ -194,7 +194,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
         }
 
         // Map the type to the object type.
-        CUICDMInstanceHandle retval = m_Editor.CreateSceneGraphInstance(type, parent, m_Slide);
+        Qt3DSDMInstanceHandle retval = m_Editor.CreateSceneGraphInstance(type, parent, m_Slide);
         m_Editor.SetSpecificInstancePropertyValue(0, retval, L"importid",
                                                   std::make_shared<CDataStr>(inImportId));
         m_Editor.SetSpecificInstancePropertyValue(
@@ -212,7 +212,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
      */
     void CreateRootInstance(TImportId inImportId, ComposerObjectTypes::Enum type) override
     {
-        CUICDMInstanceHandle retval = m_Root;
+        Qt3DSDMInstanceHandle retval = m_Root;
         if (m_Root.Valid() == false) {
             retval = CreateInstance(type, m_Parent, inImportId);
             m_Root = retval;
@@ -227,7 +227,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
     void CreateInstance(TImportId inImportId, ComposerObjectTypes::Enum type,
                                 TImportId inParent) override
     {
-        CUICDMInstanceHandle theParent(FindInstance(inParent));
+        Qt3DSDMInstanceHandle theParent(FindInstance(inParent));
         if (theParent.Valid())
             CreateInstance(type, theParent, inImportId);
     }
@@ -235,7 +235,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
     void UpdateInstanceProperties(TImportId inInstance, const PropertyValue *propertBuffer,
                                           QT3DSU32 propertyBufferSize) override
     {
-        CUICDMInstanceHandle hdl(FindInstance(inInstance));
+        Qt3DSDMInstanceHandle hdl(FindInstance(inInstance));
         if (hdl.Valid() == false)
             return;
 
@@ -262,7 +262,7 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
             } else if (theType == DataModelDataType::StringRef) {
                 SStringRef theRef = get<SStringRef>(theValue);
                 SLong4 theGuid;
-                CUICDMInstanceHandle target = FindInstance(theRef.m_Id);
+                Qt3DSDMInstanceHandle target = FindInstance(theRef.m_Id);
                 if (target.Valid())
                     theGuid = m_Editor.GetGuidForInstance(target);
                 theValue = theGuid;
@@ -276,9 +276,9 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
     }
     void AddChild(TImportId parent, TImportId child, TImportId inSibling) override
     {
-        CUICDMInstanceHandle theParent(FindInstance(parent));
-        CUICDMInstanceHandle theChild(FindInstance(child));
-        CUICDMInstanceHandle theSibling(FindInstance(inSibling));
+        Qt3DSDMInstanceHandle theParent(FindInstance(parent));
+        Qt3DSDMInstanceHandle theChild(FindInstance(child));
+        Qt3DSDMInstanceHandle theSibling(FindInstance(inSibling));
 
         if (theParent.Valid() && theChild.Valid())
             m_Editor.AddChild(theParent, theChild, theSibling);
@@ -286,14 +286,14 @@ struct SComposerImportInterface : public SComposerImportBase, public IComposerEd
 
     void RemoveAnimation(TImportId inInstance, const wchar_t *propName, long propSubIndex) override
     {
-        CUICDMInstanceHandle hdl(FindInstance(inInstance));
+        Qt3DSDMInstanceHandle hdl(FindInstance(inInstance));
         if (hdl.Valid())
             m_Editor.RemoveAnimation(m_Slide, hdl, propName, propSubIndex);
     }
     void UpdateAnimation(TImportId inInstance, const wchar_t *propName, long propSubIndex,
                                  EAnimationType animType, const float *animData, QT3DSU32 numFloats) override
     {
-        CUICDMInstanceHandle hdl(FindInstance(inInstance));
+        Qt3DSDMInstanceHandle hdl(FindInstance(inInstance));
         if (hdl.Valid()) {
             if (m_Editor.IsAnimationArtistEdited(m_Slide, hdl, propName, propSubIndex) == false) {
                 CUICDMAnimationHandle anim = m_Editor.CreateOrSetAnimation(
@@ -319,7 +319,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
 
     struct SSlideInstanceIdMapIterator
     {
-        const vector<pair<CUICDMSlideHandle, CUICDMInstanceHandle>> *m_CurrentItems;
+        const vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> *m_CurrentItems;
         size_t m_CurrentTreeIdx;
         size_t m_CurrentTreeEnd;
         TCharPtr m_Id;
@@ -359,7 +359,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
         }
         CUICDMSlideHandle GetCurrentSlide() { return (*m_CurrentItems)[m_CurrentTreeIdx].first; }
 
-        CUICDMInstanceHandle GetCurrentInstance()
+        Qt3DSDMInstanceHandle GetCurrentInstance()
         {
             return (*m_CurrentItems)[m_CurrentTreeIdx].second;
         }
@@ -384,9 +384,9 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
         for (SSlideInstanceIdMapIterator theIterator(inParentId, m_IdToSlideInstances,
                                                      m_StringTable);
              theIterator.IsDone() == false; theIterator.Next()) {
-            CUICDMInstanceHandle theParent = theIterator.GetCurrentInstance();
+            Qt3DSDMInstanceHandle theParent = theIterator.GetCurrentInstance();
             for (long idx = 0; idx < m_AssetGraph.GetChildCount(theParent); ++idx) {
-                CUICDMInstanceHandle theChild = m_AssetGraph.GetChild(theParent, idx);
+                Qt3DSDMInstanceHandle theChild = m_AssetGraph.GetChild(theParent, idx);
                 CString theImportId = m_Editor.GetImportId(theChild);
                 if (m_Editor.GetAssociatedSlide(theChild) == theIterator.GetCurrentSlide()
                     && theImportId == inChildId) {
@@ -422,12 +422,12 @@ 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, CUICDMInstanceHandle>>())));
+            make_pair(theInsertId, vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>())));
 
         for (SSlideInstanceIdMapIterator theIterator(inParent, m_IdToSlideInstances, m_StringTable);
              theIterator.IsDone() == false; theIterator.Next()) {
-            CUICDMInstanceHandle theParent = theIterator.GetCurrentInstance();
-            CUICDMInstanceHandle newInstance =
+            Qt3DSDMInstanceHandle theParent = theIterator.GetCurrentInstance();
+            Qt3DSDMInstanceHandle newInstance =
                 m_Editor.CreateSceneGraphInstance(type, theParent, theIterator.GetCurrentSlide());
             if (m_StartTime >= 0)
                 m_Editor.SetSpecificInstancePropertyValue(0, newInstance, L"starttime",
@@ -449,7 +449,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
         for (SSlideInstanceIdMapIterator theIterator(inInstance, m_IdToSlideInstances,
                                                      m_StringTable);
              theIterator.IsDone() == false; theIterator.Next()) {
-            CUICDMInstanceHandle hdl = theIterator.GetCurrentInstance();
+            Qt3DSDMInstanceHandle hdl = theIterator.GetCurrentInstance();
             for (QT3DSU32 idx = 0; idx < propertyBufferSize; ++idx) {
                 const PropertyValue &value(propertBuffer[idx]);
                 SValue theValue(value.m_Value);
@@ -474,7 +474,7 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
                     // in the current slide who has the same import id;
                     for (long childIdx = 0, childCount = m_AssetGraph.GetChildCount(hdl);
                          childIdx < childCount; ++childIdx) {
-                        CUICDMInstanceHandle target = m_AssetGraph.GetChild(hdl, childIdx);
+                        Qt3DSDMInstanceHandle target = m_AssetGraph.GetChild(hdl, childIdx);
                         if (m_Editor.GetAssociatedSlide(hdl) == theIterator.GetCurrentSlide()
                             && m_Editor.GetImportId(target).Compare(theRef.m_Id)) {
                             theGuid = m_Editor.GetGuidForInstance(target);
@@ -504,13 +504,13 @@ struct SComposerRefreshInterface : public SComposerImportBase, public IComposerE
         size_t numItems = NVMin(theParentList->second.size(), theChildList->second.size());
         for (size_t idx = 0; idx < numItems; ++idx) {
             CUICDMSlideHandle theParentSlide = theParentList->second[idx].first;
-            CUICDMInstanceHandle theParent(theParentList->second[idx].second);
-            CUICDMInstanceHandle theChild(theChildList->second[idx].second);
-            CUICDMInstanceHandle nextSibling;
+            Qt3DSDMInstanceHandle theParent(theParentList->second[idx].second);
+            Qt3DSDMInstanceHandle theChild(theChildList->second[idx].second);
+            Qt3DSDMInstanceHandle nextSibling;
             if (!IsTrivial(nextSiblingId)) {
                 for (long childIdx = 0, childCount = m_AssetGraph.GetChildCount(theParent);
                      childIdx < childCount; ++childIdx) {
-                    CUICDMInstanceHandle theSibling = m_AssetGraph.GetChild(theParent, childIdx);
+                    Qt3DSDMInstanceHandle theSibling = m_AssetGraph.GetChild(theParent, childIdx);
                     if (m_Editor.GetAssociatedSlide(theSibling) == theParentSlide
                         && m_Editor.GetImportId(theSibling).Compare(nextSiblingId)) {
                         nextSibling = theSibling;
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index ecadc532..578305a1 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -226,12 +226,12 @@ qt3dsdm::IPropertySystem *CDoc::GetPropertySystem()
     return GetStudioSystem()->GetPropertySystem();
 }
 
-void CDoc::SetInstancePropertyValue(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                     const std::wstring &inPropertyName,
                                     const qt3dsdm::SValue &inValue)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = GetStudioSystem()->GetPropertySystem();
-    qt3dsdm::CUICDMPropertyHandle theProperty =
+    qt3dsdm::Qt3DSDMPropertyHandle theProperty =
         thePropertySystem->GetAggregateInstancePropertyByName(inInstance, inPropertyName.c_str());
     if (theProperty.Valid())
         thePropertySystem->SetInstancePropertyValue(inInstance, theProperty, inValue);
@@ -386,12 +386,12 @@ bool CDoc::IsValid() const
 /**
  * Get the Asset from inSelectedItem, if exists
  */
-qt3dsdm::CUICDMInstanceHandle
+qt3dsdm::Qt3DSDMInstanceHandle
 CDoc::GetInstanceFromSelectable(Q3DStudio::SSelectedValue inSelectedItem)
 {
     if (inSelectedItem.getType() == Q3DStudio::SelectedValueTypes::Instance) {
         // This is UICDM asset. Find corresponding CAsset if there is any
-        return inSelectedItem.getData<qt3dsdm::CUICDMInstanceHandle>();
+        return inSelectedItem.getData<qt3dsdm::Qt3DSDMInstanceHandle>();
     } else if (inSelectedItem.getType() == Q3DStudio::SelectedValueTypes::MultipleInstances) {
         const qt3dsdm::TInstanceHandleList &theData =
             *inSelectedItem.getDataPtr<qt3dsdm::TInstanceHandleList>();
@@ -402,7 +402,7 @@ CDoc::GetInstanceFromSelectable(Q3DStudio::SSelectedValue inSelectedItem)
     return 0;
 }
 
-qt3dsdm::CUICDMInstanceHandle CDoc::GetSelectedInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetSelectedInstance()
 {
     return GetInstanceFromSelectable(m_SelectedObject);
 }
@@ -487,7 +487,7 @@ void CDoc::NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide,
     // Record the last selected object in that slide
     ISlideSystem *theSlideSystem = GetStudioSystem()->GetSlideSystem();
     theSlideSystem->SetSlideSelectedInstance(theLastActiveSlide, GetSelectedInstance());
-    qt3dsdm::CUICDMInstanceHandle theNextSelectedInstance = GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theNextSelectedInstance = GetSelectedInstance();
 
     // If we are forcing a refresh. and the incoming root is not valid, use the existing active time
     // context
@@ -546,7 +546,7 @@ void CDoc::NotifyActiveSlideChanged(qt3dsdm::CUICDMSlideHandle inNewActiveSlide,
 /**
  * @returns the first enabled layer in the active time context
  */
-qt3dsdm::CUICDMInstanceHandle CDoc::GetFirstSelectableLayer()
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetFirstSelectableLayer()
 {
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
 
@@ -555,7 +555,7 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetFirstSelectableLayer()
                             theBridge->GetComponentActiveSlide(m_SceneInstance), theLayers,
                             OBJTYPE_LAYER);
 
-    qt3dsdm::CUICDMInstanceHandle theFoundLayer = 0;
+    qt3dsdm::Qt3DSDMInstanceHandle theFoundLayer = 0;
 
     for (; !theLayers.IsDone(); ++theLayers) {
         if (!theBridge->IsLockedAtAll(theLayers.GetCurrent())
@@ -568,7 +568,7 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetFirstSelectableLayer()
     return theFoundLayer;
 }
 
-qt3dsdm::CUICDMInstanceHandle CDoc::GetActiveRootInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetActiveRootInstance()
 {
     if (m_ActiveSlide.Valid())
         return m_StudioSystem->GetClientDataModelBridge()->GetOwningComponentInstance(
@@ -598,7 +598,7 @@ qt3dsdm::CUICDMSlideHandle CDoc::GetActiveSlide()
  * the slide is switched and is held onto mainly for determining which layer
  * to drop an object onto when dropping on the scene.
  */
-qt3dsdm::CUICDMInstanceHandle CDoc::GetActiveLayer()
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetActiveLayer()
 {
     if (m_ActiveLayer.Valid() == false)
         m_ActiveLayer = GetFirstSelectableLayer();
@@ -612,7 +612,7 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetActiveLayer()
  * the slide is switched and is held onto mainly for determining which layer
  * to drop an object onto when dropping on the scene.
  */
-void CDoc::SetActiveLayer(qt3dsdm::CUICDMInstanceHandle inLayerInstance)
+void CDoc::SetActiveLayer(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance)
 {
     m_ActiveLayer = inLayerInstance;
 }
@@ -622,7 +622,7 @@ void CDoc::SetActiveLayer(qt3dsdm::CUICDMInstanceHandle inLayerInstance)
  * Informs that a layer has been deleted. If this is the active one, try to promote another.
  */
 
-void CDoc::OnLayerDeleted(qt3dsdm::CUICDMInstanceHandle inLayerInstance)
+void CDoc::OnLayerDeleted(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance)
 {
     if (m_ActiveLayer == inLayerInstance)
         m_ActiveLayer = 0;
@@ -660,7 +660,7 @@ void CDoc::CutObject(qt3dsdm::TInstanceHandleList inInstances)
         return;
     bool theContinueCutFlag = true;
     for (size_t idx = 0, end = inInstances.size(); idx < end && theContinueCutFlag; ++idx) {
-        qt3dsdm::CUICDMInstanceHandle inInstance(inInstances[idx]);
+        qt3dsdm::Qt3DSDMInstanceHandle inInstance(inInstances[idx]);
         if (!GetDocumentReader().IsInstance(inInstance))
             return;
 
@@ -700,10 +700,10 @@ void CDoc::CopyObject(qt3dsdm::TInstanceHandleList inInstances)
         m_StudioSystem->GetClientDataModelBridge()->GetObjectType(inInstances[0]));
 }
 
-void CDoc::PasteObject(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::PasteObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace Q3DStudio;
-    qt3dsdm::CUICDMInstanceHandle theInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance(inInstance);
     qint64 dummy = 0;
     CUICFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
     SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Paste Object"))
@@ -711,10 +711,10 @@ void CDoc::PasteObject(qt3dsdm::CUICDMInstanceHandle inInstance)
                                 DocumentEditorInsertType::LastChild, CPt());
 }
 
-void CDoc::PasteObjectMaster(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::PasteObjectMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace Q3DStudio;
-    qt3dsdm::CUICDMInstanceHandle theInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance(inInstance);
     qint64 dummy = 0;
     CUICFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
     SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Paste Object"))
@@ -772,7 +772,7 @@ void CDoc::DeleteObject(const qt3dsdm::TInstanceHandleList &inInstances)
  *	@inAsset				The asset to check for dependencies.
  *	@ioActionDependencies	String representation of objects that have actions referencing it.
  */
-void CDoc::GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                  Q3DStudio::CString &ioActionDependencies)
 {
     // Step 1 : Get all actions affecting myself and all my descendents
@@ -792,7 +792,7 @@ void CDoc::GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
     for (; thePos != theEnd; ++thePos) {
         const qt3dsdm::SActionInfo &theActionInfo = theActionCore->GetActionInfo(*thePos);
-        qt3dsdm::CUICDMInstanceHandle theOwnerHandle = theActionInfo.m_Owner;
+        qt3dsdm::Qt3DSDMInstanceHandle theOwnerHandle = theActionInfo.m_Owner;
 
         if (theOwnerHandle != inInstance && theOwnerHandle.Valid()
             && !IsAscendant(theOwnerHandle, inInstance, m_AssetGraph))
@@ -816,7 +816,7 @@ void CDoc::GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
  *	@inAsset				The asset to check for dependencies.
  *	@ioActionList			List of actions.
  */
-void CDoc::GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                  qt3dsdm::TActionHandleList &ioActionList)
 {
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
@@ -868,7 +868,7 @@ void CDoc::SetChangedKeyframes()
 bool CDoc::SetSelection(Q3DStudio::SSelectedValue inNewSelection)
 {
     if (inNewSelection != m_SelectedObject) {
-        qt3dsdm::CUICDMInstanceHandle theNewSelectedInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theNewSelectedInstance =
             GetInstanceFromSelectable(inNewSelection);
 
         if (theNewSelectedInstance.Valid()) {
@@ -889,9 +889,9 @@ bool CDoc::SetSelection(Q3DStudio::SSelectedValue inNewSelection)
                 != theBridge->GetOwningComponentInstance(theCurrentActiveSlide)) {
                 // If the newly selected object is in the scene then make the layer it belongs to
                 // the 'active' layer.
-                qt3dsdm::CUICDMInstanceHandle theActiveLayer = 0;
+                qt3dsdm::Qt3DSDMInstanceHandle theActiveLayer = 0;
 
-                qt3dsdm::CUICDMInstanceHandle theSelectedInstance = GetSelectedInstance();
+                qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance();
                 theActiveLayer = theBridge->GetResidingLayer(theSelectedInstance);
 
                 if (theActiveLayer.Valid() && theBridge->IsLockedAtAll(theActiveLayer))
@@ -1032,7 +1032,7 @@ void CDoc::OnSlideDeleted(qt3dsdm::CUICDMSlideHandle inSlide)
         SetActiveSlideWithTransaction(theNewSlide);
     }
 }
-void CDoc::OnInstanceDeleted(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::OnInstanceDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     qt3dsdm::TTransactionConsumerPtr theConsumer = m_StudioSystem->GetFullSystem()->GetConsumer();
     if (GetSelectedInstance() == inInstance)
@@ -1049,7 +1049,7 @@ void CDoc::OnInstanceDeleted(qt3dsdm::CUICDMInstanceHandle inInstance)
         CUICDMSlideHandle theSlide = theBridge.GetComponentActiveSlide(inInstance);
         if (theSlide == m_ActiveSlide) {
             // empty loop intentional, finding the next component parent.
-            CUICDMInstanceHandle theParent;
+            Qt3DSDMInstanceHandle theParent;
             for (theParent = m_AssetGraph->GetParent(inInstance); theParent.Valid()
                  && !theCore.IsInstanceOrDerivedFrom(theParent,
                                                      theDefinitions.m_SlideOwner.m_Instance);
@@ -1070,7 +1070,7 @@ void CDoc::OnInstanceDeleted(qt3dsdm::CUICDMInstanceHandle inInstance)
     }
 }
 
-Q3DStudio::SSelectedValue CDoc::SetupInstanceSelection(qt3dsdm::CUICDMInstanceHandle inInstance)
+Q3DStudio::SSelectedValue CDoc::SetupInstanceSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (m_StudioSystem->IsInstance(inInstance)
         && !m_StudioSystem->GetClientDataModelBridge()->IsLockedAtAll(inInstance)) {
@@ -1084,7 +1084,7 @@ Q3DStudio::SSelectedValue CDoc::SetupInstanceSelection(qt3dsdm::CUICDMInstanceHa
  *	Select UICDM Object given its instance handle.
  *	@param inInstanceHandle The instance handle of the UICDM Object to be selected
  */
-void CDoc::SelectUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstanceHandle)
+void CDoc::SelectUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     qt3dsdm::TInstanceHandleList theObjects = m_SelectedValue.GetSelectedInstances();
     if (std::find(theObjects.begin(), theObjects.end(), inInstanceHandle) == theObjects.end())
@@ -1093,15 +1093,15 @@ void CDoc::SelectUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstanceHandle)
         NotifySelectionChanged(theObjects);
 }
 
-void CDoc::ToggleUICDMObjectToSelection(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::ToggleUICDMObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (m_StudioSystem->GetClientDataModelBridge()->IsMultiSelectable(inInstance)) {
         qt3dsdm::TInstanceHandleList theNewHandles;
         if (m_SelectedValue.getType() != Q3DStudio::SelectedValueTypes::MultipleInstances) {
             // Attempt conversion if possible.
             if (m_SelectedValue.getType() == Q3DStudio::SelectedValueTypes::Instance) {
-                qt3dsdm::CUICDMInstanceHandle theCurrentlySelectedInstance =
-                    m_SelectedValue.getData<qt3dsdm::CUICDMInstanceHandle>();
+                qt3dsdm::Qt3DSDMInstanceHandle theCurrentlySelectedInstance =
+                    m_SelectedValue.getData<qt3dsdm::Qt3DSDMInstanceHandle>();
                 if (m_StudioSystem->GetClientDataModelBridge()->IsMultiSelectable(
                         theCurrentlySelectedInstance))
                     theNewHandles.push_back(theCurrentlySelectedInstance);
@@ -1119,7 +1119,7 @@ void CDoc::ToggleUICDMObjectToSelection(qt3dsdm::CUICDMInstanceHandle inInstance
     }
 }
 
-void CDoc::SelectAndNavigateToUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstanceHandle)
+void CDoc::SelectAndNavigateToUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     if (inInstanceHandle.Valid() == false) {
         QT3DS_ASSERT(false);
@@ -1127,9 +1127,9 @@ void CDoc::SelectAndNavigateToUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstan
     }
     Q3DStudio::IDocumentReader &theReader(GetDocumentReader());
     qt3dsdm::CUICDMSlideHandle theAssociatedSlide = theReader.GetAssociatedSlide(inInstanceHandle);
-    qt3dsdm::CUICDMInstanceHandle theNewComponent =
+    qt3dsdm::Qt3DSDMInstanceHandle theNewComponent =
         theReader.GetComponentForSlide(theAssociatedSlide);
-    qt3dsdm::CUICDMInstanceHandle theOldComponent = theReader.GetComponentForSlide(GetActiveSlide());
+    qt3dsdm::Qt3DSDMInstanceHandle theOldComponent = theReader.GetComponentForSlide(GetActiveSlide());
     if (theNewComponent.Valid() && theNewComponent != theOldComponent) {
         // Get the currently active slide for the new component.
         qt3dsdm::CUICDMSlideHandle theActiveSlide =
@@ -1150,7 +1150,7 @@ long CDoc::GetLatestEndTime()
     GetAssetChildrenInTimeParent(GetActiveRootInstance(), this, true, theChildren,
                                  GetActiveSlide());
     for (; !theChildren.IsDone(); ++theChildren) {
-        qt3dsdm::CUICDMInstanceHandle theChildAsset = theChildren.GetCurrent();
+        qt3dsdm::Qt3DSDMInstanceHandle theChildAsset = theChildren.GetCurrent();
         long theChildEnd = GetDocumentReader().GetTimeRange(theChildAsset).second;
         if ((theChildEnd > theTime))
             theTime = theChildEnd;
@@ -1211,7 +1211,7 @@ void CDoc::TruncateTimebar(bool inSetStart, bool inAffectsChildren)
 {
     Q_UNUSED(inAffectsChildren);
 
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance();
     // Cannot change the time bars for a material
     if (theSelectedInstance.Valid())
         Q3DStudio::ScopedDocumentEditor(*this, L"Truncate Time Range", __FILE__, __LINE__)
@@ -1511,7 +1511,7 @@ void CDoc::CreateNewDocument()
         m_StudioSystem->GetClientDataModelBridge()->GetObjectDefinitions());
     IMetaData &theMetaData(*m_StudioSystem->GetActionMetaData());
 
-    CUICDMInstanceHandle theLayer = IDocumentEditor::CreateSceneGraphInstance(
+    Qt3DSDMInstanceHandle theLayer = IDocumentEditor::CreateSceneGraphInstance(
         ComposerObjectTypes::Convert(ComposerObjectTypes::Layer), m_SceneInstance, theSlide,
         theDataCore, theSlideSystem, theObjectDefinitions, *m_AssetGraph, theMetaData);
 
@@ -1660,7 +1660,7 @@ void CDoc::HandleMasterPaste()
         // m_StudioApp->GetViews( )->GetActionControl( )->OnPasteAction( );
         // m_StudioApp->GetViews( )->OnShowAction( );
     } else if (CanPasteObject()) {
-        qt3dsdm::CUICDMInstanceHandle theSelectedInstance = GetSelectedInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance();
         long theTargetObjectType =
             GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(theSelectedInstance);
         qt3dsdm::ISlideSystem *theSlideSystem = GetStudioSystem()->GetSlideSystem();
@@ -1770,7 +1770,7 @@ bool CDoc::CanPasteObject()
 {
     bool theCanPasteFlag = false;
 
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance();
     if (theSelectedInstance.Valid()) {
         // Check if there is object on clipboard and if the object type on clipboard can be attached
         // to theSelectedInstance
@@ -1882,7 +1882,7 @@ bool CDoc::CanCut()
  */
 void CDoc::HandleDuplicateCommand()
 {
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance();
 
     // If we have a valid object to duplicate
     if (m_StudioSystem->GetClientDataModelBridge()->IsDuplicateable(theSelectedInstance)) {
@@ -1897,7 +1897,7 @@ void CDoc::HandleDuplicateCommand()
  * Verify that an asset can be renamed. Only actions are affected by rename at this point, so prompt
  * user to proceed if the actions will be hosed.
  */
-bool CDoc::VerifyCanRename(qt3dsdm::CUICDMInstanceHandle inAsset)
+bool CDoc::VerifyCanRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset)
 {
     bool theResult = true;
     std::set<Q3DStudio::CString> theAffectedList;
@@ -2381,7 +2381,7 @@ void CDoc::SavePresentationFile(CBufferedOutputStream *inOutputStream)
             bool isInstance = false;
             for (size_t slideInstanceIdx = 0, slideInstanceEnd = theList.size();
                  slideInstanceIdx < slideInstanceEnd && !isInstance; ++slideInstanceIdx) {
-                CUICDMInstanceHandle theInstance = theList[slideInstanceIdx].second;
+                Qt3DSDMInstanceHandle theInstance = theList[slideInstanceIdx].second;
                 isInstance = m_StudioSystem->IsInstance(theInstance);
                 if (isInstance)
                     isImage = thePropertySystem.IsInstanceOrDerivedFrom(
@@ -2506,7 +2506,7 @@ void CDoc::DeselectAllKeyframes()
  *	I think the logic behind this is that once the parent will affect all children's path
  *reference, and hence all its descendants' action must be checked as well.
  */
-void CDoc::GetActionsAffectedByRename(qt3dsdm::CUICDMInstanceHandle inAsset,
+void CDoc::GetActionsAffectedByRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset,
                                       std::set<Q3DStudio::CString> &ioActionsAffected)
 {
     if (!inAsset)
@@ -2541,7 +2541,7 @@ void CDoc::GetActionsAffectedByRename(qt3dsdm::CUICDMInstanceHandle inAsset,
  * b. list the source GUID of the image if ( outImageIdList != NULL )
  * This is so that ScheduleRemoveImageInstances & GetImageInstancesSourceGUID can share code
  */
-void CDoc::IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::IterateImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                  std::vector<Q3DStudio::CId> *outImageIdList)
 {
     CClientDataModelBridge *theClientBridge = GetStudioSystem()->GetClientDataModelBridge();
@@ -2560,14 +2560,14 @@ void CDoc::IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
     GetAssetChildren(this, inInstance, theSourceChildIterator);
 
     for (; !theSourceChildIterator.IsDone(); ++theSourceChildIterator) {
-        qt3dsdm::CUICDMInstanceHandle theChildInstance = theSourceChildIterator.GetCurrent();
+        qt3dsdm::Qt3DSDMInstanceHandle theChildInstance = theSourceChildIterator.GetCurrent();
         if (theClientBridge->IsMaterialInstance(theChildInstance)) {
             qt3dsdm::TPropertyHandleList theProperties;
             thePropertySystem->GetAggregateInstanceProperties(theChildInstance, theProperties);
             size_t thePropertyCount = theProperties.size();
             for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount;
                  ++thePropertyIndex) {
-                qt3dsdm::CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+                qt3dsdm::Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
                 qt3dsdm::AdditionalMetaDataType::Value theAdditionalMetaDataType =
                     thePropertySystem->GetAdditionalMetaDataType(theChildInstance, theProperty);
 
@@ -2582,7 +2582,7 @@ void CDoc::IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
                                                                     theValue);
                         qt3dsdm::SLong4 theDataModelImageGuid = qt3dsdm::get<qt3dsdm::SLong4>(theValue);
 
-                        qt3dsdm::CUICDMInstanceHandle theImageInstance =
+                        qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
                             theClientBridge->GetImageInstanceByGUID(theDataModelImageGuid);
                         if (theImageInstance.Valid()) {
                             // Get the image source guid
@@ -2606,7 +2606,7 @@ void CDoc::IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
                                     theSlideIndex, theChildInstance, theProperty, theValue)) {
                                 qt3dsdm::SLong4 theDataModelImageGuid =
                                     qt3dsdm::get<qt3dsdm::SLong4>(theValue);
-                                qt3dsdm::CUICDMInstanceHandle theImageInstance =
+                                qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
                                     theClientBridge->GetImageInstanceByGUID(theDataModelImageGuid);
                                 if (theImageInstance.Valid()) {
                                     // Get the image source guid
@@ -2633,21 +2633,21 @@ void CDoc::IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
 /**
  * @returns the object based on the selection mode
  */
-qt3dsdm::CUICDMInstanceHandle CDoc::GetObjectbySelectMode(qt3dsdm::CUICDMInstanceHandle inInstance,
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetObjectbySelectMode(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                         bool inGroupMode)
 {
-    qt3dsdm::CUICDMInstanceHandle theResult = inInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle theResult = inInstance;
 
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
     if (!theBridge->IsInActiveComponent(inInstance)) {
-        qt3dsdm::CUICDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
+        qt3dsdm::Qt3DSDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
         if (theParent.Valid())
             theResult = GetObjectbySelectMode(theParent, inGroupMode);
         else
             theResult = 0;
     } else {
         if (inGroupMode) {
-            qt3dsdm::CUICDMInstanceHandle theGroup = GetTopmostGroup(inInstance);
+            qt3dsdm::Qt3DSDMInstanceHandle theGroup = GetTopmostGroup(inInstance);
             if (theGroup.Valid())
                 theResult = theGroup;
         }
@@ -2659,17 +2659,17 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetObjectbySelectMode(qt3dsdm::CUICDMInstanc
 /**
  * @returns the topmost group object that owns this instance
  */
-qt3dsdm::CUICDMInstanceHandle CDoc::GetTopmostGroup(qt3dsdm::CUICDMInstanceHandle inInstance)
+qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetTopmostGroup(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
 
     if (theBridge->IsGroupInstance(inInstance)) {
-        qt3dsdm::CUICDMInstanceHandle theGroup = inInstance;
+        qt3dsdm::Qt3DSDMInstanceHandle theGroup = inInstance;
 
         // If this group has a parent
-        qt3dsdm::CUICDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
+        qt3dsdm::Qt3DSDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
         if (theParent.Valid()) {
-            qt3dsdm::CUICDMInstanceHandle theParentGroup;
+            qt3dsdm::Qt3DSDMInstanceHandle theParentGroup;
             // Get the group object of the parent
             if (GetActiveRootInstance()
                 == inInstance) { // check if this component is the active time context now
@@ -2686,7 +2686,7 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetTopmostGroup(qt3dsdm::CUICDMInstanceHandl
 
         return theGroup;
     } else {
-        qt3dsdm::CUICDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
+        qt3dsdm::Qt3DSDMInstanceHandle theParent = theBridge->GetParentInstance(inInstance);
         if (theParent.Valid())
             return GetTopmostGroup(theParent);
         else
@@ -2699,7 +2699,7 @@ qt3dsdm::CUICDMInstanceHandle CDoc::GetTopmostGroup(qt3dsdm::CUICDMInstanceHandl
  * Image is a property of the material, find out all images involved by the delete
  * object and scehedule a remove instances.
  */
-void CDoc::ScheduleRemoveImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::ScheduleRemoveImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                         CCmdBatch * /*outBatch*/)
 {
     IterateImageInstances(inInstance, NULL);
@@ -2709,7 +2709,7 @@ void CDoc::ScheduleRemoveImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance
 /**
  * Remove all DataModel instances and schedule a delete
  */
-void CDoc::ScheduleRemoveDataModelInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::ScheduleRemoveDataModelInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                             CCmdBatch *outBatch)
 {
     // remove my children
@@ -2730,13 +2730,13 @@ void CDoc::ScheduleRemoveDataModelInstances(qt3dsdm::CUICDMInstanceHandle inInst
  * by the delete
  * object and scehedule a remove instances.
  */
-void CDoc::ScheduleRemoveComponentInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+void CDoc::ScheduleRemoveComponentInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                             CCmdBatch *outBatch)
 {
     CClientDataModelBridge *theClientBridge = GetStudioSystem()->GetClientDataModelBridge();
     if (theClientBridge->IsComponentInstance(inInstance)) {
         Q3DStudio::CId theInstanceId = theClientBridge->GetGUID(inInstance);
-        qt3dsdm::CUICDMInstanceHandle theInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theInstance =
             theClientBridge->GetComponentInstanceByGUID(theInstanceId);
         CCmd *theCmd = new CCmdDataModelDeleteComponentInstance(this, theInstance);
         outBatch->AddCommand(theCmd);
@@ -2755,8 +2755,8 @@ void CDoc::SetDefaultKeyframeInterpolation(bool inSmooth)
     GetStudioSystem()->GetAnimationSystem()->SetInterpolation(inSmooth);
 }
 
-void CDoc::AddToGraph(qt3dsdm::CUICDMInstanceHandle inParentInstance,
-                      qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::AddToGraph(qt3dsdm::Qt3DSDMInstanceHandle inParentInstance,
+                      qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!inInstance.Valid())
         return;
@@ -2784,7 +2784,7 @@ void CDoc::OnPresentationDeactivated()
 {
 }
 
-void CDoc::CheckActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CDoc::CheckActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     Q3DStudio::CString theListOfTargets;
     GetActionDependencies(inInstance, theListOfTargets);
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h
index a882a9f9..7f686f0f 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.h
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.h
@@ -183,8 +183,8 @@ public:
     bool IsModified();
     bool IsValid() const;
 
-    qt3dsdm::CUICDMInstanceHandle GetInstanceFromSelectable(Q3DStudio::SSelectedValue inSelectedItem);
-    qt3dsdm::CUICDMInstanceHandle GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstanceFromSelectable(Q3DStudio::SSelectedValue inSelectedItem);
+    qt3dsdm::Qt3DSDMInstanceHandle GetSelectedInstance();
 
     void CutSelectedObject();
     void DeleteSelectedObject();
@@ -193,7 +193,7 @@ public:
 
     // Cut object to clipboard
     void CutObject(qt3dsdm::TInstanceHandleList inInstance);
-    void CutObject(qt3dsdm::CUICDMInstanceHandle inInstance)
+    void CutObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         qt3dsdm::TInstanceHandleList objects;
         objects.push_back(inInstance);
@@ -201,18 +201,18 @@ public:
     }
     // copy object to clipboard
     void CopyObject(qt3dsdm::TInstanceHandleList inInstance);
-    void CopyObject(qt3dsdm::CUICDMInstanceHandle inInstance)
+    void CopyObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         qt3dsdm::TInstanceHandleList objects;
         objects.push_back(inInstance);
         CopyObject(objects);
     }
     // paste object to clipboard
-    void PasteObject(qt3dsdm::CUICDMInstanceHandle inInstance);
-    void PasteObjectMaster(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void PasteObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    void PasteObjectMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void DeleteObject(const qt3dsdm::TInstanceHandleList &inInstances);
 
-    void DeleteObject(qt3dsdm::CUICDMInstanceHandle inInstance)
+    void DeleteObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         qt3dsdm::TInstanceHandleList theInstances;
         theInstances.push_back(inInstance);
@@ -239,15 +239,15 @@ public:
     bool CanCut(); // for objects or keyframes or actions
     void HandleDuplicateCommand();
 
-    bool VerifyCanRename(qt3dsdm::CUICDMInstanceHandle inAsset);
+    bool VerifyCanRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset);
 
     void DeselectAllItems(bool inSendEvent);
     void DeselectAllItems() { DeselectAllItems(true); }
 
-    qt3dsdm::CUICDMInstanceHandle GetActiveLayer();
-    void SetActiveLayer(qt3dsdm::CUICDMInstanceHandle inLayerInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetActiveLayer();
+    void SetActiveLayer(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance);
     qt3dsdm::CUICDMSlideHandle GetActiveSlide();
-    void OnLayerDeleted(qt3dsdm::CUICDMInstanceHandle inLayerInstance);
+    void OnLayerDeleted(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance);
 
     void SetPlayMode(EPlayMode inPlayMode, long inRestoreTime = -1);
     bool IsPlaying();
@@ -255,10 +255,10 @@ public:
 
     void RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler);
 
-    qt3dsdm::CUICDMInstanceHandle GetSceneInstance() { return m_SceneInstance; }
+    qt3dsdm::Qt3DSDMInstanceHandle GetSceneInstance() { return m_SceneInstance; }
 
     // IDoc
-    virtual qt3dsdm::CUICDMInstanceHandle GetActiveRootInstance();
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetActiveRootInstance();
     long GetCurrentViewTime() const override;
     virtual void OnComponentSeconds();
     // Notify time changed and set the playback clock to this time.
@@ -279,7 +279,7 @@ public:
     IKeyframesManager *GetKeyframesManager() override;
     qt3dsdm::IPropertySystem *GetPropertySystem() override;
     qt3dsdm::IAnimationCore *GetAnimationCore() override;
-    void SetInstancePropertyValue(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                           const std::wstring &inPropertyName,
                                           const qt3dsdm::SValue &inValue) override;
     Q3DStudio::IDocumentBufferCache &GetBufferCache() override;
@@ -305,10 +305,10 @@ public:
     virtual std::shared_ptr<qt3dsdm::IDOMReader> CreateDOMReader(CBufferedInputStream &inStream,
                                                                  qt3ds::QT3DSI32 &outVersion);
 
-    void SelectUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstanceHandle);
+    void SelectUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
     // multiselect support
-    void ToggleUICDMObjectToSelection(qt3dsdm::CUICDMInstanceHandle inInstanceHandle);
-    void SelectAndNavigateToUICDMObject(qt3dsdm::CUICDMInstanceHandle inInstanceHandle);
+    void ToggleUICDMObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
+    void SelectAndNavigateToUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
     long GetLatestEndTime();
 
     CCore *GetCore() override;
@@ -338,27 +338,27 @@ public:
     }
 
     void SetDefaultKeyframeInterpolation(bool inSmooth);
-    void ScheduleRemoveImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance, CCmdBatch *outBatch);
-    void ScheduleRemoveDataModelInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void ScheduleRemoveImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CCmdBatch *outBatch);
+    void ScheduleRemoveDataModelInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                           CCmdBatch *outBatch);
-    void ScheduleRemoveComponentInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void ScheduleRemoveComponentInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                           CCmdBatch *outBatch);
 
     TAssetGraphPtr GetAssetGraph() { return m_AssetGraph; }
-    virtual void AddToGraph(qt3dsdm::CUICDMInstanceHandle inParentInstance,
-                            qt3dsdm::CUICDMInstanceHandle inInstance);
+    virtual void AddToGraph(qt3dsdm::Qt3DSDMInstanceHandle inParentInstance,
+                            qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
     // helper
-    void IterateImageInstances(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void IterateImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                std::vector<Q3DStudio::CId> *outImageIdList);
-    qt3dsdm::CUICDMInstanceHandle GetObjectbySelectMode(qt3dsdm::CUICDMInstanceHandle inInstance,
+    qt3dsdm::Qt3DSDMInstanceHandle GetObjectbySelectMode(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                       bool inGroupMode);
 
     // ICmdStackModifier
     bool CanUndo() override;
     bool PreUndo() override;
 
-    void CheckActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void CheckActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void SetActiveSlideWithTransaction(qt3dsdm::CUICDMSlideHandle inNewActiveSlide);
 
     void SetSceneGraph(std::shared_ptr<Q3DStudio::IDocSceneGraph> inGraph);
@@ -375,8 +375,8 @@ protected:
     // Set the active slide, return true if delving
     void SetActiveSlideChange(qt3dsdm::CUICDMSlideHandle inNewActiveSlide);
     void OnSlideDeleted(qt3dsdm::CUICDMSlideHandle inSlide);
-    void OnInstanceDeleted(qt3dsdm::CUICDMInstanceHandle inInstance);
-    Q3DStudio::SSelectedValue SetupInstanceSelection(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void OnInstanceDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    Q3DStudio::SSelectedValue SetupInstanceSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     // Set the selection, but don't send an event.
     bool SetSelection(Q3DStudio::SSelectedValue inNewSelection = Q3DStudio::SSelectedValue());
     void LoadPresentationFile(CBufferedInputStream *inInputStream);
@@ -392,18 +392,18 @@ protected:
     void ClosePresentation();
 
     void DeleteSelectedItems();
-    void GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                Q3DStudio::CString &ioActionDependencies);
-    void GetActionDependencies(qt3dsdm::CUICDMInstanceHandle inInstance,
+    void GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                qt3dsdm::TActionHandleList &ioActionList);
 
     bool OnNudgeKey(int inChar, int inRepeatCount, Qt::KeyboardModifiers modifiers);
     void OnNudgeDone();
 
-    qt3dsdm::CUICDMInstanceHandle GetFirstSelectableLayer();
-    qt3dsdm::CUICDMInstanceHandle GetTopmostGroup(qt3dsdm::CUICDMInstanceHandle inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle GetFirstSelectableLayer();
+    qt3dsdm::Qt3DSDMInstanceHandle GetTopmostGroup(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
-    void GetActionsAffectedByRename(qt3dsdm::CUICDMInstanceHandle inAsset,
+    void GetActionsAffectedByRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset,
                                     std::set<Q3DStudio::CString> &ioActionsAffected);
 
     bool isFocusOnTextEditControl();
@@ -416,9 +416,9 @@ protected:
     Q3DStudio::SSelectedValue m_SelectedObject; ///< DIE USELESS COMMENTS DIE.
     long m_CurrentViewTime; ///< The current time that is displayed by the playhead, not necessarily
                             ///the client time.
-    qt3dsdm::CUICDMInstanceHandle m_SceneInstance; ///< Pointer to the root level Scene object.
+    qt3dsdm::Qt3DSDMInstanceHandle m_SceneInstance; ///< Pointer to the root level Scene object.
     qt3dsdm::CUICDMSlideHandle m_ActiveSlide; ///< The currently active Slide Handle.
-    qt3dsdm::CUICDMInstanceHandle m_ActiveLayer; ///< The currently active layer.
+    qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer; ///< The currently active layer.
     CPlaybackClock *m_PlaybackClock; ///< Playback clock. This is used when user clicks "Play"
     CCore *m_Core;
     bool m_IsModified;
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index 50283102..449cace5 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -242,7 +242,7 @@ public:
     // IDocumentReader
     //////////////////////////////////////////////////////////////////
 
-    bool IsInstance(CUICDMInstanceHandle instance) const override
+    bool IsInstance(Qt3DSDMInstanceHandle instance) const override
     {
         return m_DataCore.IsInstance(instance);
     }
@@ -262,7 +262,7 @@ public:
             bool eyeballVal = qt3dsdm::get<bool>(eyeball);
             long theStart = qt3dsdm::get<qt3ds::QT3DSI32>(startTime);
             long theEnd = qt3dsdm::get<qt3ds::QT3DSI32>(endTime);
-            CUICDMInstanceHandle theInstance(inInstance);
+            Qt3DSDMInstanceHandle theInstance(inInstance);
             SInstanceSlideInformation theSlideInfo(
                 theSlideSystem.GetInstanceSlideInformation(theInstance));
             CUICDMSlideHandle theAssociatedSlide = theSlideInfo.m_AssociatedSlide;
@@ -276,7 +276,7 @@ public:
         return false;
     }
 
-    TPropertyHandle FindProperty(CUICDMInstanceHandle instance,
+    TPropertyHandle FindProperty(Qt3DSDMInstanceHandle instance,
                                          const wchar_t *inPropName) const override
     {
         return m_DataCore.GetAggregateInstancePropertyByName(instance, inPropName);
@@ -421,7 +421,7 @@ public:
         return false;
     }
 
-    void GetAllPaths(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    void GetAllPaths(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                      TSlideStringList &outPaths) const
     {
         SComposerObjectDefinitions &theDefinitions(m_Bridge.GetObjectDefinitions());
@@ -452,14 +452,14 @@ public:
         }
     }
 
-    void GetAllSourcePaths(CUICDMInstanceHandle inInstance, TSlideStringList &outPaths) const override
+    void GetAllSourcePaths(Qt3DSDMInstanceHandle inInstance, TSlideStringList &outPaths) const override
     {
         SComposerObjectDefinitions &theDefinitions(m_Bridge.GetObjectDefinitions());
         GetAllPaths(inInstance, theDefinitions.m_Asset.m_SourcePath, outPaths);
     }
 
     void GetPathToInstanceMap(TCharPtrToSlideInstanceMap &outInstanceMap,
-                              qt3dsdm::CUICDMPropertyHandle inProperty,
+                              qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                               bool inIncludeIdentifiers = true) const
     {
         SComposerObjectDefinitions &theDefinitions(m_Bridge.GetObjectDefinitions());
@@ -468,7 +468,7 @@ public:
         m_DataCore.GetInstancesDerivedFrom(existing, theDefinitions.m_Asset.m_Instance);
         outInstanceMap.clear();
         for (size_t idx = 0, end = existing.size(); idx < end; ++idx) {
-            CUICDMInstanceHandle theAsset(existing[idx]);
+            Qt3DSDMInstanceHandle theAsset(existing[idx]);
             thePaths.clear();
             GetAllPaths(theAsset, inProperty, thePaths);
 
@@ -520,7 +520,7 @@ public:
             if (theAssociatedSlide.Valid() && m_SlideSystem.IsMasterSlide(theAssociatedSlide)) {
                 SValue theValue;
                 if (thePropertyMetaData == AdditionalMetaDataType::Image) {
-                    qt3dsdm::CUICDMInstanceHandle theInstance =
+                    qt3dsdm::Qt3DSDMInstanceHandle theInstance =
                         GetImageInstanceForProperty(inInstance, inProperty);
                     if (theInstance)
                         return IsPropertyLinked(theInstance, m_Bridge.GetSourcePathProperty());
@@ -614,7 +614,7 @@ public:
         return std::make_pair((long)0, (long)0);
     }
 
-    qt3dsdm::SLong4 GetGuidForInstance(CUICDMInstanceHandle instance) const override
+    qt3dsdm::SLong4 GetGuidForInstance(Qt3DSDMInstanceHandle instance) const override
     {
         if (IsInstance(instance)) {
             Q3DStudio::CId theId(m_Bridge.GetGUID(instance));
@@ -633,7 +633,7 @@ public:
     {
         return m_Bridge.GetInstance(inRoot, inReference);
     }
-    CUICDMInstanceHandle GetParent(CUICDMInstanceHandle child) const override
+    Qt3DSDMInstanceHandle GetParent(Qt3DSDMInstanceHandle child) const override
     {
         return m_AssetGraph.GetParent(child);
     }
@@ -680,7 +680,7 @@ public:
     bool AnimationExists(TSlideHandle inSlide, TInstanceHandle instance,
                                  const wchar_t *propName, long subIndex) override
     {
-        CUICDMPropertyHandle propHdl =
+        Qt3DSDMPropertyHandle propHdl =
             m_DataCore.GetAggregateInstancePropertyByName(instance, propName);
         if (propHdl.Valid() == false) {
             QT3DS_ASSERT(false);
@@ -699,10 +699,10 @@ public:
         return m_AnimationCore.GetAnimation(inSlide, instance, propHdl, subIndex).Valid();
     }
 
-    bool IsAnimationArtistEdited(TSlideHandle inSlide, CUICDMInstanceHandle instance,
+    bool IsAnimationArtistEdited(TSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
                                          const wchar_t *propName, long subIndex) override
     {
-        CUICDMPropertyHandle propHdl =
+        Qt3DSDMPropertyHandle propHdl =
             m_DataCore.GetAggregateInstancePropertyByName(instance, propName);
         if (propHdl.Valid() == false) {
             QT3DS_ASSERT(false);
@@ -749,7 +749,7 @@ public:
 
     // Exposed through document reader interface
     virtual std::shared_ptr<qt3dsdm::IDOMReader>
-    CopySceneGraphObjectToMemory(CUICDMInstanceHandle inInstance) override
+    CopySceneGraphObjectToMemory(Qt3DSDMInstanceHandle inInstance) override
     {
         TInstanceHandleList instanceList;
         instanceList.push_back(inInstance);
@@ -918,18 +918,18 @@ public:
 
     bool FilterForNotInSlideAndNotInstance(Q3DStudio::TIdentifier inInstance,
                                            CUICDMSlideHandle inSlide,
-                                           CUICDMInstanceHandle inTargetInstance)
+                                           Qt3DSDMInstanceHandle inTargetInstance)
     {
         CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         CUICDMSlideHandle theParentSlide = m_SlideSystem.GetMasterSlide(theAssociatedSlide);
-        if (inTargetInstance == CUICDMInstanceHandle(inInstance)
+        if (inTargetInstance == Qt3DSDMInstanceHandle(inInstance)
             || (theAssociatedSlide != inSlide && theAssociatedSlide != theParentSlide))
             return true; // The object is *not* in present in this slide or is the target instance
         // the object *is* present in this slide.
         return false;
     }
 
-    void SetTimeRangeToParent(CUICDMInstanceHandle inInstance)
+    void SetTimeRangeToParent(Qt3DSDMInstanceHandle inInstance)
     {
         CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         if (theAssociatedSlide.Valid() == false)
@@ -938,10 +938,10 @@ public:
         TSlideHandleList theChildSlides;
         m_SlideCore.GetChildSlides(theAssociatedSlide, theChildSlides);
         theChildSlides.insert(theChildSlides.begin(), theAssociatedSlide);
-        CUICDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
+        Qt3DSDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
 
-        CUICDMPropertyHandle theStartProp = m_Bridge.GetObjectDefinitions().m_Asset.m_StartTime;
-        CUICDMPropertyHandle theEndProp = m_Bridge.GetObjectDefinitions().m_Asset.m_EndTime;
+        Qt3DSDMPropertyHandle theStartProp = m_Bridge.GetObjectDefinitions().m_Asset.m_StartTime;
+        Qt3DSDMPropertyHandle theEndProp = m_Bridge.GetObjectDefinitions().m_Asset.m_EndTime;
         bool isParentSlideOwner =
             m_Bridge.GetObjectDefinitions().IsA(theParent, ComposerObjectTypes::SlideOwner);
 
@@ -957,7 +957,7 @@ public:
                                                  this, std::placeholders::_1, theChildSlide,
                                                  inInstance));
                 m_AssetGraph.GetChildren(theIterator, theParent);
-                CUICDMInstanceHandle thePreviousItem;
+                Qt3DSDMInstanceHandle thePreviousItem;
                 if (theIterator.IsDone())
                     continue;
 
@@ -978,11 +978,11 @@ public:
         }
     }
 
-    virtual CUICDMInstanceHandle
+    virtual Qt3DSDMInstanceHandle
     CreateSceneGraphInstance(qt3dsdm::ComposerObjectTypes::Enum inType, TInstanceHandle inParent,
                              TSlideHandle inSlide, TInstanceHandle inTargetId = TInstanceHandle()) override
     {
-        CUICDMInstanceHandle retval = IDocumentEditor::CreateSceneGraphInstance(
+        Qt3DSDMInstanceHandle retval = IDocumentEditor::CreateSceneGraphInstance(
             ComposerObjectTypes::Convert(inType), inParent, inSlide, m_DataCore, m_SlideSystem,
             m_Bridge.GetObjectDefinitions(), m_AssetGraph, m_MetaData, inTargetId);
         SetTimeRangeToParent(retval);
@@ -1031,7 +1031,7 @@ public:
         return FinalizeAddOrDrop(retval, inParent, inInsertType, inPosition, false);
     }
 
-    TCharPtr GetSourcePath(CUICDMInstanceHandle inInstance)
+    TCharPtr GetSourcePath(Qt3DSDMInstanceHandle inInstance)
     {
         Option<SValue> theValue = GetInstancePropertyValue(
             inInstance, m_Bridge.GetObjectDefinitions().m_Asset.m_SourcePath);
@@ -1043,7 +1043,7 @@ public:
         return L"";
     }
 
-    void DoDeleteInstance(CUICDMInstanceHandle instance)
+    void DoDeleteInstance(Qt3DSDMInstanceHandle instance)
     {
         // For delete, the metadata needs to participate in the undo/redo system.
         m_MetaData.SetConsumer(m_StudioSystem.GetFullSystem()->GetConsumer());
@@ -1060,7 +1060,7 @@ public:
             std::vector<Q3DStudio::CId> imageIdList;
             m_Doc.IterateImageInstances(instance, &imageIdList);
             for (size_t idx = 0, end = imageIdList.size(); idx < end; ++idx) {
-                qt3dsdm::CUICDMInstanceHandle theInstance =
+                qt3dsdm::Qt3DSDMInstanceHandle theInstance =
                     m_Bridge.GetInstanceByGUID(imageIdList[idx]);
                 if (IsInstance(theInstance))
                     m_DataCore.DeleteInstance(theInstance);
@@ -1118,8 +1118,8 @@ public:
 
         } else if (m_Bridge.IsImageInstance(instance)) {
             // Unassign the image property from material
-            CUICDMInstanceHandle theParent;
-            CUICDMPropertyHandle theProperty;
+            Qt3DSDMInstanceHandle theParent;
+            Qt3DSDMPropertyHandle theProperty;
 
             if (!m_Bridge.GetMaterialFromImageInstance(instance, theParent, theProperty))
                 m_Bridge.GetLayerFromImageProbeInstance(instance, theParent, theProperty);
@@ -1128,7 +1128,7 @@ public:
         } else if (m_Bridge.IsBehaviorInstance(instance) || m_Bridge.IsEffectInstance(instance)) {
             // Check if this is the last instance that uses the same sourcepath property
             // If yes, delete the parent as well
-            CUICDMInstanceHandle theObjectDefInstance;
+            Qt3DSDMInstanceHandle theObjectDefInstance;
             if (m_Bridge.IsBehaviorInstance(instance))
                 theObjectDefInstance = m_Bridge.GetObjectDefinitions().m_Behavior.m_Instance;
             else
@@ -1137,10 +1137,10 @@ public:
             // First, we need to get the parent instance that has the same sourcepath property
             CFilePath theSourcePath(GetSourcePath(instance));
             TInstanceHandleList theParents;
-            CUICDMInstanceHandle theInstanceParent;
+            Qt3DSDMInstanceHandle theInstanceParent;
             m_DataCore.GetInstanceParents(instance, theParents);
             for (size_t idx = 0; idx < theParents.size(); ++idx) {
-                CUICDMInstanceHandle theParent(theParents[idx]);
+                Qt3DSDMInstanceHandle theParent(theParents[idx]);
                 if (m_DataCore.IsInstanceOrDerivedFrom(theParent, theObjectDefInstance)
                     && theParent != theObjectDefInstance
                     && theSourcePath == GetSourcePath(theParent)) {
@@ -1177,7 +1177,7 @@ public:
         }
     }
 
-    void RecursiveDeleteInstanceInSceneGraph(CUICDMInstanceHandle instance)
+    void RecursiveDeleteInstanceInSceneGraph(Qt3DSDMInstanceHandle instance)
     {
         while (m_AssetGraph.GetChildCount(instance))
             RecursiveDeleteInstanceInSceneGraph(m_AssetGraph.GetChild(instance, 0));
@@ -1187,7 +1187,7 @@ public:
     void DeleteInstances(qt3dsdm::TInstanceHandleList instances) override
     {
         for (size_t idx = 0, end = instances.size(); idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(instances[idx]);
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(instances[idx]);
             if (theInstance == m_Doc.GetSceneInstance()) {
                 // Something is really really wrong here. Scene should never be deleted.
                 QT3DS_ASSERT(false);
@@ -1201,7 +1201,7 @@ public:
     }
 
     void SetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle instance,
+                                                  Qt3DSDMInstanceHandle instance,
                                                   TPropertyHandle propName, const SValue &value) override
     {
         if (inSlide.Valid() == false)
@@ -1244,7 +1244,7 @@ public:
         TInstanceHandleList theMaterials;
         // Child count is required in the loop on purpose.
         for (long child = 0; child < m_AssetGraph.GetChildCount(instance); ++child) {
-            CUICDMInstanceHandle theMaterial(m_AssetGraph.GetChild(instance, child));
+            Qt3DSDMInstanceHandle theMaterial(m_AssetGraph.GetChild(instance, child));
             if (m_Bridge.IsMaterialBaseInstance(theMaterial)) {
                 if (theMaterials.size() < numSubsets)
                     theMaterials.push_back(theMaterial);
@@ -1281,10 +1281,10 @@ public:
                 const wstring &theSubsetName =
                     Q3DStudio::CString(theBuffer->m_Subsets[subsetIdx].m_Name.c_str()).c_str();
                 if (theSubsetName.size()) {
-                    CUICDMInstanceHandle theMaterial(theMaterials[subsetIdx]);
+                    Qt3DSDMInstanceHandle theMaterial(theMaterials[subsetIdx]);
                     SValue theValue;
                     CUICDMSlideHandle theSlide(theValues[propIdx].first);
-                    CUICDMPropertyHandle theNameProp(
+                    Qt3DSDMPropertyHandle theNameProp(
                         m_Bridge.GetObjectDefinitions().m_Named.m_NameProp);
                     SValue theDMValue;
                     if (theSlide.Valid()) {
@@ -1375,7 +1375,7 @@ public:
         if (theProperytMetaData == AdditionalMetaDataType::Image) {
             TDataStrPtr theImageSourcePath = get<TDataStrPtr>(value);
             bool hasValue = theImageSourcePath && theImageSourcePath->GetLength() > 0;
-            qt3dsdm::CUICDMInstanceHandle theImageInstance =
+            qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
                 GetImageInstanceForProperty(instance, propName);
             if (hasValue) {
                 if (theImageInstance.Valid() == false)
@@ -1470,8 +1470,8 @@ public:
                 bool needsStroke = (((int)newMaterialSlot) & PathMaterialSlots::Stroke) > 0;
                 bool needsFill = (((int)newMaterialSlot) & PathMaterialSlots::Fill) > 0;
                 // first, remove any materials that should not be there.
-                qt3dsdm::CUICDMInstanceHandle firstMaterial;
-                qt3dsdm::CUICDMInstanceHandle secondMaterial;
+                qt3dsdm::Qt3DSDMInstanceHandle firstMaterial;
+                qt3dsdm::Qt3DSDMInstanceHandle secondMaterial;
                 for (int idx = 0, end = m_AssetGraph.GetChildCount(instance); idx < end; ++idx) {
                     TInstanceHandle childAsset = m_AssetGraph.GetChild(instance, idx);
                     if (m_Bridge.IsMaterialInstance(childAsset)) {
@@ -1520,7 +1520,7 @@ public:
     {
         // Check to make sure there isn't one already assigned here.
         {
-            qt3dsdm::CUICDMInstanceHandle theImageInstance =
+            qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
                 GetImageInstanceForProperty(instance, propName);
             if (theImageInstance.Valid())
                 return theImageInstance;
@@ -1552,7 +1552,7 @@ public:
     void DeleteImageInstanceFromMaterialOrLayer(TInstanceHandle instance, TPropertyHandle propName)
     {
         CUICDMSlideHandle theAssociatedSlide(GetAssociatedSlide(instance));
-        qt3dsdm::CUICDMInstanceHandle theImageInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theImageInstance =
             GetImageInstanceForProperty(instance, propName);
         if (theImageInstance.Valid()) {
             DeleteInstance(theImageInstance);
@@ -1719,7 +1719,7 @@ public:
             assert(0);
             return;
         }
-        CUICDMInstanceHandle theComponentInstance = m_Bridge.GetOwningComponentInstance(theSlide);
+        Qt3DSDMInstanceHandle theComponentInstance = m_Bridge.GetOwningComponentInstance(theSlide);
         if (theComponentInstance.Valid() == false) {
             assert(0);
             return;
@@ -1733,7 +1733,7 @@ public:
             // Check if the action target object is the owning component instance, for example if
             // the target object is the Scene
             SActionInfo theActionInfo = m_ActionCore.GetActionInfo(*theIter);
-            CUICDMInstanceHandle theTargetInstance =
+            Qt3DSDMInstanceHandle theTargetInstance =
                 m_Bridge.GetInstance(theActionInfo.m_Owner, theActionInfo.m_TargetObject);
             if (theTargetInstance == theComponentInstance) {
                 CUICDMHandlerHandle theHandler = m_Bridge.ResolveHandler(theActionInfo);
@@ -1778,7 +1778,7 @@ public:
         CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(instance);
         SValue theValue;
         if (thePropertyMetaData == AdditionalMetaDataType::Image) {
-            qt3dsdm::CUICDMInstanceHandle theInstance;
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance;
             if (m_SlideCore.GetSpecificInstancePropertyValue(theAssociatedSlide, instance, propName,
                                                              theValue)) {
                 SLong4 theGuid(get<SLong4>(theValue));
@@ -1811,7 +1811,7 @@ public:
             && m_SlideCore.GetSpecificInstancePropertyValue(theAssociatedSlide, instance, propName,
                                                             theValue)) {
             SLong4 theGuid(get<SLong4>(theValue));
-            qt3dsdm::CUICDMInstanceHandle theInstance = m_Bridge.GetInstanceByGUID(theGuid);
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance = m_Bridge.GetInstanceByGUID(theGuid);
             if (theInstance) {
                 LinkProperty(theInstance, m_Bridge.GetSourcePathProperty());
                 // If the instance has no source path property, then we get rid of it automatically.
@@ -1882,7 +1882,7 @@ public:
     }
     // The original implementation of this function is absolutely not correct
     // in all cases.
-    void GetAssetChildrenInActiveSlide(CUICDMInstanceHandle inInstance, CGraphIterator &outIterator)
+    void GetAssetChildrenInActiveSlide(Qt3DSDMInstanceHandle inInstance, CGraphIterator &outIterator)
     {
         outIterator +=
             Q3DStudio::TFilter(std::bind(&CDocEditor::IsAssetNotInActiveSlide, this,
@@ -1993,7 +1993,7 @@ public:
                                                   qt3dsdm::SStringRef(inComment.c_str()));
     }
 
-    void AddChild(CUICDMInstanceHandle parent, CUICDMInstanceHandle child,
+    void AddChild(Qt3DSDMInstanceHandle parent, Qt3DSDMInstanceHandle child,
                           TInstanceHandle inNextSibling) override
     {
         TInstanceHandle currentParent = m_AssetGraph.GetParent(child);
@@ -2004,7 +2004,7 @@ public:
         else
             m_AssetGraph.MoveTo(child, parent, COpaquePosition::LAST);
     }
-    void RemoveChild(CUICDMInstanceHandle parent, CUICDMInstanceHandle child) override
+    void RemoveChild(Qt3DSDMInstanceHandle parent, Qt3DSDMInstanceHandle child) override
     {
         if (m_AssetGraph.GetParent(child) == parent) {
             m_AssetGraph.RemoveChild(child, false);
@@ -2048,18 +2048,18 @@ public:
         m_AnimationCore.DeleteAllKeyframes(inAnimation);
     }
 
-    void KeyframeProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    void KeyframeProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                   bool inDoDiffValue) override
     {
         m_AnimationSystem.KeyframeProperty(inInstance, inProperty, inDoDiffValue);
     }
 
     virtual CUICDMAnimationHandle
-    CreateOrSetAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle instance,
+    CreateOrSetAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
                          const wchar_t *propName, long subIndex, EAnimationType animType,
                          const float *keyframeValues, long numValues, bool /*inUserEdited*/) override
     {
-        CUICDMPropertyHandle propHdl =
+        Qt3DSDMPropertyHandle propHdl =
             m_DataCore.GetAggregateInstancePropertyByName(instance, propName);
         if (propHdl.Valid() == false) {
             QT3DS_ASSERT(false);
@@ -2109,10 +2109,10 @@ public:
         }
         return animHandle;
     }
-    bool RemoveAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle instance,
+    bool RemoveAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle instance,
                                  const wchar_t *propName, long subIndex) override
     {
-        CUICDMPropertyHandle propHdl =
+        Qt3DSDMPropertyHandle propHdl =
             m_DataCore.GetAggregateInstancePropertyByName(instance, propName);
         if (propHdl.Valid() == false) {
             QT3DS_ASSERT(false);
@@ -2132,8 +2132,8 @@ public:
         m_AnimationCore.SetIsArtistEdited(inAnimation, inEdited);
     }
 
-    qt3dsdm::CUICDMInstanceHandle
-    FinalizeAddOrDrop(qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::CUICDMInstanceHandle inParent,
+    qt3dsdm::Qt3DSDMInstanceHandle
+    FinalizeAddOrDrop(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMInstanceHandle inParent,
                       DocumentEditorInsertType::Enum inInsertType, const CPt &inPosition,
                       bool inSetTimeRangeToParent, bool inSelectInstanceWhenFinished = true)
     {
@@ -2155,7 +2155,7 @@ public:
         return inInstance;
     }
 
-    CString GetName(CUICDMInstanceHandle inInstance) const override
+    CString GetName(Qt3DSDMInstanceHandle inInstance) const override
     {
         Option<SValue> theValue = GetInstancePropertyValue(
             inInstance, m_Bridge.GetObjectDefinitions().m_Named.m_NameProp);
@@ -2167,7 +2167,7 @@ public:
         return L"";
     }
 
-    CString GetSourcePath(CUICDMInstanceHandle inInstance) const override
+    CString GetSourcePath(Qt3DSDMInstanceHandle inInstance) const override
     {
         Option<SValue> theValue = GetInstancePropertyValue(
             inInstance, m_Bridge.GetObjectDefinitions().m_Asset.m_SourcePath);
@@ -2179,7 +2179,7 @@ public:
         return L"";
     }
 
-    TInstanceHandle GetFirstBaseClass(CUICDMInstanceHandle inInstance) const override
+    TInstanceHandle GetFirstBaseClass(Qt3DSDMInstanceHandle inInstance) const override
     {
         TInstanceHandleList theList;
         m_DataCore.GetInstanceParents(inInstance, theList);
@@ -2188,7 +2188,7 @@ public:
         return 0;
     }
 
-    void SetName(CUICDMInstanceHandle inInstance, const CString &inName,
+    void SetName(Qt3DSDMInstanceHandle inInstance, const CString &inName,
                          bool inMakeUnique = false) override
     {
         CString theUniqueName = inName;
@@ -2209,7 +2209,7 @@ public:
         TInstanceHandleList retval = theSerializer->SerializeSceneGraphObject(
             *inReader, m_Doc.GetDocumentDirectory(), inNewRoot, GetActiveSlide(inNewRoot));
         for (size_t idx = 0, end = retval.size(); idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(retval[idx]);
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(retval[idx]);
             if (inInsertType == DocumentEditorInsertType::NextSibling)
                 theInstance = retval[end - idx - 1];
 
@@ -2250,7 +2250,7 @@ public:
             *theReader, m_Doc.GetDocumentDirectory(), inNewRoot,
             m_Doc.GetStudioSystem()->GetSlideSystem()->GetMasterSlide(GetActiveSlide(inNewRoot)));
         for (size_t idx = 0, end = retval.size(); idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(retval[idx]);
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(retval[idx]);
             if (inInsertType == DocumentEditorInsertType::NextSibling)
                 theInstance = retval[end - idx - 1];
 
@@ -2262,7 +2262,7 @@ public:
         return retval;
     }
 
-    SFloat3 GetPosition(CUICDMInstanceHandle inInstance)
+    SFloat3 GetPosition(Qt3DSDMInstanceHandle inInstance)
     {
         Option<SValue> theValue =
             GetInstancePropertyValue(inInstance, m_Bridge.GetObjectDefinitions().m_Node.m_Position);
@@ -2271,13 +2271,13 @@ public:
         return SFloat3();
     }
 
-    void SetPosition(CUICDMInstanceHandle inInstance, const SFloat3 &inPos)
+    void SetPosition(Qt3DSDMInstanceHandle inInstance, const SFloat3 &inPos)
     {
         SetInstancePropertyValue(inInstance, m_Bridge.GetObjectDefinitions().m_Node.m_Position,
                                  inPos, false);
     }
 
-    QT3DSU32 BuildGraphOrderItem(qt3dsdm::CUICDMInstanceHandle inInstance, QT3DSU32 inCurrentIndex)
+    QT3DSU32 BuildGraphOrderItem(qt3dsdm::Qt3DSDMInstanceHandle inInstance, QT3DSU32 inCurrentIndex)
     {
         m_GraphOrderMap.insert(std::make_pair(inInstance.GetHandleValue(), inCurrentIndex));
         ++inCurrentIndex;
@@ -2289,7 +2289,7 @@ public:
         return inCurrentIndex;
     }
 
-    QT3DSU32 GetInstanceGraphOrder(qt3dsdm::CUICDMInstanceHandle inInstance)
+    QT3DSU32 GetInstanceGraphOrder(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         if (m_GraphOrderMap.size() == 0) {
             BuildGraphOrderItem(m_AssetGraph.GetRoot(0), 0);
@@ -2300,7 +2300,7 @@ public:
         return QT3DS_MAX_U32;
     }
 
-    bool GraphOrderLessThan(qt3dsdm::CUICDMInstanceHandle lhs, qt3dsdm::CUICDMInstanceHandle rhs)
+    bool GraphOrderLessThan(qt3dsdm::Qt3DSDMInstanceHandle lhs, qt3dsdm::Qt3DSDMInstanceHandle rhs)
     {
         return GetInstanceGraphOrder(lhs) < GetInstanceGraphOrder(rhs);
     }
@@ -2340,7 +2340,7 @@ public:
         }
 
         for (size_t idx = 0, end = sortableList.size(); idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(sortableList[idx]);
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(sortableList[idx]);
             // If the insert type is next sibling, we have to reverse the list
             // in order to respect the ordering.
             if (inInsertType == DocumentEditorInsertType::NextSibling)
@@ -2355,10 +2355,10 @@ public:
         }
     }
 
-    CUICDMInstanceHandle MakeComponent(const qt3dsdm::TInstanceHandleList &inInstances) override
+    Qt3DSDMInstanceHandle MakeComponent(const qt3dsdm::TInstanceHandleList &inInstances) override
     {
         if (inInstances.empty())
-            return CUICDMInstanceHandle();
+            return Qt3DSDMInstanceHandle();
 
         qt3dsdm::TInstanceHandleList theInstances = ToGraphOrdering(inInstances);
         // Do this in reverse order.
@@ -2415,7 +2415,7 @@ public:
         return DoPasteSceneGraphObject(theReader, inDest, true, inInsertType, CPt());
     }
 
-    CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                          const wstring &inEvent, const wstring &inHandler) override
     {
         Q3DStudio::CId theGuid = m_Bridge.GetGUID(inOwner);
@@ -2436,7 +2436,7 @@ public:
     }
 
     CUICDMActionHandle PasteAction(const CFilePath &inFilePath,
-                                           CUICDMInstanceHandle inNewRoot) override
+                                           Qt3DSDMInstanceHandle inNewRoot) override
     {
         CFileSeekableIOStream theStream(inFilePath, FileReadFlags());
         if (theStream.IsOpen() == false) {
@@ -2461,7 +2461,7 @@ public:
         size_t existingCount = m_SlideSystem.GetSlideCount(inMasterSlide);
         for (size_t idx = 0; idx < existingCount; ++idx) {
             CUICDMSlideHandle theSlide = m_SlideSystem.GetSlideByIndex(inMasterSlide, idx);
-            CUICDMInstanceHandle theInstance(m_SlideSystem.GetSlideInstance(theSlide));
+            Qt3DSDMInstanceHandle theInstance(m_SlideSystem.GetSlideInstance(theSlide));
             if (GetName(theInstance) == inName)
                 return true;
         }
@@ -2498,9 +2498,9 @@ public:
             bool hasPrevious = idx > 1;
             bool hasNext = idx < slideCount - 1;
             CUICDMSlideHandle theCurrentSlide = m_SlideSystem.GetSlideByIndex(theMaster, idx);
-            CUICDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theCurrentSlide);
+            Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theCurrentSlide);
             SValue theValue;
-            CUICDMPropertyHandle theProp = m_Bridge.GetObjectDefinitions().m_Slide.m_PlaythroughTo;
+            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) {
@@ -2538,7 +2538,7 @@ public:
     {
         CString theNewName = GenerateUniqueSlideName(L"Slide", inMasterSlide, inIndex);
         CUICDMSlideHandle theNewSlide = m_SlideSystem.DuplicateSlide(inMasterSlide, inIndex);
-        CUICDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
+        Qt3DSDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
         m_DataCore.SetInstancePropertyValue(newInstance,
                                             m_Bridge.GetObjectDefinitions().m_Named.m_NameProp,
                                             std::make_shared<CDataStr>(theNewName.c_str()));
@@ -2547,7 +2547,7 @@ public:
         m_SlideSystem.SetActiveSlide(inMasterSlide, newSlideIndex);
         m_Doc.NotifyActiveSlideChanged(theNewSlide, true);
         CheckSlideGroupPlayThroughTo(theNewSlide);
-        CUICDMInstanceHandle theInstance = m_Doc.GetSelectedInstance();
+        Qt3DSDMInstanceHandle theInstance = m_Doc.GetSelectedInstance();
         if (theInstance.Valid() && GetAssociatedSlide(theInstance) != inMasterSlide)
             m_Doc.SelectUICDMObject(0);
         return theNewSlide;
@@ -2604,7 +2604,7 @@ public:
         CUICDMSlideHandle theNewSlide = theSerializer->SerializeSlide(
             *theReader, m_Doc.GetDocumentDirectory(), theMaster, theIndex);
 
-        CUICDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
+        Qt3DSDMInstanceHandle newInstance(m_SlideSystem.GetSlideInstance(theNewSlide));
         m_DataCore.SetInstancePropertyValue(newInstance,
                                             m_Bridge.GetObjectDefinitions().m_Named.m_NameProp,
                                             std::make_shared<CDataStr>(theNewName.c_str()));
@@ -2665,8 +2665,8 @@ public:
     }
 
     TInstanceHandle DoImport(
-        CFilePath inImportFilePath, Q3DStudio::CString importSrc, CUICDMInstanceHandle inParent,
-        CUICDMInstanceHandle inRoot, CUICDMSlideHandle inSlide, Q3DStudio::CString inDocDir,
+        CFilePath inImportFilePath, Q3DStudio::CString importSrc, Qt3DSDMInstanceHandle inParent,
+        Qt3DSDMInstanceHandle inRoot, CUICDMSlideHandle inSlide, Q3DStudio::CString inDocDir,
         STranslationLog &inTranslationLog,
         function<SImportResult(IComposerEditorInterface &, Q3DStudio::CString)> inImportFunction,
         DocumentEditorInsertType::Enum inInsertType, const CPt &inPosition, long inStartTime)
@@ -2674,9 +2674,9 @@ public:
         CFilePath outputDir(inImportFilePath.GetDirectory());
         bool alwaysKeepDirectory = outputDir.Exists();
         bool keepDirectory = false;
-        CUICDMInstanceHandle theRealParent = inInsertType == DocumentEditorInsertType::LastChild
+        Qt3DSDMInstanceHandle theRealParent = inInsertType == DocumentEditorInsertType::LastChild
             ? inParent
-            : CUICDMInstanceHandle(m_AssetGraph.GetParent(inParent));
+            : Qt3DSDMInstanceHandle(m_AssetGraph.GetParent(inParent));
         // We have to pass in the real parent to the editor interface so that object lifetimes can
         // be
         // setup correctly as the import tree is being built.
@@ -2700,17 +2700,17 @@ public:
                                                  m_Doc.GetImportFailedHandler(), inTranslationLog,
                                                  forceError);
             if (!forceError) {
-                CUICDMInstanceHandle theImportRoot = importToComposer->GetRoot();
+                Qt3DSDMInstanceHandle theImportRoot = importToComposer->GetRoot();
                 CFilePath theRelPath(m_Doc.GetRelativePathToDoc(theDestFile));
                 SValue theSourcePathValue(std::make_shared<CDataStr>(theRelPath.c_str()));
-                CUICDMPropertyHandle theProp(m_Bridge.GetObjectDefinitions().m_Asset.m_SourcePath);
+                Qt3DSDMPropertyHandle theProp(m_Bridge.GetObjectDefinitions().m_Asset.m_SourcePath);
                 if (inSlide.Valid())
                     m_SlideCore.ForceSetInstancePropertyValue(inSlide, theImportRoot, theProp,
                                                               theSourcePathValue);
                 else
                     m_DataCore.SetInstancePropertyValue(theImportRoot, theProp, theSourcePathValue);
 
-                CUICDMInstanceHandle retval =
+                Qt3DSDMInstanceHandle retval =
                     FinalizeAddOrDrop(importToComposer->GetRoot(), inParent, inInsertType,
                                       inPosition, inStartTime == -1);
                 SetName(retval, theRelPath.GetFileStem(), true);
@@ -2826,17 +2826,17 @@ public:
 
         // Automap the image to a rectangle
 
-        qt3dsdm::CUICDMInstanceHandle theModelInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theModelInstance =
             CreateSceneGraphInstance(ComposerObjectTypes::Model, inParent, inSlide);
         m_PropertySystem.SetInstancePropertyValue(
             theModelInstance, m_Bridge.GetSourcePathProperty(),
             std::make_shared<qt3dsdm::CDataStr>(
                 m_Doc.GetBufferCache().GetPrimitiveName(PRIMITIVETYPE_RECT)));
         // Create the default material
-        qt3dsdm::CUICDMInstanceHandle theMaterialInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theMaterialInstance =
             CreateSceneGraphInstance(ComposerObjectTypes::Material, theModelInstance, inSlide);
         // Load the image as the child of the material
-        qt3dsdm::CUICDMInstanceHandle theImageInstance = SetInstancePropertyValueAsImage(
+        qt3dsdm::Qt3DSDMInstanceHandle theImageInstance = SetInstancePropertyValueAsImage(
             theMaterialInstance, m_Bridge.GetDefaultMaterial().m_DiffuseMap1, relativePath);
 
         if (inStartTime != -1)
@@ -2884,7 +2884,7 @@ public:
         // Ensure we include the model buffer version in the relative path
         theRelativePath = m_Doc.GetRelativePathToDoc(theModelBuffer.m_FilePath);
 
-        qt3dsdm::CUICDMInstanceHandle theModelInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theModelInstance =
             CreateSceneGraphInstance(ComposerObjectTypes::Model, inParent, inSlide);
 
         SValue theValue(std::make_shared<qt3dsdm::CDataStr>(theRelativePath));
@@ -3004,8 +3004,8 @@ public:
 
     // Apply meta data to a new dynamic instance.  This sets up the default properties to
     // be what the meta data specifies.
-    void ApplyDynamicMetaData(CUICDMInstanceHandle inDynamicInstance,
-                              CUICDMInstanceHandle inDynamic)
+    void ApplyDynamicMetaData(Qt3DSDMInstanceHandle inDynamicInstance,
+                              Qt3DSDMInstanceHandle inDynamic)
     {
         std::vector<SMetaDataLoadWarning> theWarnings;
         // For all of the object std::ref properties, check if they have an absolute path
@@ -3029,7 +3029,7 @@ public:
                 theOriginalData = theData;
 
                 if (theData.find(L"Scene") == 0 || theData.size() == 0) {
-                    CUICDMInstanceHandle currentInstance = inDynamicInstance;
+                    Qt3DSDMInstanceHandle currentInstance = inDynamicInstance;
                     // Resolve this absolute reference string and override the default values
                     // in the datacore to be this exact datatype
                     if (theData.find(L"Scene") == 0) {
@@ -3052,12 +3052,12 @@ public:
                             }
                             // Attempt to find the item in the asset graph.
                             long theChildCount = m_AssetGraph.GetChildCount(currentInstance);
-                            CUICDMInstanceHandle lastInstance = currentInstance;
+                            Qt3DSDMInstanceHandle lastInstance = currentInstance;
                             currentInstance = 0;
                             for (long childIdx = 0;
                                  childIdx < theChildCount && currentInstance.Valid() == false;
                                  ++childIdx) {
-                                CUICDMInstanceHandle theChild =
+                                Qt3DSDMInstanceHandle theChild =
                                     m_AssetGraph.GetChild(lastInstance, childIdx);
                                 CString theName(GetName(theChild));
                                 if (theName.Compare(theItemName.c_str()))
@@ -3086,7 +3086,7 @@ public:
     public:
         virtual ~ISpecificDynamicInstance() {}
 
-        virtual CUICDMInstanceHandle GetRootInstance() = 0;
+        virtual Qt3DSDMInstanceHandle GetRootInstance() = 0;
         // returns an error if there was one.  Empty string means no error.
         virtual QString LoadInstanceData(const CFilePath &inAbsPath) = 0;
 
@@ -3109,10 +3109,10 @@ public:
         m_DataCore.GetInstancesDerivedFrom(existing, inSpecificInstance.GetRootInstance());
         CFilePath theRelativePath(m_Doc.GetRelativePathToDoc(inFullPathToDocument));
         TInstanceHandleList theParents;
-        CUICDMInstanceHandle theParentInstance;
+        Qt3DSDMInstanceHandle theParentInstance;
         for (size_t idx = 0, end = existing.size(); idx < end && theParentInstance.Valid() == false;
              ++idx) {
-            CUICDMInstanceHandle theBehavior(existing[idx]);
+            Qt3DSDMInstanceHandle theBehavior(existing[idx]);
             theParents.clear();
             m_DataCore.GetInstanceParents(theBehavior, theParents);
             if (theParents.empty() || theParents[0] != inSpecificInstance.GetRootInstance())
@@ -3170,7 +3170,7 @@ public:
         {
         }
 
-        CUICDMInstanceHandle GetRootInstance() override
+        Qt3DSDMInstanceHandle GetRootInstance() override
         {
             return m_Editor.m_Bridge.GetObjectDefinitions().m_Behavior.m_Instance;
         }
@@ -3199,7 +3199,7 @@ public:
         {
         }
 
-        CUICDMInstanceHandle GetRootInstance() override
+        Qt3DSDMInstanceHandle GetRootInstance() override
         {
             return m_Editor.m_Bridge.GetObjectDefinitions().m_Behavior.m_Instance;
         }
@@ -3244,7 +3244,7 @@ public:
         {
         }
 
-        CUICDMInstanceHandle GetRootInstance() override
+        Qt3DSDMInstanceHandle GetRootInstance() override
         {
             return m_Editor.m_Bridge.GetObjectDefinitions().m_RenderPlugin.m_Instance;
         }
@@ -3308,7 +3308,7 @@ public:
         }
 
         // Create text instance
-        qt3dsdm::CUICDMInstanceHandle theTextInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theTextInstance =
             CreateSceneGraphInstance(ComposerObjectTypes::Text, inParent, inSlide);
 
         // Set the Font property to the font file
@@ -3326,7 +3326,7 @@ public:
     }
 
     typedef void (IMetaData::*TDynamicObjectLoader)(const char *inShaderFile,
-                                                    CUICDMInstanceHandle inInstance,
+                                                    Qt3DSDMInstanceHandle inInstance,
                                                     const TCharStr &inName,
                                                     std::vector<SMetaDataLoadWarning> &outWarnings,
                                                     qt3ds::foundation::IInStream &stream);
@@ -3353,10 +3353,10 @@ public:
         m_DataCore.GetInstancesDerivedFrom(existing, inDerivationParent);
         CFilePath theRelativePath(m_Doc.GetRelativePathToDoc(theShaderFile));
         TInstanceHandleList theParents;
-        CUICDMInstanceHandle theParentInstance;
+        Qt3DSDMInstanceHandle theParentInstance;
         for (size_t idx = 0, end = existing.size(); idx < end && theParentInstance.Valid() == false;
              ++idx) {
-            CUICDMInstanceHandle theEffect(existing[idx]);
+            Qt3DSDMInstanceHandle theEffect(existing[idx]);
             theParents.clear();
             m_DataCore.GetInstanceParents(theEffect, theParents);
             if (theParents.empty() || theParents[0] != inDerivationParent)
@@ -3598,7 +3598,7 @@ public:
             }
 
             for (QT3DSU32 idx = 0, end = numAnchors; idx < end; ++idx) {
-                qt3dsdm::CUICDMInstanceHandle anchorCanon =
+                qt3dsdm::Qt3DSDMInstanceHandle anchorCanon =
                     m_MetaData.GetCanonicalInstanceForType(L"PathAnchorPoint");
                 TInstanceHandle anchor = m_DataCore.CreateInstance();
                 TInstanceHandle theDerivationParent(anchorCanon);
@@ -3670,7 +3670,7 @@ public:
                                          m_Bridge.GetObjectDefinitions().m_Path.m_PaintStyle,
                                          TDataStrPtr(new CDataStr(L"Filled and Stroked")));
 
-            qt3dsdm::CUICDMInstanceHandle theFillMaterial =
+            qt3dsdm::Qt3DSDMInstanceHandle theFillMaterial =
                 m_AssetGraph.GetChild(retval, fillMaterialIndex);
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theFillMaterial, m_Bridge.GetObjectDefinitions().m_Material.m_DiffuseColor,
@@ -3680,7 +3680,7 @@ public:
                 fillOpacity);
         }
         if (hasStroke) {
-            qt3dsdm::CUICDMInstanceHandle theStrokeMaterial = m_AssetGraph.GetChild(retval, 0);
+            qt3dsdm::Qt3DSDMInstanceHandle theStrokeMaterial = m_AssetGraph.GetChild(retval, 0);
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theStrokeMaterial,
                 m_Bridge.GetObjectDefinitions().m_Material.m_DiffuseColor, ToUICDM(*strokeColor));
@@ -3908,7 +3908,7 @@ public:
                 TIdMultiMap::iterator theGroupId =
                     theGroupIdMap
                         .insert(make_pair(m_StringTable.GetWideStr(GetImportId(theRoot)),
-                                          vector<pair<CUICDMSlideHandle, CUICDMInstanceHandle>>()))
+                                          vector<pair<CUICDMSlideHandle, 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, CUICDMInstanceHandle>> &theInstances =
+                vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &theInstances =
                     theIter->second;
                 for (size_t freeInstanceIdx = 0, end = theInstances.size(); freeInstanceIdx < end;
                      ++freeInstanceIdx) {
@@ -3929,13 +3929,13 @@ public:
                         != theAddedInstances.end())
                         continue;
                     theAssociatedSlides.clear();
-                    CUICDMInstanceHandle theInstance(theInstances[freeInstanceIdx].second);
+                    Qt3DSDMInstanceHandle theInstance(theInstances[freeInstanceIdx].second);
                     GetAllAssociatedSlides(theInstance, theAssociatedSlides);
                     TIdMultiMap::iterator theInstanceId =
                         theGroupIdMap
                             .insert(
                                 make_pair(m_StringTable.GetWideStr(GetImportId(theInstance)),
-                                          vector<pair<CUICDMSlideHandle, CUICDMInstanceHandle>>()))
+                                          vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>()))
                             .first;
                     for (size_t slideIdx = 0, slideEnd = theAssociatedSlides.size();
                          slideIdx < slideEnd; ++slideIdx)
@@ -4238,7 +4238,7 @@ public:
         TSlideHandleList theChildSlides;
         for (size_t idx = 0, end = theTextInstances.size(); idx < end; ++idx) {
             SValue theValue;
-            qt3dsdm::CUICDMInstanceHandle theTextHandle(theTextInstances[idx]);
+            qt3dsdm::Qt3DSDMInstanceHandle theTextHandle(theTextInstances[idx]);
             if (m_DataCore.GetInstancePropertyValue(theTextHandle, m_Bridge.GetText().m_Font,
                                                     theValue)) {
                 qt3dsdm::TDataStrPtr theDataStr(qt3dsdm::get<qt3dsdm::TDataStrPtr>(theValue));
@@ -4420,12 +4420,12 @@ public:
                                                        theDefinitions.m_Image.m_Instance);
                     for (int rid = 0; rid < renderableInstances.size(); ++rid) {
                         TPropertyHandleList theProperties;
-                        CUICDMInstanceHandle theInstance = renderableInstances[rid];
+                        Qt3DSDMInstanceHandle theInstance = renderableInstances[rid];
                         m_PropertySystem.GetAggregateInstanceProperties(theInstance, theProperties);
                         size_t thePropertyCount = theProperties.size();
                         for (size_t thePropertyIndex = 0;
                              thePropertyIndex < thePropertyCount; ++thePropertyIndex) {
-                            CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+                            Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
                             qt3dsdm::AdditionalMetaDataType::Value theAdditionalMetaDataType =
                                 m_PropertySystem.GetAdditionalMetaDataType(theInstance,
                                                                            theProperty);
@@ -4514,7 +4514,7 @@ public:
                 for (size_t instIdx = 0, instEnd = theInstances.size(); instIdx < instEnd;
                      ++instIdx) {
                     ENSURE_PROGRESS;
-                    CUICDMInstanceHandle theBehavior = theInstances[instIdx].second;
+                    Qt3DSDMInstanceHandle theBehavior = theInstances[instIdx].second;
                     theParents.clear();
                     m_DataCore.GetInstanceParents(theBehavior, theParents);
 
@@ -4645,29 +4645,29 @@ void IDocumentEditor::DisplayImportErrors(const QString &inImportSource,
     }
 }
 
-CUICDMPropertyHandle *
+Qt3DSDMPropertyHandle *
 IDocumentEditor::GetAlwaysUnlinkedProperties(qt3dsdm::SComposerObjectDefinitions &inDefs)
 {
     SComposerObjectDefinitions &theDefs(inDefs);
-    static CUICDMPropertyHandle theProperties[5];
+    static Qt3DSDMPropertyHandle theProperties[5];
     theProperties[0] = theDefs.m_Asset.m_StartTime;
     theProperties[1] = theDefs.m_Asset.m_EndTime;
     theProperties[2] = theDefs.m_Asset.m_Eyeball;
     theProperties[3] = theDefs.m_Asset.m_Shy;
-    theProperties[4] = CUICDMPropertyHandle();
+    theProperties[4] = Qt3DSDMPropertyHandle();
     return theProperties;
 }
 
-void IDocumentEditor::UnlinkAlwaysUnlinkedProperties(CUICDMInstanceHandle inInstance,
+void IDocumentEditor::UnlinkAlwaysUnlinkedProperties(Qt3DSDMInstanceHandle inInstance,
                                                      SComposerObjectDefinitions &inDefs,
                                                      ISlideSystem &inSlideSystem)
 {
-    CUICDMPropertyHandle *theUnlinked(GetAlwaysUnlinkedProperties(inDefs));
-    for (CUICDMPropertyHandle *theHandle = theUnlinked; theHandle->Valid(); ++theHandle)
+    Qt3DSDMPropertyHandle *theUnlinked(GetAlwaysUnlinkedProperties(inDefs));
+    for (Qt3DSDMPropertyHandle *theHandle = theUnlinked; theHandle->Valid(); ++theHandle)
         inSlideSystem.UnlinkProperty(inInstance, *theHandle);
 }
 
-CUICDMInstanceHandle IDocumentEditor::CreateSceneGraphInstance(
+Qt3DSDMInstanceHandle IDocumentEditor::CreateSceneGraphInstance(
     const wchar_t *inType, TInstanceHandle inParent, TSlideHandle inSlide,
     qt3dsdm::IDataCore &inDataCore, qt3dsdm::ISlideSystem &inSlideSystem,
     qt3dsdm::SComposerObjectDefinitions &inObjectDefs, Q3DStudio::CGraph &inAssetGraph,
@@ -4678,8 +4678,8 @@ CUICDMInstanceHandle IDocumentEditor::CreateSceneGraphInstance(
                                     inMetaData, inTargetId);
 }
 
-CUICDMInstanceHandle IDocumentEditor::CreateSceneGraphInstance(
-    CUICDMInstanceHandle inMaster, TInstanceHandle inParent, TSlideHandle inSlide,
+Qt3DSDMInstanceHandle IDocumentEditor::CreateSceneGraphInstance(
+    Qt3DSDMInstanceHandle inMaster, TInstanceHandle inParent, TSlideHandle inSlide,
     qt3dsdm::IDataCore &inDataCore, qt3dsdm::ISlideSystem &inSlideSystem,
     qt3dsdm::SComposerObjectDefinitions &inObjectDefs, Q3DStudio::CGraph &inAssetGraph,
     qt3dsdm::IMetaData &inMetaData, TInstanceHandle inTargetId)
@@ -4844,7 +4844,7 @@ bool CUpdateableDocumentEditor::HasEditor() const
     return m_EditorIDocDoc.IsTransactionOpened() && m_File != NULL;
 }
 
-void CUpdateableDocumentEditor::FireImmediateRefresh(qt3dsdm::CUICDMInstanceHandle *inInstances,
+void CUpdateableDocumentEditor::FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle *inInstances,
                                                      long inInstanceCount)
 {
     m_EditorIDocDoc.GetCore()->GetDispatch()->FireImmediateRefreshInstance(inInstances,
diff --git a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
index 11d11653..ec5ffbdf 100644
--- a/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/GraphUtils.cpp
@@ -156,11 +156,11 @@ const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle
  *	Excludes those whose controlling timeparent are different from inControllingTimeParent
  */
 bool FilterForControllingTimeParent(CDoc *inDoc,
-                                    qt3dsdm::CUICDMInstanceHandle inControllingTimeParent,
+                                    qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent,
                                     Q3DStudio::TIdentifier inGraphable)
 {
     return inDoc->GetStudioSystem()->GetClientDataModelBridge()->GetOwningComponentInstance(
-               static_cast<qt3dsdm::CUICDMInstanceHandle>(inGraphable))
+               static_cast<qt3dsdm::Qt3DSDMInstanceHandle>(inGraphable))
         != inControllingTimeParent;
 }
 
@@ -169,7 +169,7 @@ bool FilterForControllingTimeParent(CDoc *inDoc,
  *	Excludes those whose controlling timeparent are different from inControllingTimeParent
  */
 const Q3DStudio::TFilter
-FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inControllingTimeParent)
+FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent)
 {
     return boost::bind(FilterForControllingTimeParent, inDoc, inControllingTimeParent, _1);
 }
@@ -205,7 +205,7 @@ const Q3DStudio::TFilter FilterForActiveComponent(CDoc *inDoc,
 /**
  *	Excludes those that don't exist in current slide
  */
-bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inTimeParent,
+bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inTimeParent,
                            Q3DStudio::TIdentifier inGraphable)
 {
     qt3dsdm::ISlideSystem *theSlideSystem = inDoc->GetStudioSystem()->GetSlideSystem();
@@ -226,7 +226,7 @@ bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inTimePare
  *	Excludes those that don't exist in current slide
  */
 const Q3DStudio::TFilter FilterForCurrentSlide(CDoc *inDoc,
-                                               qt3dsdm::CUICDMInstanceHandle inTimeParent)
+                                               qt3dsdm::Qt3DSDMInstanceHandle inTimeParent)
 {
     return boost::bind(FilterForCurrentSlide, inDoc, inTimeParent, _1);
 }
@@ -266,7 +266,7 @@ inline void GetReverseChildrenFromGraph(Q3DStudio::TGraphPtr inGraph,
  *	This queries AssetGraph and applies filter to get only EGRAPHABLE_TYPE_ASSET children
  *	An optional filter is applied to get asset of a certain type
  */
-void GetAssetChildren(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildren(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                       Q3DStudio::CGraphIterator &outIterator, EStudioObjectType inObjectType)
 {
     TAssetGraphPtr theGraph = inDoc->GetAssetGraph();
@@ -281,7 +281,7 @@ void GetAssetChildren(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
  *	check if it exists in inSlide or Master.
  *	Used primarily for displaying objects in the timeline in the correct order.
  */
-void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                              qt3dsdm::CUICDMSlideHandle inSlide,
                              Q3DStudio::CGraphIterator &outIterator, EStudioObjectType inObjectType)
 {
@@ -297,7 +297,7 @@ void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstan
  *	This is similar to GetAssetChildren with additional filter:
  *	check if the controlling timeparent is the same
  */
-void GetAssetChildrenInTimeParent(qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc,
+void GetAssetChildrenInTimeParent(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc,
                                   bool inIsAssetTimeParent, Q3DStudio::CGraphIterator &outIterator,
                                   qt3dsdm::CUICDMSlideHandle inActiveComponentSlide)
 {
@@ -319,7 +319,7 @@ void GetAssetChildrenInTimeParent(qt3dsdm::CUICDMInstanceHandle inInstance, CDoc
  *be rendered
  *	The children are returned in reverse order
  */
-void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                     Q3DStudio::CGraphIterator &outIterator,
                                     EStudioObjectType inObjectType)
 {
@@ -327,7 +327,7 @@ void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle i
     TAssetGraphPtr theGraph = inDoc->GetAssetGraph();
     ApplyDefaultAssetCriterias(inDoc, outIterator, inObjectType);
     // get the asset from the active slide of the containing Component
-    qt3dsdm::CUICDMInstanceHandle theTimeParentInstance =
+    qt3dsdm::Qt3DSDMInstanceHandle theTimeParentInstance =
         (theBridge->IsSceneInstance(inInstance) || theBridge->IsComponentInstance(inInstance))
         ? inInstance
         : theBridge->GetOwningComponentInstance(inInstance);
@@ -397,7 +397,7 @@ Q3DStudio::TIdentifier GetSibling(const Q3DStudio::TIdentifier inNode, bool inAf
 /**
  *	Prints the subtree of the asset
  */
-void PrintAssetSubTree(qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc, char *prefix)
+void PrintAssetSubTree(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc, char *prefix)
 {
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     std::cout << prefix << theBridge->GetName(inInstance).GetCharStar() << std::endl;
@@ -425,7 +425,7 @@ void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::CUICDMSlideHandle theMas
             m_Doc->GetStudioSystem()->GetSlideSystem()->GetSlideInstance(slideHdl));
         std::cout << "    : " << name.GetCharStar() << std::endl;
 
-        qt3dsdm::CUICDMInstanceHandle slideInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle slideInstance =
             m_Doc->GetStudioSystem()->GetClientDataModelBridge()->GetOwningComponentInstance(
                 slideHdl);
         PrintAssetSubTree(slideInstance, m_Doc, prefix);
diff --git a/src/Authoring/Client/Code/Core/Doc/GraphUtils.h b/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
index 35846cfc..2f02c28c 100644
--- a/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
+++ b/src/Authoring/Client/Code/Core/Doc/GraphUtils.h
@@ -71,35 +71,35 @@ bool FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide,
 const Q3DStudio::TFilter FilterForSlide(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inSlide);
 
 bool FilterForControllingTimeParent(CDoc *inDoc,
-                                    qt3dsdm::CUICDMInstanceHandle inControllingTimeParent,
+                                    qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent,
                                     Q3DStudio::TIdentifier inGraphable);
 const Q3DStudio::TFilter
-FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inControllingTimeParent);
+FilterForControllingTimeParent(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inControllingTimeParent);
 
 bool FilterForActiveComponent(CDoc *inDoc, qt3dsdm::CUICDMSlideHandle inActiveComponentSlide,
                               Q3DStudio::TIdentifier inGraphable);
 const Q3DStudio::TFilter FilterForActiveComponent(CDoc *inDoc,
                                                   qt3dsdm::CUICDMSlideHandle inActiveComponentSlide);
 
-bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inTimeParent,
+bool FilterForCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inTimeParent,
                            Q3DStudio::TIdentifier inGraphable);
 const Q3DStudio::TFilter FilterForCurrentSlide(CDoc *inDoc,
-                                               qt3dsdm::CUICDMInstanceHandle inTimeParent);
+                                               qt3dsdm::Qt3DSDMInstanceHandle inTimeParent);
 
 //==============================================================================
 //	Helper functions to get children from the graph
 //==============================================================================
-void GetAssetChildren(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildren(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                       Q3DStudio::CGraphIterator &outIterator,
                       EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
-void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildrenInSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                              qt3dsdm::CUICDMSlideHandle inSlide,
                              Q3DStudio::CGraphIterator &outIterator,
                              EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
-void GetAssetChildrenInTimeParent(qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc,
+void GetAssetChildrenInTimeParent(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc,
                                   bool inIsAssetTimeParent, Q3DStudio::CGraphIterator &outIterator,
                                   qt3dsdm::CUICDMSlideHandle inActiveComponentSlide = 0);
-void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
+void GetAssetChildrenInCurrentSlide(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                     Q3DStudio::CGraphIterator &outIterator,
                                     EStudioObjectType inObjectType = OBJTYPE_UNKNOWN);
 
@@ -112,7 +112,7 @@ bool IsAscendant(Q3DStudio::TIdentifier inDescendant, Q3DStudio::TIdentifier inA
 Q3DStudio::TIdentifier GetSibling(const Q3DStudio::TIdentifier inNode, bool inAfter,
                                   const Q3DStudio::CGraphIterator &inIterator);
 
-void PrintAssetSubTree(qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *m_Doc, char *prefix);
+void PrintAssetSubTree(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *m_Doc, char *prefix);
 void PrintSlideInfo(CDoc *m_Doc, char *prefix, qt3dsdm::CUICDMSlideHandle 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 43cb4eac..655085b4 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, CUICDMInstanceHandle>>>
+    typedef unordered_map<const wchar_t *, vector<pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>>>
         TIdMultiMap;
 
     // Interface between the import library (which defines IComposerEditor)
@@ -66,10 +66,10 @@ namespace ComposerImport {
         virtual bool HasError() = 0;
         // This file path contains the import document id.
         virtual void Finalize(const Q3DStudio::CFilePath &inDestFilePath) = 0;
-        virtual CUICDMInstanceHandle FindInstance(TImportId inImportHdl) = 0;
-        virtual CUICDMInstanceHandle GetRoot() = 0;
+        virtual Qt3DSDMInstanceHandle FindInstance(TImportId inImportHdl) = 0;
+        virtual Qt3DSDMInstanceHandle GetRoot() = 0;
         virtual const Q3DStudio::CFilePath &GetDestImportFile() = 0;
-        virtual void AddInstanceMap(CUICDMInstanceHandle instanceHandle, TImportId inImportId) = 0;
+        virtual void AddInstanceMap(Qt3DSDMInstanceHandle instanceHandle, TImportId inImportId) = 0;
 
         static std::shared_ptr<IComposerEditorInterface> CreateEditorInterface(
             Q3DStudio::IDocumentEditor &editor, qt3dsdm::CDataModelHandle parent // Parent object
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index 07ca2ed6..6f05f895 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -204,12 +204,12 @@ static void ReadKeyframes(CUICDMAnimationHandle inAnimation, IAnimationCore &inC
 
 struct SPropertyMatcher
 {
-    CUICDMPropertyHandle rhs;
-    SPropertyMatcher(CUICDMPropertyHandle _rhs)
+    Qt3DSDMPropertyHandle rhs;
+    SPropertyMatcher(Qt3DSDMPropertyHandle _rhs)
         : rhs(_rhs)
     {
     }
-    bool operator()(const pair<CUICDMPropertyHandle, SValue> &lhs) const
+    bool operator()(const pair<Qt3DSDMPropertyHandle, SValue> &lhs) const
     {
         return lhs.first == rhs;
     }
@@ -217,12 +217,12 @@ struct SPropertyMatcher
 
 struct SPropertyMatches
 {
-    CUICDMPropertyHandle m_Prop;
-    SPropertyMatches(CUICDMPropertyHandle inProp)
+    Qt3DSDMPropertyHandle m_Prop;
+    SPropertyMatches(Qt3DSDMPropertyHandle inProp)
         : m_Prop(inProp)
     {
     }
-    bool operator()(const pair<CUICDMPropertyHandle, SValue> &inValue)
+    bool operator()(const pair<Qt3DSDMPropertyHandle, SValue> &inValue)
     {
         return inValue.first == m_Prop;
     }
@@ -254,8 +254,8 @@ struct SAttributeNameSorter
     {
     }
 
-    bool operator()(const pair<CUICDMPropertyHandle, SValue> &lhsPair,
-                    const pair<CUICDMPropertyHandle, SValue> &rhsPair)
+    bool operator()(const pair<Qt3DSDMPropertyHandle, SValue> &lhsPair,
+                    const pair<Qt3DSDMPropertyHandle, SValue> &rhsPair)
     {
         TCharStr lhs(m_Core.GetProperty(lhsPair.first).m_Name);
         TCharStr rhs(m_Core.GetProperty(rhsPair.first).m_Name);
@@ -272,15 +272,15 @@ struct SAttributeNameSorter
 // Erase all properties that *are* on this instance from the property vector.
 struct SMetaDataPropertyEraser
 {
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     SComposerObjectDefinitions &m_MetaData;
-    SMetaDataPropertyEraser(CUICDMInstanceHandle inst, SComposerObjectDefinitions &meta)
+    SMetaDataPropertyEraser(Qt3DSDMInstanceHandle inst, SComposerObjectDefinitions &meta)
         : m_Instance(inst)
         , m_MetaData(meta)
     {
     }
 
-    bool operator()(const pair<CUICDMPropertyHandle, SValue> &inProperty)
+    bool operator()(const pair<Qt3DSDMPropertyHandle, SValue> &inProperty)
     {
         bool required = inProperty.first == m_MetaData.m_Named.m_NameProp
                 || inProperty.first == m_MetaData.m_Asset.m_SourcePath;
@@ -295,16 +295,16 @@ using std::tuple;
 // and write out the instances as we come to them.
 struct SComposerSerializerImpl : public IComposerSerializer
 {
-    typedef unordered_set<CUICDMInstanceHandle, hash<int>> TInstanceSet;
+    typedef unordered_set<Qt3DSDMInstanceHandle, hash<int>> TInstanceSet;
     typedef unordered_set<CUICDMSlideHandle, hash<int>> TSlideSet;
     typedef unordered_set<CUICDMActionHandle, hash<int>> TActionSet;
-    typedef vector<CUICDMInstanceHandle> TInstanceList;
+    typedef vector<Qt3DSDMInstanceHandle> TInstanceList;
     typedef unordered_map<int, TCharPtr> THandleToIdMap;
     typedef unordered_map<TCharPtr, int> TIdToHandleMap;
     typedef unordered_map<SLong4, int> TGUIDToHandleMap;
     typedef unordered_map<int, SLong4> THandleToGUIDMap;
-    typedef unordered_map<CUICDMInstanceHandle, int, hash<int>> TInstanceIntMap;
-    typedef unordered_map<CUICDMInstanceHandle, TCharPtr, hash<int>> TInstanceToSiblingMap;
+    typedef unordered_map<Qt3DSDMInstanceHandle, int, hash<int>> TInstanceIntMap;
+    typedef unordered_map<Qt3DSDMInstanceHandle, TCharPtr, hash<int>> TInstanceToSiblingMap;
 
     IDataCore &m_DataCore;
     IMetaData &m_MetaData;
@@ -423,7 +423,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         m_UIPVersion = Option<int>();
     }
 
-    TCharPtr AddId(const wstring &inId, CUICDMInstanceHandle inHandle)
+    TCharPtr AddId(const wstring &inId, Qt3DSDMInstanceHandle inHandle)
     {
         TCharPtr theIdStr = m_StringTable.RegisterStr(inId.c_str());
         m_IdToHandleMap.insert(make_pair(theIdStr, inHandle));
@@ -434,7 +434,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theIdStr;
     }
 
-    TCharPtr SetId(const wstring &inId, CUICDMInstanceHandle inHandle)
+    TCharPtr SetId(const wstring &inId, Qt3DSDMInstanceHandle inHandle)
     {
         TCharPtr theIdStr = m_StringTable.RegisterStr(inId.c_str());
         m_IdToHandleMap.insert(make_pair(theIdStr, inHandle)).first->second = inHandle;
@@ -461,7 +461,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theIdStr;
     }
 
-    CUICDMInstanceHandle GetInstanceById(TCharPtr inId)
+    Qt3DSDMInstanceHandle GetInstanceById(TCharPtr inId)
     {
         if (IsTrivial(inId))
             return 0;
@@ -509,7 +509,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         m_HandleToGUIDMap.insert(make_pair(inHandle, inId));
     }
 
-    SLong4 GetInstanceGuid(CUICDMInstanceHandle inInstance)
+    SLong4 GetInstanceGuid(Qt3DSDMInstanceHandle inInstance)
     {
         THandleToGUIDMap::iterator find = m_HandleToGUIDMap.find(inInstance);
         if (find != m_HandleToGUIDMap.end())
@@ -524,7 +524,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return SLong4();
     }
 
-    TCharPtr GetInstanceName(CUICDMInstanceHandle inInstance)
+    TCharPtr GetInstanceName(Qt3DSDMInstanceHandle inInstance)
     {
         CUICDMSlideHandle theAssociatedSlide = m_SlideSystem.GetAssociatedSlide(inInstance);
         SValue theValue;
@@ -552,7 +552,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return L"";
     }
 
-    TCharPtr GetInstanceName(CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide)
+    TCharPtr GetInstanceName(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide)
     {
         SValue theValue;
         if (m_SlideCore.GetSpecificInstancePropertyValue(
@@ -591,7 +591,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return m_StringTable.RegisterStr(theTypeStr.c_str());
     }
 
-    TCharPtr GetInstanceId(CUICDMInstanceHandle inInstance)
+    TCharPtr GetInstanceId(Qt3DSDMInstanceHandle inInstance)
     {
         QT3DS_ASSERT(inInstance.Valid());
         THandleToIdMap::iterator theFind(m_HandleToIdMap.find(inInstance));
@@ -610,14 +610,14 @@ struct SComposerSerializerImpl : public IComposerSerializer
         TCharPtr theNewId = L"";
         if (m_DataCore.IsInstanceOrDerivedFrom(inInstance,
                                                m_ObjectDefinitions.m_Image.m_Instance)) {
-            CUICDMInstanceHandle theMaterial = m_AssetGraph.GetParent(inInstance);
+            Qt3DSDMInstanceHandle theMaterial = m_AssetGraph.GetParent(inInstance);
             if (theMaterial.Valid()) {
                 wstring theIdStr(GetInstanceId(theMaterial));
                 SLong4 theGuid = GetInstanceGuid(inInstance);
                 theIdStr.append(L"_");
                 TPropertyHandleList theProperties;
                 m_DataCore.GetAggregateInstanceProperties(theMaterial, theProperties);
-                CUICDMPropertyHandle theProperty;
+                Qt3DSDMPropertyHandle theProperty;
                 for (size_t propIdx = 0, propEnd = theProperties.size();
                      propIdx < propEnd && theProperty.Valid() == false; ++propIdx) {
                     SValue theValue;
@@ -654,7 +654,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     TCharPtr GetActionId(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                         CUICDMInstanceHandle inInstance)
+                         Qt3DSDMInstanceHandle inInstance)
     {
         QT3DS_ASSERT(inAction.Valid());
         THandleToIdMap::iterator theFind(m_ActionToIdMap.find(inAction));
@@ -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, CUICDMInstanceHandle inInstance)
+    TCharPtr GetSlideId(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
     {
         QT3DS_ASSERT(inSlide.Valid());
         THandleToIdMap::iterator theFind(m_SlideToIdMap.find(inSlide));
@@ -680,7 +680,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         if (inInstance.Valid() == false) {
             m_ExternalSlides.insert(inSlide);
             CUICDMSlideHandle theMaster = m_SlideSystem.GetMasterSlide(inSlide);
-            CUICDMInstanceHandle theSlideData = m_SlideCore.GetSlideInstance(theMaster);
+            Qt3DSDMInstanceHandle theSlideData = m_SlideCore.GetSlideInstance(theMaster);
             SValue theValue;
             m_DataCore.GetInstancePropertyValue(
                         theSlideData, m_ObjectDefinitions.m_Slide.m_ComponentId, theValue);
@@ -697,7 +697,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return AddSlideId(theNewId, inSlide);
     }
 
-    SLong4 GetGuid(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+    SLong4 GetGuid(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
     {
         SValue theValue;
         if (m_DataCore.GetInstancePropertyValue(inInstance, inProperty, theValue)) {
@@ -725,7 +725,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         // somewhat.
         std::sort(theInstances.begin(), theInstances.end(), std::less<int>());
         for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-            CUICDMInstanceHandle theInstance(theInstances[idx]);
+            Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
             SLong4 theGuid = GetGuid(theInstance, m_ObjectDefinitions.m_Guided.m_GuidProp);
             if (theGuid.Valid()) {
                 AddGuid(theGuid, theInstance);
@@ -749,7 +749,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         // We need to check the source path.
         m_DataCore.GetInstancesDerivedFrom(theInstances, m_ObjectDefinitions.m_Asset.m_Instance);
         for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-            CUICDMInstanceHandle theInstance(theInstances[idx]);
+            Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
             // Find master objects by finding all asset instances that derive from non-canonical
             // instances.
             // these non-canonical parents *must* be master objects.
@@ -761,7 +761,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             if (m_MetaData.GetTypeForCanonicalInstance(theParents[0]).hasValue())
                 continue;
             // Finally, this must mean the object is canonical.
-            CUICDMInstanceHandle theMaster(theParents[0]);
+            Qt3DSDMInstanceHandle theMaster(theParents[0]);
             SValue theValue;
             if (m_DataCore.GetInstancePropertyValue(
                         theMaster, m_ObjectDefinitions.m_Asset.m_SourcePath, theValue)) {
@@ -774,7 +774,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    CUICDMInstanceHandle FindInstanceByGUID(SLong4 theGuid)
+    Qt3DSDMInstanceHandle FindInstanceByGUID(SLong4 theGuid)
     {
         if (m_GUIDToHandleMap.size() == 0)
             GetAllInstanceGuids();
@@ -818,7 +818,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         // Resolve SLong4 properties;
         if (GetValueType(theValue) == DataModelDataType::Long4) {
             SLong4 theDataValue = get<SLong4>(theValue);
-            CUICDMInstanceHandle theInstance = FindInstanceByGUID(theDataValue);
+            Qt3DSDMInstanceHandle theInstance = FindInstanceByGUID(theDataValue);
             if (theInstance.Valid() == false)
                 theValueStr = L"";
             else {
@@ -880,7 +880,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         if (inType == DataModelDataType::Long4) {
             SLong4 theFinalValue;
             SStringRef theRef(get<SStringRef>(retval));
-            CUICDMInstanceHandle theRefInstance(GetInstanceById(theRef.m_Id));
+            Qt3DSDMInstanceHandle theRefInstance(GetInstanceById(theRef.m_Id));
             if (theRefInstance.Valid()) {
                 THandleToGUIDMap::iterator theGuidFind = m_HandleToGUIDMap.find(theRefInstance);
                 if (theGuidFind != m_HandleToGUIDMap.end())
@@ -902,7 +902,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             return SObjectRefType(SLong4());
         if (inValue[0] == '#') {
             // absolute reference.
-            CUICDMInstanceHandle theInstance = GetInstanceById(inValue + 1);
+            Qt3DSDMInstanceHandle theInstance = GetInstanceById(inValue + 1);
             return theInstance.Valid() ? GetInstanceGuid(theInstance) : 0;
         } else {
             return std::make_shared<CDataStr>(inValue);
@@ -916,7 +916,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         TCharStr theValueStr;
 
         for (size_t idx = 0, end = inList.size(); idx < end; ++idx) {
-            const pair<CUICDMPropertyHandle, SValue> &theValue(inList[idx]);
+            const pair<Qt3DSDMPropertyHandle, SValue> &theValue(inList[idx]);
             TCharStr theName(m_DataCore.GetProperty(theValue.first).m_Name);
             WriteDataModelValue(theValue.second, theValueStr);
             if (GetValueType(theValue.second) == DataModelDataType::String || theValueStr.size())
@@ -1024,7 +1024,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void ParseAnimation(IDOMReader &inReader, CUICDMSlideHandle inSlide,
-                        CUICDMInstanceHandle inInstance)
+                        Qt3DSDMInstanceHandle inInstance)
     {
         IDOMReader::Scope __animScope(inReader);
         EAnimationType theAnimationType;
@@ -1136,7 +1136,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void SerializeAction(IDOMWriter &inWriter, CUICDMSlideHandle inSlide,
-                         CUICDMInstanceHandle inInstance, CUICDMActionHandle inAction)
+                         Qt3DSDMInstanceHandle inInstance, CUICDMActionHandle inAction)
     {
         TCharStr valueStr;
         IDOMWriter::Scope __actionScope(inWriter, L"Action");
@@ -1191,7 +1191,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void SerializeActions(IDOMWriter &inWriter, CUICDMSlideHandle inSlide,
-                          CUICDMInstanceHandle inInstance, TActionHandleList &inActions)
+                          Qt3DSDMInstanceHandle inInstance, TActionHandleList &inActions)
     {
         // We sort the actions just by action handle.  This keeps the file in the same order because
         // actions are created in file order and their handle values increment monotonically.
@@ -1201,7 +1201,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    CUICDMInstanceHandle ResolveObjectRef(CUICDMInstanceHandle inInstance,
+    Qt3DSDMInstanceHandle ResolveObjectRef(Qt3DSDMInstanceHandle inInstance,
                                           const SObjectRefType &inRef)
     {
         if (inRef.GetReferenceType() == ObjectReferenceType::Absolute) {
@@ -1224,14 +1224,14 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
 
         wstring theParentStr(L"parent.");
-        CUICDMInstanceHandle theSourceInstance(inInstance);
+        Qt3DSDMInstanceHandle theSourceInstance(inInstance);
         while (theParseStr.find(theParentStr) != wstring::npos) {
-            CUICDMInstanceHandle theParentInstance = m_AssetGraph.GetParent(inInstance);
+            Qt3DSDMInstanceHandle theParentInstance = m_AssetGraph.GetParent(inInstance);
             // this check is here since scene has no parent, see Bug#6532
             if (theParentInstance.Valid())
                 theSourceInstance = theParentInstance;
             else
-                return CUICDMInstanceHandle(0);
+                return Qt3DSDMInstanceHandle(0);
             theParseStr = theParseStr.substr(theParentStr.size());
         }
         while (theParseStr.size()) {
@@ -1242,24 +1242,24 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 theParseStr = theParseStr.substr(periodPos + 1);
             } else
                 theParseStr = L"";
-            CUICDMInstanceHandle theParent(theSourceInstance);
+            Qt3DSDMInstanceHandle theParent(theSourceInstance);
             bool theFound = false;
             for (long childIdx = 0, childEnd = m_AssetGraph.GetChildCount(theSourceInstance);
                  childIdx < childEnd && !theFound; ++childIdx) {
-                CUICDMInstanceHandle theChild = m_AssetGraph.GetChild(theSourceInstance, childIdx);
+                Qt3DSDMInstanceHandle theChild = m_AssetGraph.GetChild(theSourceInstance, childIdx);
                 if (theNameStr == GetInstanceName(theChild)) {
                     theSourceInstance = theChild;
                     theFound = true;
                 }
             }
             if (!theFound)
-                return CUICDMInstanceHandle(0);
+                return Qt3DSDMInstanceHandle(0);
         }
         return theSourceInstance;
     }
 
     CUICDMActionHandle ParseAction(IDOMReader &inReader, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inInstance)
+                                   Qt3DSDMInstanceHandle inInstance)
     {
         IDOMReader::Scope __actionScope(inReader);
         CUICDMActionHandle theAction;
@@ -1312,7 +1312,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     if (GetValueType(theValue) == DataModelDataType::String)
                         theStr = get<TDataStrPtr>(theValue);
                     if (theStr) {
-                        CUICDMInstanceHandle theTargetInstance =
+                        Qt3DSDMInstanceHandle theTargetInstance =
                                 ResolveObjectRef(inInstance, theTargetRef);
                         CUICDMEventHandle theEvent = 0;
                         if (theTargetInstance.Valid())
@@ -1329,7 +1329,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theAction;
     }
 
-    void GetInstanceSlideInformation(CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+    void GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
                                      CUICDMSlideHandle inSlideParent,
                                      TPropertyHandleValuePairList &ioValues,
                                      TAnimationHandleList &ioAnimations,
@@ -1367,12 +1367,12 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
 
         SanitizeHandleValuePairList(inInstance, ioValues);
-        CUICDMPropertyHandle *theUnlinked(
+        Qt3DSDMPropertyHandle *theUnlinked(
                     IDocumentEditor::GetAlwaysUnlinkedProperties(m_ObjectDefinitions));
         // Note that we are explicitly re-querying the iovalues size.
         for (size_t idx = 0; idx < ioValues.size(); ++idx) {
-            CUICDMPropertyHandle theProperty(ioValues[idx].first);
-            for (CUICDMPropertyHandle *theHandle = theUnlinked; theHandle->Valid(); ++theHandle) {
+            Qt3DSDMPropertyHandle theProperty(ioValues[idx].first);
+            for (Qt3DSDMPropertyHandle *theHandle = theUnlinked; theHandle->Valid(); ++theHandle) {
                 if (theProperty == *theHandle
                         && Equals(ioValues[idx].second.toOldSkool(),
                                   m_MetaData.GetDefaultValue(inInstance, theProperty).toOldSkool())) {
@@ -1387,7 +1387,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     {
         if (inSlide.Valid() == false)
             return L"";
-        CUICDMInstanceHandle theSlideInstance(m_SlideCore.GetSlideInstance(inSlide));
+        Qt3DSDMInstanceHandle theSlideInstance(m_SlideCore.GetSlideInstance(inSlide));
         SValue theValue;
         if (m_DataCore.GetInstancePropertyValue(theSlideInstance,
                                                 m_ObjectDefinitions.m_Named.m_NameProp, theValue)) {
@@ -1398,7 +1398,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return L"";
     }
 
-    CUICDMSlideHandle GetAssociatedSlide(CUICDMInstanceHandle inInstance)
+    CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance)
     {
         if (inInstance.Valid() == false)
             return 0;
@@ -1417,12 +1417,12 @@ struct SComposerSerializerImpl : public IComposerSerializer
             , m_IsImageOrMaterial(inIsImageOrMaterial)
         {
         }
-        bool IsGeneralInvalidProperty(CUICDMPropertyHandle inProperty) const
+        bool IsGeneralInvalidProperty(Qt3DSDMPropertyHandle inProperty) const
         {
             return inProperty == m_ObjectDefinitions.m_Guided.m_GuidProp
                     || inProperty == m_ObjectDefinitions.m_Asset.m_FileId;
         }
-        bool IsImageOrMaterialInvalidProperty(CUICDMPropertyHandle inProperty) const
+        bool IsImageOrMaterialInvalidProperty(Qt3DSDMPropertyHandle inProperty) const
         {
             return inProperty == m_ObjectDefinitions.m_Asset.m_StartTime
                     || inProperty == m_ObjectDefinitions.m_Asset.m_EndTime;
@@ -1435,7 +1435,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     };
 
-    void SanitizeHandleValuePairList(CUICDMInstanceHandle inInstance,
+    void SanitizeHandleValuePairList(Qt3DSDMInstanceHandle inInstance,
                                      TPropertyHandleValuePairList &outList)
     {
         bool isImageOrMaterial =
@@ -1445,7 +1445,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         erase_if(outList, SInvalidProperytEqual(m_ObjectDefinitions, isImageOrMaterial));
     }
 
-    void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inInstance,
+    void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outList)
     {
         m_DataCore.GetSpecificInstancePropertyValues(inInstance, outList);
@@ -1453,7 +1453,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
     void GetSlidePropertyValues(CUICDMSlideHandle inSlide, TPropertyHandleValuePairList &outList)
     {
-        CUICDMInstanceHandle theSlideInstance(m_SlideCore.GetSlideInstance(inSlide));
+        Qt3DSDMInstanceHandle theSlideInstance(m_SlideCore.GetSlideInstance(inSlide));
         if (theSlideInstance.Valid() == false)
             return;
 
@@ -1463,10 +1463,10 @@ struct SComposerSerializerImpl : public IComposerSerializer
         erase_if(outList, SPropertyMatches(m_ObjectDefinitions.m_Typed.m_TypeProp));
     }
 
-    Option<pair<CUICDMPropertyHandle, SValue>> ParseValue(CUICDMInstanceHandle inInstance,
+    Option<pair<Qt3DSDMPropertyHandle, SValue>> ParseValue(Qt3DSDMInstanceHandle inInstance,
                                                           TCharPtr inPropName, TCharPtr inValue)
     {
-        CUICDMPropertyHandle theProperty =
+        Qt3DSDMPropertyHandle theProperty =
                 m_DataCore.GetAggregateInstancePropertyByName(inInstance, inPropName);
         if (theProperty.Valid() == false) {
             return Empty();
@@ -1475,7 +1475,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return make_pair(theProperty, ParseValue(theType, inValue));
     }
 
-    void ParseInstanceProperties(IDOMReader &inReader, CUICDMInstanceHandle inInstance,
+    void ParseInstanceProperties(IDOMReader &inReader, Qt3DSDMInstanceHandle inInstance,
                                  vector<pair<TCharPtr, TCharPtr>> &outExtraAttributes,
                                  TPropertyHandleValuePairList &outProperties)
     {
@@ -1492,7 +1492,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
         for (eastl::pair<TCharPtr, TCharPtr> theAtt = inReader.GetFirstAttribute();
              !IsTrivial(theAtt.first); theAtt = inReader.GetNextAttribute()) {
-            Option<pair<CUICDMPropertyHandle, SValue>> theValue =
+            Option<pair<Qt3DSDMPropertyHandle, SValue>> theValue =
                     ParseValue(inInstance, theAtt.first, theAtt.second);
             bool ignoreProperty = theValue.hasValue() == false
                     || (hasNoLifetime
@@ -1508,7 +1508,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                         SValue theFirstValue(theValue.m_Floats[0]);
                         SValue theSecondValue(theValue.m_Floats[1]);
                         if (AreEqual(theAtt.first, L"location")) {
-                            CUICDMPropertyHandle theLeft, theTop;
+                            Qt3DSDMPropertyHandle theLeft, theTop;
                             theLeft =
                                     m_DataCore.GetAggregateInstancePropertyByName(inInstance, L"left");
                             theTop =
@@ -1516,7 +1516,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                             outProperties.push_back(std::make_pair(theLeft, theFirstValue));
                             outProperties.push_back(std::make_pair(theTop, theSecondValue));
                         } else {
-                            CUICDMPropertyHandle theWidth, theHeight;
+                            Qt3DSDMPropertyHandle theWidth, theHeight;
                             theWidth =
                                     m_DataCore.GetAggregateInstancePropertyByName(inInstance, L"width");
                             theHeight = m_DataCore.GetAggregateInstancePropertyByName(inInstance,
@@ -1534,7 +1534,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     }
 
     void ParseAndSetInstanceProperties(IDOMReader &inReader, CUICDMSlideHandle inSlide,
-                                       CUICDMInstanceHandle inInstance,
+                                       Qt3DSDMInstanceHandle inInstance,
                                        vector<pair<TCharPtr, TCharPtr>> &outExtraAttributes,
                                        TPropertyHandleValuePairList &ioProperties)
     {
@@ -1554,9 +1554,9 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    pair<CUICDMSlideHandle, CUICDMInstanceHandle> CreateSlide()
+    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> CreateSlide()
     {
-        CUICDMInstanceHandle slideInstance = m_DataCore.CreateInstance();
+        Qt3DSDMInstanceHandle slideInstance = m_DataCore.CreateInstance();
         m_DataCore.DeriveInstance(slideInstance, m_ObjectDefinitions.m_Slide.m_Instance);
         CUICDMSlideHandle masterSlide = m_SlideCore.CreateSlide(slideInstance);
         return make_pair(masterSlide, slideInstance);
@@ -1572,7 +1572,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // of all slide children.
     // The element may then declare slides as children where sub-slide-specific information goes.
     // Finally, the element's scene graph children will be declared.
-    bool Serialize(IDOMWriter &inWriter, CUICDMInstanceHandle inInstance, bool inWriteParentRefs)
+    bool Serialize(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance, bool inWriteParentRefs)
     {
         if (m_DataCore.IsInstanceOrDerivedFrom(inInstance, m_ObjectDefinitions.m_Asset.m_Instance)
                 == false
@@ -1601,7 +1601,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     m_MetaData.GetTypeForCanonicalInstance(theParents[0]);
             // Meaning this isn't a canonical instance
             if (theCanonicalType.hasValue() == false) {
-                CUICDMInstanceHandle theMaster(theParents[0]);
+                Qt3DSDMInstanceHandle theMaster(theParents[0]);
                 m_MasterObjectsSet.insert(theParents[0]);
                 theMasterRef = L"#";
                 theMasterRef.append(GetInstanceId(theMaster));
@@ -1646,7 +1646,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             inWriter.Att(L"class", theMasterRef.c_str());
 
         if (inWriteParentRefs) {
-            CUICDMInstanceHandle theParent(m_AssetGraph.GetParent(inInstance));
+            Qt3DSDMInstanceHandle theParent(m_AssetGraph.GetParent(inInstance));
             if (theParent.Valid()) {
                 wstring theParentRef(L"#");
                 theParentRef.append(GetInstanceId(theParent));
@@ -1654,7 +1654,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 inWriter.Att(L"graphparent", theParentRef.c_str());
             }
 
-            CUICDMInstanceHandle theSibling = m_AssetGraph.GetSibling(inInstance, true);
+            Qt3DSDMInstanceHandle theSibling = m_AssetGraph.GetSibling(inInstance, true);
             if (theSibling.Valid()) {
                 wstring theSiblingRef(L"#");
                 theSiblingRef.append(GetInstanceId(theSibling));
@@ -1679,7 +1679,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             if (theActiveSlideChildren.size()) {
                 // If we a copying from a master slide, we don't want nonmaster
                 // only children of this object.
-                CUICDMInstanceHandle theChildHandle = theChildren.GetCurrent();
+                Qt3DSDMInstanceHandle theChildHandle = theChildren.GetCurrent();
                 CUICDMSlideHandle theChildAssociatedSlide = GetAssociatedSlide(theChildHandle);
                 isNonmasterActiveSlideChild =
                         std::find(theActiveSlideChildren.begin(), theActiveSlideChildren.end(),
@@ -1696,14 +1696,14 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // Pass 1 creates all the instances and registeres
     qt3dsdm::TInstanceHandleList
     CreateAndRegisterInstances(IDOMReader &inReader, bool inReturnInstances,
-                               CUICDMInstanceHandle inParent = CUICDMInstanceHandle())
+                               Qt3DSDMInstanceHandle inParent = Qt3DSDMInstanceHandle())
     {
         IDOMReader::Scope __childScope(inReader);
         TInstanceHandleList theNewInstances;
         for (bool success = inReader.MoveToFirstChild(); success;
              success = inReader.MoveToNextSibling()) {
 
-            qt3dsdm::CUICDMInstanceHandle theNewInstance;
+            qt3dsdm::Qt3DSDMInstanceHandle theNewInstance;
             TCharPtr theParentRef = L"";
             if (inReader.Att(L"graphparent", theParentRef))
                 inParent = GetInstanceById(theParentRef + 1);
@@ -1744,11 +1744,11 @@ struct SComposerSerializerImpl : public IComposerSerializer
         return theNewInstances;
     }
 
-    void _MoveNewInstanceToItsPlaceRecursive(CUICDMInstanceHandle inNewInstance)
+    void _MoveNewInstanceToItsPlaceRecursive(Qt3DSDMInstanceHandle inNewInstance)
     {
         TInstanceToSiblingMap::iterator itr = m_NewInstancesToSiblings.find(inNewInstance);
         if (itr != m_NewInstancesToSiblings.end()) {
-            CUICDMInstanceHandle theSibling = GetInstanceById((*itr).second);
+            Qt3DSDMInstanceHandle theSibling = GetInstanceById((*itr).second);
             if (theSibling.Valid()) {
                 _MoveNewInstanceToItsPlaceRecursive(theSibling);
 
@@ -1767,7 +1767,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             TCharPtr theId;
             inReader.Att(L"id", theId);
 
-            CUICDMInstanceHandle theNewInstance = GetInstanceById(theId);
+            Qt3DSDMInstanceHandle theNewInstance = GetInstanceById(theId);
             if (theNewInstance.Valid() == false) {
                 QT3DS_ASSERT(false);
                 continue;
@@ -1783,7 +1783,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void WriteSlideMasterOverrides(IDOMWriter &inWriter, CUICDMInstanceHandle inInstance,
+    void WriteSlideMasterOverrides(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance,
                                    CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent)
     {
         TPropertyHandleValuePairList theValues;
@@ -1842,7 +1842,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void WriteSlideInstance(IDOMWriter &inWriter, CUICDMInstanceHandle inInstance,
+    void WriteSlideInstance(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance,
                             CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent)
     {
         TPropertyHandleValuePairList theValues;
@@ -1883,7 +1883,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         {
         }
 
-        bool operator()(CUICDMInstanceHandle inInstance)
+        bool operator()(Qt3DSDMInstanceHandle inInstance)
         {
             return m_Set.find(inInstance) == m_Set.end();
         }
@@ -1899,13 +1899,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
         erase_if(outInstances, SInstanceNotInSet(m_InstanceSet));
     }
 
-    CUICDMInstanceHandle GetSlideComponent(CUICDMSlideHandle inSlide)
+    Qt3DSDMInstanceHandle GetSlideComponent(CUICDMSlideHandle inSlide)
     {
         CUICDMSlideHandle theMasterSlide = m_SlideSystem.GetMasterSlide(inSlide);
-        CUICDMInstanceHandle theMasterInstance(m_SlideCore.GetSlideInstance(theMasterSlide));
+        Qt3DSDMInstanceHandle theMasterInstance(m_SlideCore.GetSlideInstance(theMasterSlide));
         SLong4 theComponentGuid =
                 GetGuid(theMasterInstance, m_ObjectDefinitions.m_Slide.m_ComponentId);
-        CUICDMInstanceHandle theComponent = FindInstanceByGUID(theComponentGuid);
+        Qt3DSDMInstanceHandle theComponent = FindInstanceByGUID(theComponentGuid);
         return theComponent;
     }
 
@@ -1916,19 +1916,19 @@ struct SComposerSerializerImpl : public IComposerSerializer
             : m_DepthMap(inMap)
         {
         }
-        int GetInstanceOrder(CUICDMInstanceHandle inHdl) const
+        int GetInstanceOrder(Qt3DSDMInstanceHandle inHdl) const
         {
             TInstanceIntMap::const_iterator theIter = m_DepthMap.find(inHdl);
             if (theIter != m_DepthMap.end())
                 return theIter->second;
             return QT3DS_MAX_I32;
         }
-        bool operator()(CUICDMInstanceHandle lhs, CUICDMInstanceHandle rhs) const
+        bool operator()(Qt3DSDMInstanceHandle lhs, Qt3DSDMInstanceHandle rhs) const
         {
             return GetInstanceOrder(lhs) < GetInstanceOrder(rhs);
         }
-        bool operator()(const std::pair<CUICDMSlideHandle, CUICDMInstanceHandle> &lhs,
-                        const std::pair<CUICDMSlideHandle, CUICDMInstanceHandle> &rhs) const
+        bool operator()(const std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &lhs,
+                        const std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &rhs) const
         {
             return GetInstanceOrder(lhs.second) < GetInstanceOrder(rhs.second);
         }
@@ -1953,7 +1953,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 GetFilteredAssociatedInstances(m_ActiveSlide, theInstances);
                 SortSlideInstanceList(theInstances);
                 for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-                    CUICDMInstanceHandle theInstance(theInstances[idx]);
+                    Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
                     WriteSlideInstance(inWriter, theInstance, m_ActiveSlide, m_ActiveSlideParent);
                 }
             } else {
@@ -1962,7 +1962,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 GetSlidePropertyValues(m_ActiveSlide, theValues);
                 SerializePropertyList(inWriter, theValues);
 
-                CUICDMInstanceHandle theComponent = GetSlideComponent(m_ActiveSlide);
+                Qt3DSDMInstanceHandle theComponent = GetSlideComponent(m_ActiveSlide);
 
                 TInstanceHandleList theParentInstances;
                 m_SlideSystem.GetAssociatedInstances(m_ActiveSlide, theInstances);
@@ -1973,7 +1973,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
                 SortSlideInstanceList(theInstances);
                 for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-                    CUICDMInstanceHandle theInstance(theInstances[idx]);
+                    Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
 
                     // If this is an instance associated with master slide
                     if (find(theParentInstances.begin(), theParentInstances.end(), theInstance)
@@ -1985,7 +1985,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 }
             }
         } // m_ActiveSlide.valid;
-        std::vector<std::pair<CUICDMSlideHandle, CUICDMInstanceHandle>> theSerializationSlides;
+        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> theSerializationSlides;
         theSerializationSlides.reserve(m_SlideSet.size());
         TSlideSet theMasterSlideSet;
         for (TSlideSet::iterator theIter = m_SlideSet.begin(), end = m_SlideSet.end();
@@ -1993,7 +1993,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             CUICDMSlideHandle theSlide = *theIter;
             CUICDMSlideHandle theMasterSlide = m_SlideCore.GetParentSlide(theSlide);
             if (theMasterSlide.Valid() && theMasterSlideSet.insert(theMasterSlide).second) {
-                CUICDMInstanceHandle theSlideOwner(GetSlideComponent(theMasterSlide));
+                Qt3DSDMInstanceHandle theSlideOwner(GetSlideComponent(theMasterSlide));
                 if (theSlideOwner.Valid())
                     theSerializationSlides.push_back(std::make_pair(theMasterSlide, theSlideOwner));
             }
@@ -2004,7 +2004,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         for (size_t slideSetIdx = 0, slideSetEnd = theSerializationSlides.size();
              slideSetIdx < slideSetEnd; ++slideSetIdx) {
             CUICDMSlideHandle theMasterSlide = theSerializationSlides[slideSetIdx].first;
-            CUICDMInstanceHandle theComponent = theSerializationSlides[slideSetIdx].second;
+            Qt3DSDMInstanceHandle theComponent = theSerializationSlides[slideSetIdx].second;
             IDOMWriter::Scope __masterScope(inWriter, L"State");
 
             inWriter.Att(L"name", GetSlideName(theMasterSlide));
@@ -2022,7 +2022,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             theInstances.push_back(theComponent);
             SortSlideInstanceList(theInstances);
             for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-                CUICDMInstanceHandle theInstance(theInstances[idx]);
+                Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
                 if (m_InstanceSet.find(theInstance) == m_InstanceSet.end())
                     continue;
                 WriteSlideInstance(inWriter, theInstance, theMasterSlide, 0);
@@ -2078,13 +2078,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
     {
         void *m_ReaderScope;
         CUICDMSlideHandle m_Slide;
-        CUICDMInstanceHandle m_Instance;
+        Qt3DSDMInstanceHandle m_Instance;
         SActionParseRecord()
             : m_ReaderScope(NULL)
         {
         }
         SActionParseRecord(void *inReaderScope, CUICDMSlideHandle inSlide,
-                           CUICDMInstanceHandle inInstance)
+                           Qt3DSDMInstanceHandle inInstance)
             : m_ReaderScope(inReaderScope)
             , m_Slide(inSlide)
             , m_Instance(inInstance)
@@ -2112,7 +2112,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 {
                     const wchar_t *theId = L"";
                     inReader.Att(L"Id", theId);
-                    pair<CUICDMSlideHandle, CUICDMInstanceHandle> theChildSlideInstPair =
+                    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> theChildSlideInstPair =
                             CreateSlide();
                     m_SlideCore.DeriveSlide(theChildSlideInstPair.first, inSlide);
                     m_DataCore.SetInstancePropertyValue(theChildSlideInstPair.second,
@@ -2137,7 +2137,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     || AreEqual(inReader.GetElementName(), L"Add")) {
                 TCharPtr theRef;
                 inReader.Att(L"ref", theRef);
-                CUICDMInstanceHandle theInstance = GetInstanceById(theRef + 1);
+                Qt3DSDMInstanceHandle theInstance = GetInstanceById(theRef + 1);
                 if (theInstance.Valid() == false) {
                     QT3DS_ASSERT(false);
                     continue;
@@ -2209,7 +2209,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             } else if (AreEqual(inReader.GetElementName(), L"State")) {
                 TCharPtr componentRef = L"";
                 inReader.Att(L"component", componentRef);
-                CUICDMInstanceHandle component = GetInstanceById(componentRef + 1);
+                Qt3DSDMInstanceHandle component = GetInstanceById(componentRef + 1);
                 if (component.Valid() == false) {
                     QT3DS_ASSERT(false);
                     continue;
@@ -2224,7 +2224,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 for (size_t idx = 0, end = theGraphs.size();
                      idx < end && foundDuplicateGraph == false; ++idx) {
                     CUICDMSlideHandle theMaster = m_SlideGraphCore.GetGraphRoot(theGraphs[idx]);
-                    CUICDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theMaster);
+                    Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(theMaster);
                     SValue theValue;
                     if (m_DataCore.GetInstancePropertyValue(
                                 theSlideInstance, m_ObjectDefinitions.m_Slide.m_ComponentId,
@@ -2240,7 +2240,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                     }
                 }
                 if (foundDuplicateGraph == false) {
-                    pair<CUICDMSlideHandle, CUICDMInstanceHandle> theSlideInstPair = CreateSlide();
+                    pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> theSlideInstPair = CreateSlide();
                     m_SlideGraphCore.CreateSlideGraph(theSlideInstPair.first);
                     m_DataCore.SetInstancePropertyValue(theSlideInstPair.second,
                                                         m_ObjectDefinitions.m_Slide.m_ComponentId,
@@ -2318,13 +2318,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
     struct SMasterObjectSorter
     {
         IDataCore &m_DataCore;
-        CUICDMPropertyHandle m_SourcePathProperty;
-        SMasterObjectSorter(IDataCore &inDataCore, CUICDMPropertyHandle inSourcePathProperty)
+        Qt3DSDMPropertyHandle m_SourcePathProperty;
+        SMasterObjectSorter(IDataCore &inDataCore, Qt3DSDMPropertyHandle inSourcePathProperty)
             : m_DataCore(inDataCore)
             , m_SourcePathProperty(inSourcePathProperty)
         {
         }
-        bool operator()(CUICDMInstanceHandle lhs, CUICDMInstanceHandle rhs) const
+        bool operator()(Qt3DSDMInstanceHandle lhs, Qt3DSDMInstanceHandle rhs) const
         {
             SValue lhsValue, rhsValue;
             m_DataCore.GetInstancePropertyValue(lhs, m_SourcePathProperty, lhsValue);
@@ -2335,13 +2335,13 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     };
 
-    void AddGraphInstanceToOrderMap(CUICDMInstanceHandle inInstance)
+    void AddGraphInstanceToOrderMap(Qt3DSDMInstanceHandle inInstance)
     {
         m_InstanceToGraphDepthMap.insert(
                     std::make_pair(inInstance, (int)m_InstanceToGraphDepthMap.size()));
     }
 
-    void BuildGraphOrderMap(const CUICDMInstanceHandle *inTopInstances, QT3DSU32 inCount)
+    void BuildGraphOrderMap(const Qt3DSDMInstanceHandle *inTopInstances, QT3DSU32 inCount)
     {
         /* Code for breadth first ordering
         TInstanceHandleList theNextInstancesList;
@@ -2356,7 +2356,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 theNextInstancesList.clear();
                 for ( size_t idx = 0, end = theCurrentInstancesList.size(); idx < end; ++idx )
                 {
-                        CUICDMInstanceHandle theCurrentInstance( theCurrentInstancesList[idx] );
+                        Qt3DSDMInstanceHandle theCurrentInstance( theCurrentInstancesList[idx] );
                         AddGraphInstanceToOrderMap( theCurrentInstance );
                         for ( int childIdx = 0, childEnd = m_AssetGraph.GetChildCount(
         theCurrentInstance ); childIdx < childEnd; ++childIdx )
@@ -2372,7 +2372,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         }
     }
 
-    void DoSerializeScene(IDOMWriter &inWriter, const CUICDMInstanceHandle *inTopInstances,
+    void DoSerializeScene(IDOMWriter &inWriter, const Qt3DSDMInstanceHandle *inTopInstances,
                           QT3DSU32 inCount, bool inWriteParentRefs = false)
     {
         GetAllInstanceGuids();
@@ -2393,7 +2393,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 for (TInstanceList::iterator theIter = theMasterObjectsList.begin(),
                      end = theMasterObjectsList.end();
                      theIter != end; ++theIter) {
-                    CUICDMInstanceHandle theMaster(*theIter);
+                    Qt3DSDMInstanceHandle theMaster(*theIter);
                     Option<TCharStr> theType = m_MetaData.GetTypeForInstance(theMaster);
                     if (theType.hasValue() == false) {
                         QT3DS_ASSERT(false);
@@ -2440,7 +2440,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                         theGuid.m_Longs[idx] = wcstol(theStartPtr, &theEndPtr, 10);
                         theStartPtr = theEndPtr;
                     }
-                    CUICDMInstanceHandle theInstance = FindInstanceByGUID(theGuid);
+                    Qt3DSDMInstanceHandle theInstance = FindInstanceByGUID(theGuid);
                     if (theInstance.Valid())
                         AddId(theRef.wide_str() + 1, theInstance);
                 } else if (AreEqual(inReader.GetElementName(), L"ActionReference")) {
@@ -2464,7 +2464,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
     qt3dsdm::TInstanceHandleList DoSerializeScene(IDOMReader &inReader,
                                                 const CFilePath &inDocumentDirectory,
-                                                CUICDMInstanceHandle inNewRoot)
+                                                Qt3DSDMInstanceHandle inNewRoot)
     {
         // Attempt to work correctly whether we are pointing to the project or not.
         IDOMReader::Scope __outerScope(inReader);
@@ -2484,7 +2484,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                         QT3DS_ASSERT(false);
                         continue;
                     }
-                    CUICDMInstanceHandle theMaster;
+                    Qt3DSDMInstanceHandle theMaster;
                     TIdToHandleMap::iterator theFind(m_SourcePathToMasterInstances.find(
                                                          m_StringTable.RegisterStr(theSourcePath)));
                     if (theFind != m_SourcePathToMasterInstances.end()) {
@@ -2494,7 +2494,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                                     inDocumentDirectory, CFilePath(theSourcePath));
 
                         const wchar_t *theType(inReader.GetElementName());
-                        CUICDMInstanceHandle theCanonicalType(
+                        Qt3DSDMInstanceHandle theCanonicalType(
                                     m_MetaData.GetCanonicalInstanceForType(theType));
                         if (theCanonicalType.Valid() == false) {
                             QT3DS_ASSERT(false);
@@ -2666,7 +2666,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
         reset();
         ScopedPreserveFileIds __preserveFileIds(m_PreserveFileIds);
 
-        vector<CUICDMInstanceHandle> theGraphRoots;
+        vector<Qt3DSDMInstanceHandle> theGraphRoots;
         CGraphIterator theIterator;
         m_AssetGraph.GetRoots(theIterator);
         for (; theIterator.IsDone() == false; ++theIterator)
@@ -2720,7 +2720,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
     // new root.
     virtual qt3dsdm::TInstanceHandleList
     SerializeSceneGraphObject(IDOMReader &inReader, const CFilePath &inDocumentDirectory,
-                              CUICDMInstanceHandle inNewRoot, CUICDMSlideHandle inActiveSlide) override
+                              Qt3DSDMInstanceHandle inNewRoot, CUICDMSlideHandle inActiveSlide) override
     {
         reset();
         m_ActiveSlide = inActiveSlide;
@@ -2758,7 +2758,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
 
     // Load a new action onto this root object
     qt3dsdm::CUICDMActionHandle SerializeAction(qt3dsdm::IDOMReader &inReader,
-                                                      qt3dsdm::CUICDMInstanceHandle inNewRoot,
+                                                      qt3dsdm::Qt3DSDMInstanceHandle inNewRoot,
                                                       qt3dsdm::CUICDMSlideHandle inSlide) override
     {
         reset();
@@ -2776,7 +2776,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             : m_Vec(v)
         {
         }
-        bool operator()(CUICDMInstanceHandle hdl)
+        bool operator()(Qt3DSDMInstanceHandle hdl)
         {
             return find(m_Vec.begin(), m_Vec.end(), hdl) != m_Vec.end();
         }
@@ -2795,9 +2795,9 @@ struct SComposerSerializerImpl : public IComposerSerializer
         {
         }
 
-        bool operator()(CUICDMInstanceHandle inInstance)
+        bool operator()(Qt3DSDMInstanceHandle inInstance)
         {
-            CUICDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
+            Qt3DSDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
             if (theParent.Valid() && m_SlideSystem.GetAssociatedSlide(theParent) == m_Slide)
                 return true;
             return false;
@@ -2819,7 +2819,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
             erase_if(theSlideInstances, SInstanceInVector(theParentInstances));
             erase_if(theSlideInstances, SParentInSlide(inSlide, m_SlideSystem, m_AssetGraph));
         }
-        CUICDMInstanceHandle *theInstancePtr = NULL;
+        Qt3DSDMInstanceHandle *theInstancePtr = NULL;
         if (theSlideInstances.size()) {
             BuildGraphOrderMap(theInstancePtr, (QT3DSU32)theSlideInstances.size());
             SortSlideInstanceList(theSlideInstances);
@@ -2837,8 +2837,8 @@ struct SComposerSerializerImpl : public IComposerSerializer
         m_ActiveSlideParent = inMaster;
         CUICDMSlideHandle retval = m_SlideSystem.DuplicateSlide(inMaster, newIndex + 1);
         m_ActiveSlide = retval;
-        CUICDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(retval);
-        CUICDMInstanceHandle theMasterInstance(m_SlideSystem.GetSlideInstance(inMaster));
+        Qt3DSDMInstanceHandle theSlideInstance = m_SlideCore.GetSlideInstance(retval);
+        Qt3DSDMInstanceHandle theMasterInstance(m_SlideSystem.GetSlideInstance(inMaster));
         SLong4 theComponentGuid =
                 GetGuid(theMasterInstance, m_ObjectDefinitions.m_Slide.m_ComponentId);
         m_DataCore.SetInstancePropertyValue(
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
index c9304164..f6877ebc 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.h
@@ -82,14 +82,14 @@ public:
     // new root.
     virtual qt3dsdm::TInstanceHandleList SerializeSceneGraphObject(
         qt3dsdm::IDOMReader &inReader, const Q3DStudio::CFilePath &inDocumentDirectory,
-        qt3dsdm::CUICDMInstanceHandle inNewRoot, qt3dsdm::CUICDMSlideHandle inActiveSlide) = 0;
+        qt3dsdm::Qt3DSDMInstanceHandle inNewRoot, qt3dsdm::CUICDMSlideHandle inActiveSlide) = 0;
 
     // Save and load just a single action
     virtual void SerializeAction(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::CUICDMSlideHandle inSlide,
                                  qt3dsdm::CUICDMActionHandle inAction) = 0;
     // Load a new action onto this root object
     virtual qt3dsdm::CUICDMActionHandle SerializeAction(qt3dsdm::IDOMReader &inReader,
-                                                      qt3dsdm::CUICDMInstanceHandle inNewRoot,
+                                                      qt3dsdm::Qt3DSDMInstanceHandle inNewRoot,
                                                       qt3dsdm::CUICDMSlideHandle inSlide) = 0;
 
     virtual void SerializeSlide(qt3dsdm::IDOMWriter &inWriter, qt3dsdm::CUICDMSlideHandle inSlide) = 0;
diff --git a/src/Authoring/Client/Code/Core/Doc/IDoc.h b/src/Authoring/Client/Code/Core/Doc/IDoc.h
index 486f8910..d9084b76 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDoc.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDoc.h
@@ -56,7 +56,7 @@ namespace foundation {
 }
 }
 namespace qt3dsdm {
-class CUICDMInstanceHandle;
+class Qt3DSDMInstanceHandle;
 class CUICDMSlideHandle;
 class CStudioSystem;
 class IPropertySystem;
@@ -102,7 +102,7 @@ public:
 
     virtual qt3dsdm::IPropertySystem *GetPropertySystem() = 0;
     virtual qt3dsdm::IAnimationCore *GetAnimationCore() = 0;
-    virtual void SetInstancePropertyValue(qt3dsdm::CUICDMInstanceHandle inInstance,
+    virtual void SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                           const std::wstring &inPropertyName,
                                           const qt3dsdm::SValue &inValue) = 0;
     // Return an editor to editing the scene graph of the document.
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
index 072350cc..1c97b021 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
@@ -54,7 +54,7 @@ public:
     friend class std::shared_ptr<IDocSceneGraph>;
 
     virtual ITextRenderer *GetTextRenderer() = 0;
-    virtual QT3DSVec3 GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inHandle, CPt inPoint) = 0;
+    virtual QT3DSVec3 GetIntendedPosition(qt3dsdm::Qt3DSDMInstanceHandle inHandle, CPt inPoint) = 0;
     virtual IBufferManager *GetBufferManager() = 0;
     virtual IPathManager *GetPathManager() = 0;
     virtual qt3ds::foundation::IStringTable *GetRenderStringTable() = 0;
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
index c3192fec..4981cf55 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
@@ -119,17 +119,17 @@ public:
                              TInstanceHandle inTargetId = TInstanceHandle());
 
     static TInstanceHandle CreateSceneGraphInstance(
-        CUICDMInstanceHandle inMaster, TInstanceHandle parent, TSlideHandle inSlide,
+        Qt3DSDMInstanceHandle inMaster, TInstanceHandle parent, TSlideHandle inSlide,
         qt3dsdm::IDataCore &inDataCore, qt3dsdm::ISlideSystem &inSlideSystem,
         qt3dsdm::SComposerObjectDefinitions &inObjectDefs, Q3DStudio::CGraph &inAssetGraph,
         qt3dsdm::IMetaData &inMetaData, TInstanceHandle inTargetId = TInstanceHandle());
 
-    static void UnlinkAlwaysUnlinkedProperties(qt3dsdm::CUICDMInstanceHandle inInstance,
+    static void UnlinkAlwaysUnlinkedProperties(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                qt3dsdm::SComposerObjectDefinitions &inDefs,
                                                qt3dsdm::ISlideSystem &inSlideSystem);
 
     // Returns valid properties followed by exactly one invalid property.
-    static CUICDMPropertyHandle *
+    static Qt3DSDMPropertyHandle *
     GetAlwaysUnlinkedProperties(qt3dsdm::SComposerObjectDefinitions &inDefs);
 
     // Create a new instance in the scene under this slide and such
@@ -204,7 +204,7 @@ public:
     virtual void SetSlideName(TInstanceHandle instance, TPropertyHandle propName,
                               const wchar_t *inOldName, const wchar_t *inNewName) = 0;
 
-    virtual void SetName(CUICDMInstanceHandle inInstance, const CString &inName,
+    virtual void SetName(Qt3DSDMInstanceHandle inInstance, const CString &inName,
                          bool inMakeUnique = false) = 0;
 
     // Linking/unlinking properties.  Functions take care of creating/destroying
@@ -244,7 +244,7 @@ public:
                                  const wchar_t *propName, long subIndex) = 0;
     virtual void SetKeyframeTime(TKeyframeHandle inKeyframe, long inTimeInMilliseconds) = 0;
     virtual void DeleteAllKeyframes(CUICDMAnimationHandle inAnimation) = 0;
-    virtual void KeyframeProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    virtual void KeyframeProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                   bool inDoDiffValue) = 0;
 
     // Only the import interface needs to worry about this.  The animation system automatically
@@ -254,12 +254,12 @@ public:
     // Paste a scene graph object into this system at this location.  Returns the new object
     //(but it sets the new object as the selected object so clients probably don't need this)
     virtual qt3dsdm::TInstanceHandleList
-    PasteSceneGraphObject(const CFilePath &inFilePath, CUICDMInstanceHandle inNewRoot,
+    PasteSceneGraphObject(const CFilePath &inFilePath, Qt3DSDMInstanceHandle inNewRoot,
                           bool inGenerateUniqueName, DocumentEditorInsertType::Enum inInsertType,
                           const CPt &inPosition) = 0;
 
     virtual qt3dsdm::TInstanceHandleList PasteSceneGraphObjectMaster(
-        const CFilePath &inFilePath, CUICDMInstanceHandle inNewRoot, bool inGenerateUniqueName,
+        const CFilePath &inFilePath, Qt3DSDMInstanceHandle inNewRoot, bool inGenerateUniqueName,
         DocumentEditorInsertType::Enum inInsertType, const CPt &inPosition) = 0;
 
     virtual void RearrangeObjects(const qt3dsdm::TInstanceHandleList &inInstances,
@@ -300,14 +300,14 @@ public:
         return DuplicateInstances(theInstances);
     }
 
-    virtual CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    virtual CUICDMActionHandle AddAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                          const wstring &inEvent, const wstring &inHandler) = 0;
 
     virtual void DeleteAction(CUICDMActionHandle inAction) = 0;
 
     // Paste a given action into this new root object.
     virtual CUICDMActionHandle PasteAction(const CFilePath &inFilePath,
-                                           CUICDMInstanceHandle inNewRoot) = 0;
+                                           Qt3DSDMInstanceHandle inNewRoot) = 0;
 
     virtual CUICDMSlideHandle AddSlide(CUICDMSlideHandle inMasterSlide, int inIndex = -1) = 0;
 
@@ -454,8 +454,8 @@ public:
     IDoc &GetEditorDoc() { return m_EditorIDocDoc; }
     bool HasEditor() const;
     IDocumentEditor &EnsureEditor(const wchar_t *inCommandName, const char *inFile, int inLine);
-    void FireImmediateRefresh(qt3dsdm::CUICDMInstanceHandle *inInstances, long inInstanceCount);
-    void FireImmediateRefresh(qt3dsdm::CUICDMInstanceHandle inInstance)
+    void FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle *inInstances, long inInstanceCount);
+    void FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         FireImmediateRefresh(&inInstance, 1);
     }
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
index b10516d1..e581fe9e 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
@@ -56,13 +56,13 @@ namespace Q3DStudio {
 using std::shared_ptr;
 class IDynamicLua;
 
-typedef std::vector<std::pair<qt3dsdm::CUICDMSlideHandle, qt3dsdm::CUICDMInstanceHandle>>
+typedef std::vector<std::pair<qt3dsdm::CUICDMSlideHandle, qt3dsdm::Qt3DSDMInstanceHandle>>
     TSlideInstanceList;
 typedef std::vector<std::pair<qt3dsdm::CUICDMSlideHandle, Q3DStudio::CString>> TSlideStringList;
 typedef std::unordered_map<const wchar_t *, TSlideInstanceList> TCharPtrToSlideInstanceMap;
 using qt3ds::foundation::Option;
-using qt3dsdm::CUICDMInstanceHandle;
-using qt3dsdm::CUICDMPropertyHandle;
+using qt3dsdm::Qt3DSDMInstanceHandle;
+using qt3dsdm::Qt3DSDMPropertyHandle;
 using qt3dsdm::CUICDMSlideHandle;
 using qt3dsdm::CUICDMKeyframeHandle;
 using qt3dsdm::CUICDMActionHandle;
@@ -79,8 +79,8 @@ class IDocumentReader
 protected:
     virtual ~IDocumentReader() {}
 public:
-    typedef CUICDMInstanceHandle TInstanceHandle;
-    typedef CUICDMPropertyHandle TPropertyHandle;
+    typedef Qt3DSDMInstanceHandle TInstanceHandle;
+    typedef Qt3DSDMPropertyHandle TPropertyHandle;
     typedef CUICDMSlideHandle TSlideHandle;
     typedef CUICDMKeyframeHandle TKeyframeHandle;
     typedef qt3dsdm::SValue SValue;
@@ -114,9 +114,9 @@ public:
 
     virtual Q3DStudio::CString GetObjectTypeName(TInstanceHandle instance) const = 0;
 
-    virtual CString GetName(CUICDMInstanceHandle inInstance) const = 0;
-    virtual TInstanceHandle GetFirstBaseClass(CUICDMInstanceHandle inInstance) const = 0;
-    virtual CString GetSourcePath(CUICDMInstanceHandle inInstance) const = 0;
+    virtual CString GetName(Qt3DSDMInstanceHandle inInstance) const = 0;
+    virtual TInstanceHandle GetFirstBaseClass(Qt3DSDMInstanceHandle inInstance) const = 0;
+    virtual CString GetSourcePath(Qt3DSDMInstanceHandle inInstance) const = 0;
 
     template <typename TDataType>
     inline Option<TDataType> GetTypedInstancePropertyValue(TInstanceHandle instance,
@@ -218,7 +218,7 @@ public:
     // to that temporary file.
     virtual CFilePath CopySceneGraphObjects(qt3dsdm::TInstanceHandleList inInstances) = 0;
 
-    CFilePath CopySceneGraphObject(CUICDMInstanceHandle inInstance)
+    CFilePath CopySceneGraphObject(Qt3DSDMInstanceHandle inInstance)
     {
         qt3dsdm::TInstanceHandleList theInstances;
         theInstances.push_back(inInstance);
@@ -227,7 +227,7 @@ public:
 
     // Copy the object just to a DOM representation, don't serialize to file.
     virtual std::shared_ptr<qt3dsdm::IDOMReader>
-    CopySceneGraphObjectToMemory(CUICDMInstanceHandle inInstance) = 0;
+    CopySceneGraphObjectToMemory(Qt3DSDMInstanceHandle inInstance) = 0;
 
     virtual CFilePath CopyAction(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide) = 0;
 
diff --git a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
index a8f55fb2..0b03b00c 100644
--- a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.cpp
@@ -107,8 +107,8 @@ CRelativePathTools::GetPathType(const qt3dsdm::SObjectRefType &inObjectRefValue)
  *	Build a object reference path, via Ids
  */
 Q3DStudio::CString
-CRelativePathTools::BuildReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                                         const qt3dsdm::CUICDMInstanceHandle inRootInstance,
+CRelativePathTools::BuildReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                         const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance,
                                          EPathType inPathType, CDoc *inDoc)
 {
     switch (inPathType) {
@@ -126,7 +126,7 @@ CRelativePathTools::BuildReferenceString(const qt3dsdm::CUICDMInstanceHandle inI
  *property names, in the runtime.
  */
 Q3DStudio::CString
-CRelativePathTools::BuildAbsoluteReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance,
+CRelativePathTools::BuildAbsoluteReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                                  CDoc *inDoc)
 {
     if (inInstance.Valid() == false)
@@ -135,7 +135,7 @@ CRelativePathTools::BuildAbsoluteReferenceString(const qt3dsdm::CUICDMInstanceHa
     Q3DStudio::CString theNameEnd(
         CPathConstructionHelper::EscapeAssetName(LookupObjectName(inInstance, inDoc)));
 
-    qt3dsdm::CUICDMInstanceHandle theParentInstance =
+    qt3dsdm::Qt3DSDMInstanceHandle theParentInstance =
         inDoc->GetStudioSystem()->GetClientDataModelBridge()->GetParentInstance(inInstance);
     if (theParentInstance.Valid())
         theNameStart = BuildAbsoluteReferenceString(theParentInstance, inDoc) + ".";
@@ -144,8 +144,8 @@ CRelativePathTools::BuildAbsoluteReferenceString(const qt3dsdm::CUICDMInstanceHa
 }
 
 Q3DStudio::CString
-CRelativePathTools::BuildRelativeReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                 const qt3dsdm::CUICDMInstanceHandle inRootInstance,
+CRelativePathTools::BuildRelativeReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                 const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance,
                                                  CDoc *inDoc)
 {
     Q3DStudio::CString theAbsRelPath(BuildAbsoluteReferenceString(inInstance, inDoc));
@@ -165,8 +165,8 @@ CRelativePathTools::BuildRelativeReferenceString(const qt3dsdm::CUICDMInstanceHa
  *	@return theId of the object (or the object it manages to traverse to) N.B. this is required
  *	for the Object Ref Picker to highlight that parent object if that token is invalid.
  */
-qt3dsdm::CUICDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath(
-    CDoc *inDoc, const qt3dsdm::CUICDMInstanceHandle &inRootInstance,
+qt3dsdm::Qt3DSDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath(
+    CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
     const Q3DStudio::CString &inString, EPathType &outPathType, bool &outIsResolved,
     const IObjectReferenceHelper *inHelper /*= NULL */)
 {
@@ -175,7 +175,7 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath(
     CStackTokenizer theTokenizer(inString, CPathConstructionHelper::GetPathDelimiter().GetAt(0),
                                  CPathConstructionHelper::GetEscapeChar().GetAt(0));
     // Default to the scene if asset cannot be found.
-    qt3dsdm::CUICDMInstanceHandle theFoundInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle theFoundInstance;
 
     if (theTokenizer.HasNextPartition()) {
         Q3DStudio::CString theCurrentToken(theTokenizer.GetCurrentPartition());
@@ -205,7 +205,7 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath(
     }
 
     if (theFoundInstance.Valid()) {
-        qt3dsdm::CUICDMInstanceHandle theTimeParent =
+        qt3dsdm::Qt3DSDMInstanceHandle theTimeParent =
             theBridge->GetOwningComponentInstance(theFoundInstance);
         if (theTimeParent.Valid()) {
             qt3dsdm::CUICDMSlideHandle theCurrentSlide =
@@ -222,8 +222,8 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::FindAssetInstanceByObjectPath(
 }
 
 qt3dsdm::SObjectRefType
-CRelativePathTools::CreateAssetRefValue(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                                        const qt3dsdm::CUICDMInstanceHandle inRootInstance,
+CRelativePathTools::CreateAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                        const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance,
                                         EPathType inPathType, CDoc *inDoc)
 {
     qt3dsdm::SObjectRefType theAssetRefValue;
@@ -256,14 +256,14 @@ CRelativePathTools::CreateAssetRefValue(const qt3dsdm::CUICDMInstanceHandle inIn
  *	@return	the source ID of the final asset
  *	@see	FindAssetInstanceByObjectPath
  */
-qt3dsdm::CUICDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPath(
-    CDoc *inDoc, const qt3dsdm::CUICDMInstanceHandle &inRootInstance,
-    const qt3dsdm::CUICDMInstanceHandle inTimeParentInstance, qt3dsdm::CUICDMSlideHandle inSlide,
+qt3dsdm::Qt3DSDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPath(
+    CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
+    const qt3dsdm::Qt3DSDMInstanceHandle inTimeParentInstance, qt3dsdm::CUICDMSlideHandle inSlide,
     CStackTokenizer &ioTokenizer, bool &outIsResolved, const IObjectReferenceHelper *inHelper)
 {
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
 
-    qt3dsdm::CUICDMInstanceHandle theFoundInstance = inRootInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle theFoundInstance = inRootInstance;
     // There is another object to parse
     if (inRootInstance.Valid() && ioTokenizer.HasNextPartition()) {
         Q3DStudio::CString theCurrentToken(ioTokenizer.GetCurrentPartition());
@@ -272,7 +272,7 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPat
             // Parent asset
             if (theCurrentToken.Compare(CPathConstructionHelper::GetParentString(), false)) {
                 ++ioTokenizer;
-                qt3dsdm::CUICDMInstanceHandle theParentInstance =
+                qt3dsdm::Qt3DSDMInstanceHandle theParentInstance =
                     theBridge->GetParentInstance(inRootInstance);
                 if (theParentInstance.Valid()) {
                     outIsResolved = true;
@@ -307,7 +307,7 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPat
         }
     }
 
-    return outIsResolved ? theFoundInstance : qt3dsdm::CUICDMInstanceHandle(0);
+    return outIsResolved ? theFoundInstance : qt3dsdm::Qt3DSDMInstanceHandle(0);
 }
 
 //==============================================================================
@@ -315,13 +315,13 @@ qt3dsdm::CUICDMInstanceHandle CRelativePathTools::DoFindAssetInstanceByObjectPat
  * Figures out the object name, used for script access. so that paths are valid in the runtime.
  */
 Q3DStudio::CString
-CRelativePathTools::LookupObjectName(const qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc)
+CRelativePathTools::LookupObjectName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = inDoc->GetStudioSystem()->GetPropertySystem();
     CClientDataModelBridge *theClientBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     if (theClientBridge->IsImageInstance(inInstance)) {
-        qt3dsdm::CUICDMInstanceHandle theParentInstance;
-        qt3dsdm::CUICDMPropertyHandle theProperty;
+        qt3dsdm::Qt3DSDMInstanceHandle theParentInstance;
+        qt3dsdm::Qt3DSDMPropertyHandle theProperty;
         if (!theClientBridge->GetMaterialFromImageInstance(inInstance, theParentInstance,
                                                            theProperty))
             theClientBridge->GetLayerFromImageProbeInstance(inInstance, theParentInstance,
diff --git a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
index c0ae6c89..73b21b82 100644
--- a/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
+++ b/src/Authoring/Client/Code/Core/Doc/RelativePathTools.h
@@ -60,31 +60,31 @@ public:
     static bool IsRelativePath(const qt3dsdm::SObjectRefType &inObjectRefValue);
     static EPathType GetPathType(const qt3dsdm::SObjectRefType &inObjectRefValue);
 
-    static Q3DStudio::CString BuildReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                   const qt3dsdm::CUICDMInstanceHandle inRootInstance,
+    static Q3DStudio::CString BuildReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                   const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance,
                                                    EPathType inPathType, CDoc *inDoc);
     static Q3DStudio::CString
-    BuildAbsoluteReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc);
+    BuildAbsoluteReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc);
     static Q3DStudio::CString
-    BuildRelativeReferenceString(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                                 const qt3dsdm::CUICDMInstanceHandle inRootInstance, CDoc *inDoc);
-    static qt3dsdm::CUICDMInstanceHandle
-    FindAssetInstanceByObjectPath(CDoc *inDoc, const qt3dsdm::CUICDMInstanceHandle &inRootInstance,
+    BuildRelativeReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                 const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance, CDoc *inDoc);
+    static qt3dsdm::Qt3DSDMInstanceHandle
+    FindAssetInstanceByObjectPath(CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
                                   const Q3DStudio::CString &inString, EPathType &outPathType,
                                   bool &outIsResolved,
                                   const IObjectReferenceHelper *inHelper = NULL);
     static qt3dsdm::SObjectRefType
-    CreateAssetRefValue(const qt3dsdm::CUICDMInstanceHandle inInstance,
-                        const qt3dsdm::CUICDMInstanceHandle inRootInstance, EPathType inPathType,
+    CreateAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                        const qt3dsdm::Qt3DSDMInstanceHandle inRootInstance, EPathType inPathType,
                         CDoc *inDoc);
 
 protected:
-    static qt3dsdm::CUICDMInstanceHandle
-    DoFindAssetInstanceByObjectPath(CDoc *inDoc, const qt3dsdm::CUICDMInstanceHandle &inRootInstance,
-                                    const qt3dsdm::CUICDMInstanceHandle inTimeParentInstance,
+    static qt3dsdm::Qt3DSDMInstanceHandle
+    DoFindAssetInstanceByObjectPath(CDoc *inDoc, const qt3dsdm::Qt3DSDMInstanceHandle &inRootInstance,
+                                    const qt3dsdm::Qt3DSDMInstanceHandle inTimeParentInstance,
                                     qt3dsdm::CUICDMSlideHandle inSlide, CStackTokenizer &ioTokenizer,
                                     bool &outIsResolved, const IObjectReferenceHelper *inHelper);
-    static Q3DStudio::CString LookupObjectName(const qt3dsdm::CUICDMInstanceHandle inInstance,
+    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 b43f5887..103a7fad 100644
--- a/src/Authoring/Client/Code/Core/Doc/SelectedValue.h
+++ b/src/Authoring/Client/Code/Core/Doc/SelectedValue.h
@@ -35,11 +35,11 @@ struct SelectedValueTypes
 {
     enum Enum {
         UnknownSelectedValueType = 0,
-        Instance, // CUICDMInstanceHandle
+        Instance, // Qt3DSDMInstanceHandle
         Slide, // CUICDMSlideHandle
         SlideInsertion, // void*
         Guide, // CUICDMGuideHandle
-        MultipleInstances, // std::vector<CUICDMInstanceHandle>
+        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 b86cf4e5..5289324e 100644
--- a/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h
+++ b/src/Authoring/Client/Code/Core/Doc/SelectedValueImpl.h
@@ -37,7 +37,7 @@ namespace Q3DStudio {
 
 struct SSlideInstanceWrapper
 {
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
     qt3dsdm::CUICDMSlideHandle m_Slide;
 #ifdef _WIN32
     // We have a multiple unions which needs to be big enough
@@ -46,7 +46,7 @@ struct SSlideInstanceWrapper
     size_t m_Padding;
 #endif
     SSlideInstanceWrapper() {}
-    SSlideInstanceWrapper(qt3dsdm::CUICDMInstanceHandle inst, qt3dsdm::CUICDMSlideHandle slide)
+    SSlideInstanceWrapper(qt3dsdm::Qt3DSDMInstanceHandle inst, qt3dsdm::CUICDMSlideHandle slide)
         : m_Instance(inst)
         , m_Slide(slide)
     {
@@ -78,7 +78,7 @@ struct SSelectedValueTypeMap
 };
 
 template <>
-struct SSelectedValueTypeMap<qt3dsdm::CUICDMInstanceHandle>
+struct SSelectedValueTypeMap<qt3dsdm::Qt3DSDMInstanceHandle>
 {
     static SelectedValueTypes::Enum GetType() { return SelectedValueTypes::Instance; }
 };
@@ -127,7 +127,7 @@ struct SSelectedValueTraits
     {
         switch (inType) {
         case SelectedValueTypes::Instance:
-            return inVisitor(*qt3ds::NVUnionCast<qt3dsdm::CUICDMInstanceHandle *>(inData));
+            return inVisitor(*qt3ds::NVUnionCast<qt3dsdm::Qt3DSDMInstanceHandle *>(inData));
         case SelectedValueTypes::Slide:
             return inVisitor(*qt3ds::NVUnionCast<SSlideInstanceWrapper *>(inData));
         case SelectedValueTypes::Guide:
@@ -148,7 +148,7 @@ struct SSelectedValueTraits
     {
         switch (inType) {
         case SelectedValueTypes::Instance:
-            return inVisitor(*qt3ds::NVUnionCast<const qt3dsdm::CUICDMInstanceHandle *>(inData));
+            return inVisitor(*qt3ds::NVUnionCast<const qt3dsdm::Qt3DSDMInstanceHandle *>(inData));
         case SelectedValueTypes::Slide:
             return inVisitor(*qt3ds::NVUnionCast<const SSlideInstanceWrapper *>(inData));
         case SelectedValueTypes::Guide:
@@ -180,7 +180,7 @@ struct SSelectedValue : public TSelectedValueUnionType
         : TSelectedValueUnionType(static_cast<const TSelectedValueUnionType &>(other))
     {
     }
-    SSelectedValue(qt3dsdm::CUICDMInstanceHandle val)
+    SSelectedValue(qt3dsdm::Qt3DSDMInstanceHandle val)
         : TSelectedValueUnionType(val)
     {
     }
@@ -215,7 +215,7 @@ struct SSelectedValue : public TSelectedValueUnionType
     {
         if (getType() == SelectedValueTypes::Instance) {
             qt3dsdm::TInstanceHandleList retval;
-            retval.push_back(getData<qt3dsdm::CUICDMInstanceHandle>());
+            retval.push_back(getData<qt3dsdm::Qt3DSDMInstanceHandle>());
             return retval;
         } else if (getType() == SelectedValueTypes::MultipleInstances)
             return getData<qt3dsdm::TInstanceHandleList>();
diff --git a/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.cpp b/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.cpp
index 6cf6aea9..51562bb3 100644
--- a/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.cpp
@@ -67,12 +67,12 @@ CStudioSystem::CStudioSystem(CDoc *inDoc)
 struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
 {
     std::shared_ptr<CClientDataModelBridge> m_Bridge;
-    CUICDMPropertyHandle m_Slot;
+    Qt3DSDMPropertyHandle m_Slot;
     TDataCorePtr m_DataCore;
     TSlideCorePtr m_SlideCore;
     TAnimationCorePtr m_AnimationCore;
     MaterialImagePropertyInfo(std::shared_ptr<CClientDataModelBridge> inBridge,
-                              CUICDMPropertyHandle inSlot, TDataCorePtr inDataCore,
+                              Qt3DSDMPropertyHandle inSlot, TDataCorePtr inDataCore,
                               TSlideCorePtr inSlideCore, TAnimationCorePtr inAnimationCore)
         : m_Bridge(inBridge)
         , m_Slot(inSlot)
@@ -84,19 +84,19 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
     /**
      *	Return the instance that relates to this property
      */
-    CUICDMInstanceHandle GetInstanceForProperty(const SValue &inValue) override
+    Qt3DSDMInstanceHandle GetInstanceForProperty(const SValue &inValue) override
     {
         SLong4 theId(get<SLong4>(inValue));
         if (theId.m_Longs[0] && theId.m_Longs[1] && theId.m_Longs[2] && theId.m_Longs[3]) {
-            CUICDMInstanceHandle theImageInstance = m_Bridge->GetImageInstanceByGUID(theId);
+            Qt3DSDMInstanceHandle theImageInstance = m_Bridge->GetImageInstanceByGUID(theId);
             return theImageInstance;
         }
         return 0;
     }
 
     static inline void SetPropertyIfOnInstance(const TSlideEntry &inEntry,
-                                               CUICDMInstanceHandle inInstance,
-                                               CUICDMInstanceHandle inDestInstance,
+                                               Qt3DSDMInstanceHandle inInstance,
+                                               Qt3DSDMInstanceHandle inDestInstance,
                                                CUICDMSlideHandle inDestSlide,
                                                TSlideCorePtr inSlideCore)
     {
@@ -107,7 +107,7 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
 
     static inline void
     CopyAnimationIfOnInstance(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSourceSlide,
-                              CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inDestInstance,
+                              Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inDestInstance,
                               CUICDMSlideHandle inDestSlide, TAnimationCorePtr inAnimationCore)
     {
         SAnimationInfo theInfo(inAnimationCore->GetAnimationInfo(inAnimation));
@@ -122,11 +122,11 @@ struct MaterialImagePropertyInfo : public IPropertyInstanceInfo
      */
     SValue CreateInstanceForProperty(CUICDMSlideHandle inSourceSlide,
                                              CUICDMSlideHandle inDestSlide,
-                                             CUICDMInstanceHandle inInstance) override
+                                             Qt3DSDMInstanceHandle inInstance) override
     {
-        std::pair<qt3dsdm::CUICDMInstanceHandle, qt3dsdm::SLong4> theInstanceGuidPair(
+        std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4> theInstanceGuidPair(
             m_Bridge->CreateImageInstance(inInstance, m_Slot, inDestSlide));
-        CUICDMInstanceHandle theNewInstance(theInstanceGuidPair.first);
+        Qt3DSDMInstanceHandle theNewInstance(theInstanceGuidPair.first);
         TSlideEntryList theEntries;
         m_SlideCore->GetSlidePropertyEntries(inSourceSlide, theEntries);
         do_all(theEntries, std::bind(SetPropertyIfOnInstance, std::placeholders::_1,
@@ -234,7 +234,7 @@ void CStudioSystem::SetConsumer(TTransactionConsumerPtr inConsumer)
     m_StudioSystem->SetConsumer(inConsumer);
 }
 
-bool CStudioSystem::IsInstance(CUICDMInstanceHandle inInstance) const
+bool CStudioSystem::IsInstance(Qt3DSDMInstanceHandle inInstance) const
 {
     return m_StudioSystem->GetCoreSystem()->GetDataCore()->IsInstance(inInstance);
 }
diff --git a/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.h b/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.h
index a43fdae3..37a9cb68 100644
--- a/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.h
+++ b/src/Authoring/Client/Code/Core/Doc/UICDMStudioSystem.h
@@ -77,7 +77,7 @@ public:
     CStudioFullSystem *GetFullSystem() { return m_StudioSystem.get(); }
 
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
-    bool IsInstance(CUICDMInstanceHandle inInstance) const;
+    bool IsInstance(Qt3DSDMInstanceHandle inInstance) const;
 };
 };
 
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
index f2444755..c662a007 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
@@ -49,14 +49,14 @@
 #include "Graph.h"
 
 inline void GetAllowableParentSlides(CClientDataModelBridge *inBridge,
-                                     qt3dsdm::CUICDMInstanceHandle inInstance,
+                                     qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                      qt3dsdm::TSlideHandleList &inList)
 {
     if (!inInstance.Valid())
         return;
 
     qt3dsdm::CUICDMSlideHandle theSlide = 0;
-    qt3dsdm::CUICDMInstanceHandle theTimeParent = inBridge->GetOwningComponentInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theTimeParent = inBridge->GetOwningComponentInstance(inInstance);
     if (theTimeParent.Valid()) {
         if (inBridge->IsMaster(inInstance)) {
             // we use master time context if parent is a master object
@@ -82,7 +82,7 @@ CObjectReferenceHelper::~CObjectReferenceHelper()
 }
 
 IObjectReferenceHelper::SObjectRefInfo
-CObjectReferenceHelper::GetInfo(const qt3dsdm::CUICDMInstanceHandle &inInstance) const
+CObjectReferenceHelper::GetInfo(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const
 {
     // UICDM
     using namespace qt3dsdm;
@@ -102,8 +102,8 @@ CObjectReferenceHelper::GetInfo(const qt3dsdm::CUICDMInstanceHandle &inInstance)
             if (theName)
                 theInfo.m_Name = theName->GetData();
         } else {
-            qt3dsdm::CUICDMInstanceHandle theParentInstance;
-            qt3dsdm::CUICDMPropertyHandle theProperty;
+            qt3dsdm::Qt3DSDMInstanceHandle theParentInstance;
+            qt3dsdm::Qt3DSDMPropertyHandle theProperty;
             if (!theClientBridge->GetMaterialFromImageInstance(inInstance, theParentInstance,
                                                                theProperty))
                 theClientBridge->GetLayerFromImageProbeInstance(inInstance, theParentInstance,
@@ -124,7 +124,7 @@ CObjectReferenceHelper::GetInfo(const qt3dsdm::CUICDMInstanceHandle &inInstance)
 
 // Return the list of slide handles that is 'accessible' via this base id.
 qt3dsdm::TSlideHandleList
-CObjectReferenceHelper::GetSlideList(const qt3dsdm::CUICDMInstanceHandle inInstance) const
+CObjectReferenceHelper::GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     qt3dsdm::TSlideHandleList theList;
     if (inInstance.Valid()) {
@@ -145,8 +145,8 @@ CObjectReferenceHelper::GetSlideList(const qt3dsdm::CUICDMInstanceHandle inInsta
 
 // Return all children under inSlideIndex
 bool CObjectReferenceHelper::GetChildInstanceList(
-    const qt3dsdm::CUICDMInstanceHandle &inInstance, qt3dsdm::TInstanceHandleList &outList,
-    qt3dsdm::CUICDMSlideHandle inSlide, const qt3dsdm::CUICDMInstanceHandle &inOwningInstance) const
+    const qt3dsdm::Qt3DSDMInstanceHandle &inInstance, qt3dsdm::TInstanceHandleList &outList,
+    qt3dsdm::CUICDMSlideHandle inSlide, const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const
 {
     (void)inOwningInstance;
     CClientDataModelBridge *theClientBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
@@ -173,13 +173,13 @@ bool CObjectReferenceHelper::GetChildInstanceList(
  * Figures out the object (displayed) name for a given instance
  */
 Q3DStudio::CString
-CObjectReferenceHelper::LookupObjectFormalName(const qt3dsdm::CUICDMInstanceHandle inInstance) const
+CObjectReferenceHelper::LookupObjectFormalName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_Doc->GetStudioSystem()->GetPropertySystem();
     CClientDataModelBridge *theClientBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
     if (theClientBridge->IsImageInstance(inInstance)) {
-        qt3dsdm::CUICDMInstanceHandle theParentInstance;
-        qt3dsdm::CUICDMPropertyHandle theProperty;
+        qt3dsdm::Qt3DSDMInstanceHandle theParentInstance;
+        qt3dsdm::Qt3DSDMPropertyHandle theProperty;
         if (!theClientBridge->GetMaterialFromImageInstance(inInstance, theParentInstance,
                                                            theProperty))
             theClientBridge->GetLayerFromImageProbeInstance(inInstance, theParentInstance,
@@ -204,8 +204,8 @@ CObjectReferenceHelper::LookupObjectFormalName(const qt3dsdm::CUICDMInstanceHand
  * String returned for displaying relative path values in the Object Ref Picker
  */
 Q3DStudio::CString CObjectReferenceHelper::GetObjectReferenceString(
-    const qt3dsdm::CUICDMInstanceHandle &inBaseInstance, CRelativePathTools::EPathType inPathType,
-    const qt3dsdm::CUICDMInstanceHandle &inInstance) const
+    const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance, CRelativePathTools::EPathType inPathType,
+    const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const
 {
     return CRelativePathTools::BuildReferenceString(inInstance, inBaseInstance, inPathType, m_Doc);
 }
@@ -215,10 +215,10 @@ Q3DStudio::CString CObjectReferenceHelper::GetObjectReferenceString(
  * NOTE: inId is never a UICDM object, till we support dynamic properties OR actions for UICDM
  * objects.
  */
-bool CObjectReferenceHelper::ResolvePath(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+bool CObjectReferenceHelper::ResolvePath(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                                          const Q3DStudio::CString &inPathValue,
                                          CRelativePathTools::EPathType &outType,
-                                         qt3dsdm::CUICDMInstanceHandle &outResolvedInstance)
+                                         qt3dsdm::Qt3DSDMInstanceHandle &outResolvedInstance)
 {
     if (inInstance.Valid()) {
         bool theFullResolvedFlag;
@@ -230,9 +230,9 @@ bool CObjectReferenceHelper::ResolvePath(const qt3dsdm::CUICDMInstanceHandle &in
 }
 using namespace qt3dsdm;
 
-qt3dsdm::CUICDMInstanceHandle
+qt3dsdm::Qt3DSDMInstanceHandle
 CObjectReferenceHelper::Resolve(const qt3dsdm::SValue &inObjectRefValue,
-                                const qt3dsdm::CUICDMInstanceHandle &inBaseInstance) const
+                                const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance) const
 {
     CClientDataModelBridge *theBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
     if (inBaseInstance.Valid()) {
@@ -268,7 +268,7 @@ CObjectReferenceHelper::Resolve(const qt3dsdm::SValue &inObjectRefValue,
             return theBridge->GetInstanceByGUID(theGuid);
         }
     }
-    return qt3dsdm::CUICDMInstanceHandle();
+    return qt3dsdm::Qt3DSDMInstanceHandle();
 }
 
 //==============================================================================
@@ -277,15 +277,15 @@ CObjectReferenceHelper::Resolve(const qt3dsdm::SValue &inObjectRefValue,
  * preserved.
  */
 qt3dsdm::SObjectRefType
-CObjectReferenceHelper::GetAssetRefValue(const qt3dsdm::CUICDMInstanceHandle &inInstance,
-                                         const qt3dsdm::CUICDMInstanceHandle &inBaseInstance,
+CObjectReferenceHelper::GetAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
+                                         const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                                          CRelativePathTools::EPathType inPathType) const
 {
     return CRelativePathTools::CreateAssetRefValue(inInstance, inBaseInstance, inPathType, m_Doc);
 }
 
 void CObjectReferenceHelper::GetPropertyAsChildrenList(
-    const qt3dsdm::CUICDMInstanceHandle &inInstance, qt3dsdm::TInstanceHandleList &outList,
+    const qt3dsdm::Qt3DSDMInstanceHandle &inInstance, qt3dsdm::TInstanceHandleList &outList,
     long inSlideIndex) const
 {
     if (inInstance.Valid()) {
@@ -301,7 +301,7 @@ void CObjectReferenceHelper::GetPropertyAsChildrenList(
 
         for (size_t thePropertyIndex = 0; thePropertyIndex < theProperties.size();
              ++thePropertyIndex) {
-            CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+            Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
             AdditionalMetaDataType::Value theAdditionalMetaDataType =
                 thePropertySystem->GetAdditionalMetaDataType(inInstance, theProperty);
 
@@ -315,7 +315,7 @@ void CObjectReferenceHelper::GetPropertyAsChildrenList(
                     SLong4 theLong4 = qt3dsdm::get<SLong4>(theValue);
                     if (theLong4.m_Longs[0] != 0 || theLong4.m_Longs[1] != 0
                         || theLong4.m_Longs[2] != 0 || theLong4.m_Longs[3] != 0) {
-                        CUICDMInstanceHandle theImageInstance =
+                        Qt3DSDMInstanceHandle theImageInstance =
                             theClientBridge->GetInstanceByGUID(theLong4);
                         outList.push_back(theImageInstance);
                     }
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
index 8cd7bdfc..3e03faa6 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
@@ -55,36 +55,36 @@ public:
     CObjectReferenceHelper(CDoc *inDoc);
     ~CObjectReferenceHelper();
 
-    SObjectRefInfo GetInfo(const qt3dsdm::CUICDMInstanceHandle &inInstance) const override;
+    SObjectRefInfo GetInfo(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const override;
 
     virtual qt3dsdm::TSlideHandleList
-    GetSlideList(const qt3dsdm::CUICDMInstanceHandle inInstance) const override;
-    bool GetChildInstanceList(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+    GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const override;
+    bool GetChildInstanceList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                                       qt3dsdm::TInstanceHandleList &outList,
                                       qt3dsdm::CUICDMSlideHandle inSlide,
-                                      const qt3dsdm::CUICDMInstanceHandle &inOwningInstance) const override;
+                                      const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const override;
     virtual Q3DStudio::CString
-    LookupObjectFormalName(const qt3dsdm::CUICDMInstanceHandle inInstance) const override;
+    LookupObjectFormalName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const override;
 
     virtual Q3DStudio::CString
-    GetObjectReferenceString(const qt3dsdm::CUICDMInstanceHandle &inBaseInstance,
+    GetObjectReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                              CRelativePathTools::EPathType inPathType,
-                             const qt3dsdm::CUICDMInstanceHandle &inInstance) const override;
-    bool ResolvePath(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+                             const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const override;
+    bool ResolvePath(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                              const Q3DStudio::CString &inPathValue,
                              CRelativePathTools::EPathType &outType,
-                             qt3dsdm::CUICDMInstanceHandle &outResolveInstance) override;
-    virtual qt3dsdm::CUICDMInstanceHandle
+                             qt3dsdm::Qt3DSDMInstanceHandle &outResolveInstance) override;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
     Resolve(const qt3dsdm::SValue &inObjectRefValue,
-            const qt3dsdm::CUICDMInstanceHandle &inBaseInstance) const override;
+            const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance) const override;
 
     virtual qt3dsdm::SObjectRefType
-    GetAssetRefValue(const qt3dsdm::CUICDMInstanceHandle &inInstance,
-                     const qt3dsdm::CUICDMInstanceHandle &inBaseInstance,
+    GetAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
+                     const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                      CRelativePathTools::EPathType inPathType) const override;
 
 protected: // UICDM
-    void GetPropertyAsChildrenList(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+    void GetPropertyAsChildrenList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                                    qt3dsdm::TInstanceHandleList &outList, long inSlideIndex) const;
 
 protected:
diff --git a/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h b/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
index b26c902f..c570ccb8 100644
--- a/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/IObjectReferenceHelper.h
@@ -70,31 +70,31 @@ public:
     virtual ~IObjectReferenceHelper() {}
 
 public:
-    virtual SObjectRefInfo GetInfo(const qt3dsdm::CUICDMInstanceHandle &inInstance) const = 0;
+    virtual SObjectRefInfo GetInfo(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const = 0;
 
     virtual qt3dsdm::TSlideHandleList
-    GetSlideList(const qt3dsdm::CUICDMInstanceHandle inInstance) const = 0;
+    GetSlideList(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const = 0;
     virtual bool
-    GetChildInstanceList(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+    GetChildInstanceList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                          qt3dsdm::TInstanceHandleList &outlist, qt3dsdm::CUICDMSlideHandle inSlide,
-                         const qt3dsdm::CUICDMInstanceHandle &inOwningInstance) const = 0;
+                         const qt3dsdm::Qt3DSDMInstanceHandle &inOwningInstance) const = 0;
     virtual Q3DStudio::CString
-    LookupObjectFormalName(const qt3dsdm::CUICDMInstanceHandle inInstance) const = 0;
+    LookupObjectFormalName(const qt3dsdm::Qt3DSDMInstanceHandle inInstance) const = 0;
 
     virtual Q3DStudio::CString
-    GetObjectReferenceString(const qt3dsdm::CUICDMInstanceHandle &inBaseInstance,
+    GetObjectReferenceString(const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                              CRelativePathTools::EPathType inPathType,
-                             const qt3dsdm::CUICDMInstanceHandle &inInstance) const = 0;
-    virtual bool ResolvePath(const qt3dsdm::CUICDMInstanceHandle &inInstance,
+                             const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const = 0;
+    virtual bool ResolvePath(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                              const Q3DStudio::CString &inPathValue,
                              CRelativePathTools::EPathType &outType,
-                             qt3dsdm::CUICDMInstanceHandle &outResolvedInstance) = 0;
-    virtual qt3dsdm::CUICDMInstanceHandle
+                             qt3dsdm::Qt3DSDMInstanceHandle &outResolvedInstance) = 0;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle
     Resolve(const qt3dsdm::SValue &inObjectRefValue,
-            const qt3dsdm::CUICDMInstanceHandle &inBaseInstance) const = 0;
+            const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance) const = 0;
     virtual qt3dsdm::SObjectRefType
-    GetAssetRefValue(const qt3dsdm::CUICDMInstanceHandle &inInstance,
-                     const qt3dsdm::CUICDMInstanceHandle &inBaseInstance,
+    GetAssetRefValue(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
+                     const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                      CRelativePathTools::EPathType inPathType) const = 0;
 };
 
diff --git a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
index b2a2e8db..d9efa2d5 100644
--- a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.cpp
@@ -56,13 +56,13 @@ static const Q3DStudio::CString SOURCEPATHTHIS(L"this");
  */
 Q3DStudio::CString
 CPathConstructionHelper::BuildAbsoluteReferenceString(CDoc *inDoc,
-                                                      qt3dsdm::CUICDMInstanceHandle inInstance)
+                                                      qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
     Q3DStudio::CString theNameStart;
     Q3DStudio::CString theNameEnd = EscapeAssetName(theBridge->GetName(inInstance));
 
-    qt3dsdm::CUICDMInstanceHandle theParentInstance = theBridge->GetParentInstance(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theParentInstance = theBridge->GetParentInstance(inInstance);
     if (theParentInstance.Valid()) {
         theNameStart = BuildAbsoluteReferenceString(inDoc, theParentInstance);
         theNameStart += ".";
@@ -77,7 +77,7 @@ CPathConstructionHelper::BuildAbsoluteReferenceString(CDoc *inDoc,
  *	Create a relative path reference string
  */
 Q3DStudio::CString CPathConstructionHelper::BuildRelativeReferenceString(
-    CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::CUICDMInstanceHandle inRootInstance)
+    CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMInstanceHandle inRootInstance)
 {
     Q3DStudio::CString theAbsRelPath = BuildAbsoluteReferenceString(inDoc, inInstance);
     Q3DStudio::CString theAbsRootPath = BuildAbsoluteReferenceString(inDoc, inRootInstance);
diff --git a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.h b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.h
index 221c2c08..d2119adb 100644
--- a/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/PathConstructionHelper.h
@@ -54,10 +54,10 @@ class CPathConstructionHelper
     //==============================================================================
 public:
     static Q3DStudio::CString BuildAbsoluteReferenceString(CDoc *inDoc,
-                                                           qt3dsdm::CUICDMInstanceHandle inInstance);
+                                                           qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     static Q3DStudio::CString
-    BuildRelativeReferenceString(CDoc *inDoc, qt3dsdm::CUICDMInstanceHandle inInstance,
-                                 qt3dsdm::CUICDMInstanceHandle inRootInstance);
+    BuildRelativeReferenceString(CDoc *inDoc, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                 qt3dsdm::Qt3DSDMInstanceHandle inRootInstance);
     static Q3DStudio::CString BuildRelativeReferenceString(Q3DStudio::CString &inAbsObjPath,
                                                            Q3DStudio::CString &inAbsRootPath);
     static Q3DStudio::CString EscapeAssetName(Q3DStudio::CString inAssetName);
diff --git a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
index 008e3f67..62d455d9 100644
--- a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
@@ -58,7 +58,7 @@
  * @param inSlideIndex a slide index where zero is the master slide
  * @return a pointer to the new child object or NULL if not added
  */
-qt3dsdm::CUICDMInstanceHandle TestCmdUtilsAddObject(CAsset *inParent, CAsset *inChild,
+qt3dsdm::Qt3DSDMInstanceHandle TestCmdUtilsAddObject(CAsset *inParent, CAsset *inChild,
                                                   long inSlideIndex)
 {
     Q_UNUSED(inParent);
diff --git a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
index 27f1b9ce..285dfb5c 100644
--- a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
+++ b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.h
@@ -49,7 +49,7 @@ typedef std::list<Q3DStudio::CString> TFingerprint;
 // Functions
 //==============================================================================
 
-qt3dsdm::CUICDMInstanceHandle TestCmdUtilsAddObject(CAsset *inParent, CAsset *inChild,
+qt3dsdm::Qt3DSDMInstanceHandle TestCmdUtilsAddObject(CAsset *inParent, CAsset *inChild,
                                                   long inSlideIndex);
 
 TFingerprint TestCmdUtilsMakeFingerprint(CNode *inNode);
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
index cbca7d6d..e284dc3b 100644
--- a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
+++ b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.cpp
@@ -119,7 +119,7 @@ void CPlaybackClock::OnReachedUpperBound()
 {
     qt3dsdm::CUICDMSlideHandle theActiveSlide(m_Doc->GetActiveSlide());
     // clock has passed the end, check whether needs to switch slide
-    qt3dsdm::CUICDMInstanceHandle theInstanceHandle =
+    qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle =
         GetSlideSystem()->GetSlideInstance(theActiveSlide);
 
     // Get the play through state
@@ -214,7 +214,7 @@ void CPlaybackClock::Reset()
  */
 void CPlaybackClock::UpdateClockProperties()
 {
-    qt3dsdm::CUICDMInstanceHandle theInstanceHandle =
+    qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle =
         GetSlideSystem()->GetSlideInstance(m_Doc->GetActiveSlide());
     ASSERT(theInstanceHandle.Valid());
 
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
index c49e9514..1da81488 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
@@ -93,7 +93,7 @@ bool CBasicObjectDropSource::ValidateTarget(CDropTarget *inTarget)
     } else {
         if (CHotKeys::IsKeyDown(Qt::AltModifier) && targetType != OBJTYPE_SCENE
             && targetType != OBJTYPE_COMPONENT) {
-            qt3dsdm::CUICDMInstanceHandle theTarget = inTarget->GetInstance();
+            qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget->GetInstance();
             CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
             IDocumentReader &theReader(theDoc->GetDocumentReader());
             qt3dsdm::CUICDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
@@ -126,7 +126,7 @@ bool CBasicObjectDropSource::CanCopy()
     return true;
 }
 
-CCmd *CBasicObjectDropSource::GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+CCmd *CBasicObjectDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                                    EDROPDESTINATION inDestType,
                                                    qt3dsdm::CUICDMSlideHandle inSlide)
 {
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
index dca67a97..c5b55c84 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.h
@@ -52,7 +52,7 @@ public:
     bool CanCopy() override;
     bool ValidateTarget(CDropTarget *inTarget) override;
 
-    CCmd *GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+    CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
                                        qt3dsdm::CUICDMSlideHandle inSlide) override;
 
diff --git a/src/Authoring/Studio/DragAndDrop/DropSource.h b/src/Authoring/Studio/DragAndDrop/DropSource.h
index 9abaff9f..727e89a6 100644
--- a/src/Authoring/Studio/DragAndDrop/DropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/DropSource.h
@@ -81,7 +81,7 @@ public:
     virtual void SetCurrentFlags(Qt::KeyboardModifiers inFlags) { m_CurrentFlags = inFlags; }
     virtual Qt::KeyboardModifiers GetCurrentFlags() const { return m_CurrentFlags; }
 
-    virtual CCmd *GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle, EDROPDESTINATION,
+    virtual CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle, EDROPDESTINATION,
                                        qt3dsdm::CUICDMSlideHandle)
     {
         return nullptr;
diff --git a/src/Authoring/Studio/DragAndDrop/DropTarget.h b/src/Authoring/Studio/DragAndDrop/DropTarget.h
index f405251f..05eb2c0c 100644
--- a/src/Authoring/Studio/DragAndDrop/DropTarget.h
+++ b/src/Authoring/Studio/DragAndDrop/DropTarget.h
@@ -44,7 +44,7 @@ class CStudioApp;
 class CDropTarget
 {
 protected:
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
     long m_ObjectType;
 
 public:
@@ -55,11 +55,11 @@ public:
     virtual bool Drop(CDropSource &inSource) = 0;
     virtual long GetObjectType() = 0;
 
-    virtual void SetInstance(qt3dsdm::CUICDMInstanceHandle inInstance) { m_Instance = inInstance; }
-    virtual qt3dsdm::CUICDMInstanceHandle GetInstance() { return m_Instance; }
+    virtual void SetInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) { m_Instance = inInstance; }
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInstance() { return m_Instance; }
 
-    virtual bool IsRelative(qt3dsdm::CUICDMInstanceHandle) { return false; }
-    virtual bool IsSelf(qt3dsdm::CUICDMInstanceHandle) { return false; }
+    virtual bool IsRelative(qt3dsdm::Qt3DSDMInstanceHandle) { return false; }
+    virtual bool IsSelf(qt3dsdm::Qt3DSDMInstanceHandle) { return false; }
     virtual bool IsMaster() { return false; }
     virtual bool CanAddToMaster();
 };
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
index aae1b602..f39c182a 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
@@ -72,7 +72,7 @@ bool CFileDropSource::ValidateTarget(CDropTarget *inTarget)
     } else {
         if (CHotKeys::IsKeyDown(Qt::AltModifier) && targetType != OBJTYPE_SCENE
             && targetType != OBJTYPE_COMPONENT) {
-            qt3dsdm::CUICDMInstanceHandle theTarget = inTarget->GetInstance();
+            qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget->GetInstance();
             CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
             IDocumentReader &theReader(theDoc->GetDocumentReader());
             qt3dsdm::CUICDMSlideHandle toSlide = theReader.GetAssociatedSlide(theTarget);
@@ -138,11 +138,11 @@ bool CFileDropSource::CanCopy()
     return true;
 }
 
-CCmd *CFileDropSource::GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+CCmd *CFileDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                             EDROPDESTINATION inDestType,
                                             qt3dsdm::CUICDMSlideHandle inSlide)
 {
-    qt3dsdm::CUICDMInstanceHandle theTarget = inTarget;
+    qt3dsdm::Qt3DSDMInstanceHandle theTarget = inTarget;
 
     CDoc &theDoc(*g_StudioApp.GetCore()->GetDoc());
     Q3DStudio::CFilePath theFilePath(m_File.GetAbsolutePath());
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.h b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
index 64539137..ab97a382 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
@@ -66,7 +66,7 @@ public:
     bool GetHasValidTarget();
     void SetHasValidTarget(bool inValid) override;
 
-    CCmd *GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+    CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
                                        qt3dsdm::CUICDMSlideHandle inSlide) override;
 };
diff --git a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
index b6cb7052..cb1a4142 100644
--- a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
+++ b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.cpp
@@ -71,7 +71,7 @@ CSceneViewDropTarget::CSceneViewDropTarget()
  */
 long CSceneViewDropTarget::GetObjectType()
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
 
     if (theInstance.Valid()) {
         CClientDataModelBridge *theBridge =
@@ -144,7 +144,7 @@ bool CSceneViewDropTarget::Drop(CDropSource &inSource)
     // We have to set this so we can adjust the Target to accept this source.
     SetDropSourceObjectType(inSource.GetObjectType());
 
-    qt3dsdm::CUICDMInstanceHandle theTargetInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theTargetInstance = GetInstance();
     if (theTargetInstance.Valid()) {
         CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
         qt3dsdm::ISlideSystem *theSlideSystem = theDoc->GetStudioSystem()->GetSlideSystem();
@@ -171,10 +171,10 @@ bool CSceneViewDropTarget::Drop(CDropSource &inSource)
 /**
  * 	 @return the Asset that we would like the DropSource to drop on to.
  */
-qt3dsdm::CUICDMInstanceHandle CSceneViewDropTarget::GetInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CSceneViewDropTarget::GetInstance()
 {
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
-    qt3dsdm::CUICDMInstanceHandle theRootObject = theDoc->GetActiveRootInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theRootObject = theDoc->GetActiveRootInstance();
     EStudioObjectType theRootObjType =
         theDoc->GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(theRootObject);
 
@@ -196,11 +196,11 @@ qt3dsdm::CUICDMInstanceHandle CSceneViewDropTarget::GetInstance()
  *		Check to see if the Asset is a relative of our asset.
  * 		@return true if the inAsset is a parent grandparent...etc. of this asset.
  */
-bool CSceneViewDropTarget::IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CSceneViewDropTarget::IsRelative(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     bool theReturn = false;
 
-    qt3dsdm::CUICDMInstanceHandle theThisInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theThisInstance = GetInstance();
     // This will check to see if the inAsset is already a parent, grandparent....etc.
     if (theThisInstance.Valid())
         theReturn = IsAscendant(theThisInstance, inInstance,
@@ -214,9 +214,9 @@ bool CSceneViewDropTarget::IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance)
  *	 @param inAsset The Asset to check.
  *	 @return true if we are the same.
  */
-bool CSceneViewDropTarget::IsSelf(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CSceneViewDropTarget::IsSelf(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
-    qt3dsdm::CUICDMInstanceHandle theThisInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theThisInstance = GetInstance();
     return (theThisInstance == inInstance);
 }
 
diff --git a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.h b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.h
index 662b957b..412e510c 100644
--- a/src/Authoring/Studio/DragAndDrop/SceneDropTarget.h
+++ b/src/Authoring/Studio/DragAndDrop/SceneDropTarget.h
@@ -55,10 +55,10 @@ public:
     CSceneViewDropTarget();
     bool Accept(CDropSource &inSource) override;
     bool Drop(CDropSource &inSource) override;
-    qt3dsdm::CUICDMInstanceHandle GetInstance() override;
+    qt3dsdm::Qt3DSDMInstanceHandle GetInstance() override;
 
-    bool IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance) override;
-    bool IsSelf(qt3dsdm::CUICDMInstanceHandle inInstance) override;
+    bool IsRelative(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
+    bool IsSelf(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
     long GetObjectType() override;
     void SetDropSourceObjectType(long inObjType);
     void SetDropTime(long inDropTime);
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
index 4494bfb4..732f1548 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp
@@ -116,7 +116,7 @@ bool CTimeLineDropSource::ValidateTarget(CDropTarget *inTarget)
         (EStudioObjectType)GetObjectType(), (EStudioObjectType)inTarget->GetObjectType());
 
     for (size_t idx = 0, end = m_Instances.size(); idx < end && theValidTarget; ++idx) {
-        qt3dsdm::CUICDMInstanceHandle theHandle(m_Instances[idx]);
+        qt3dsdm::Qt3DSDMInstanceHandle theHandle(m_Instances[idx]);
 
         if (theValidTarget && theHandle.Valid()) {
             theValidTarget &= (!inTarget->IsSelf(theHandle) && !inTarget->IsRelative(theHandle));
@@ -138,13 +138,13 @@ using namespace qt3dsdm;
 using namespace Q3DStudio;
 
 inline void Rearrange(CDoc &inDoc, const qt3dsdm::TInstanceHandleList &inInstances,
-                      CUICDMInstanceHandle inTarget, DocumentEditorInsertType::Enum inInsertType)
+                      Qt3DSDMInstanceHandle inTarget, DocumentEditorInsertType::Enum inInsertType)
 {
     SCOPED_DOCUMENT_EDITOR(inDoc, QObject::tr("Rearrange Object"))
         ->RearrangeObjects(inInstances, inTarget, inInsertType);
 }
 
-CCmd *CTimeLineDropSource::GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+CCmd *CTimeLineDropSource::GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                                 EDROPDESTINATION inDestType,
                                                 qt3dsdm::CUICDMSlideHandle inSlide)
 {
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
index 2763b71f..f4dd2913 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.h
@@ -58,7 +58,7 @@ public:
     bool ValidateTarget(CDropTarget *inTarget) override;
     void InterpretKeyFlags(long inModifyerKeys) override;
 
-    CCmd *GenerateAssetCommand(qt3dsdm::CUICDMInstanceHandle inTarget,
+    CCmd *GenerateAssetCommand(qt3dsdm::Qt3DSDMInstanceHandle inTarget,
                                        EDROPDESTINATION inDestType,
                                        qt3dsdm::CUICDMSlideHandle inSlide) override;
 };
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
index d838f2af..b8465195 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.cpp
@@ -79,7 +79,7 @@ bool CTimeLineDropTarget::Accept(CDropSource &inSource)
  */
 bool CTimeLineDropTarget::Drop(CDropSource &inSource)
 {
-    qt3dsdm::CUICDMInstanceHandle theTargetInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theTargetInstance = GetInstance();
 
     if (theTargetInstance.Valid()) {
         CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
@@ -110,7 +110,7 @@ bool CTimeLineDropTarget::Drop(CDropSource &inSource)
  */
 long CTimeLineDropTarget::GetObjectType()
 {
-    qt3dsdm::CUICDMInstanceHandle theTargetInstance = GetTargetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theTargetInstance = GetTargetInstance();
     if (theTargetInstance.Valid()) {
         CClientDataModelBridge *theBridge =
             g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
@@ -125,10 +125,10 @@ long CTimeLineDropTarget::GetObjectType()
  *		Check to see if the Asset is a relative of our asset.
  * 		@return true if the inAsset is a parent grandparent...etc. of this asset.
  */
-bool CTimeLineDropTarget::IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CTimeLineDropTarget::IsRelative(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     bool theReturn = false; ///< Default return value.
-    qt3dsdm::CUICDMInstanceHandle theThisInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theThisInstance = GetInstance();
 
     // This will check to see if the inAsset is already some sort of parent grandparent....etc.
     if (theThisInstance.Valid())
@@ -144,9 +144,9 @@ bool CTimeLineDropTarget::IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance)
  *	 @param inAsset The Asset to check.
  *	 @return true if we are the same.
  */
-bool CTimeLineDropTarget::IsSelf(qt3dsdm::CUICDMInstanceHandle inInstance)
+bool CTimeLineDropTarget::IsSelf(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
-    qt3dsdm::CUICDMInstanceHandle theThisInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theThisInstance = GetInstance();
     // true if self.....
     return (theThisInstance == inInstance);
 }
@@ -196,9 +196,9 @@ EDROPDESTINATION CTimeLineDropTarget::GetDestination() const
  *of m_Asset
  *	Otherwise, this m_Asset ends up being a sibling
  */
-qt3dsdm::CUICDMInstanceHandle CTimeLineDropTarget::GetTargetInstance()
+qt3dsdm::Qt3DSDMInstanceHandle CTimeLineDropTarget::GetTargetInstance()
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (!theInstance.Valid())
         return 0;
 
diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.h b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.h
index 01dfd15d..6f7f75b5 100644
--- a/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.h
+++ b/src/Authoring/Studio/DragAndDrop/TimelineDropTarget.h
@@ -63,8 +63,8 @@ public:
     bool Drop(CDropSource &inSource) override;
     long GetObjectType() override;
 
-    bool IsRelative(qt3dsdm::CUICDMInstanceHandle inInstance) override;
-    bool IsSelf(qt3dsdm::CUICDMInstanceHandle inInstance) override;
+    bool IsRelative(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
+    bool IsSelf(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
     bool IsMaster() override;
 
     void SetDestination(EDROPDESTINATION inDestination);
@@ -77,7 +77,7 @@ public:
     void SetInsertionMarkerIndent(long inIndent) { m_InsertionMarkedIndent = inIndent; }
 
 protected:
-    qt3dsdm::CUICDMInstanceHandle GetTargetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle GetTargetInstance();
 
 protected:
     EDROPDESTINATION m_Destination;
diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
index f9f468f3..98ceba48 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.cpp
@@ -42,7 +42,7 @@ ActionModel::ActionModel(QObject *parent)
 {
 }
 
-void ActionModel::setInstanceHandle(const qt3dsdm::CUICDMInstanceHandle &handle)
+void ActionModel::setInstanceHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle)
 {
     beginResetModel();
     m_handle = handle;
diff --git a/src/Authoring/Studio/Palettes/Action/ActionModel.h b/src/Authoring/Studio/Palettes/Action/ActionModel.h
index 76318e24..0ec7ae65 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionModel.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionModel.h
@@ -45,7 +45,7 @@ class ActionModel : public QAbstractListModel
 public:
     explicit ActionModel(QObject *parent = nullptr);
 
-    void setInstanceHandle(const qt3dsdm::CUICDMInstanceHandle &handle);
+    void setInstanceHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle);
 
     enum Roles {
         DescriptionRole = Qt::DisplayRole,
@@ -70,7 +70,7 @@ private:
     qt3dsdm::CUICDMSlideHandle activeSlide() const;
     QString actionString(const qt3dsdm::CUICDMActionHandle &action) const;
 
-    qt3dsdm::CUICDMInstanceHandle m_handle;
+    qt3dsdm::Qt3DSDMInstanceHandle m_handle;
     qt3dsdm::TActionHandleList m_actions;
 };
 
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index 54981c25..418c2ec9 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -100,7 +100,7 @@ QSize ActionView::sizeHint() const
     return {500, 500};
 }
 
-void ActionView::setItem(const qt3dsdm::CUICDMInstanceHandle &handle)
+void ActionView::setItem(const qt3dsdm::Qt3DSDMInstanceHandle &handle)
 {
     m_objRefHelper = GetDoc()->GetDataModelObjectReferenceHelper();
     m_itemHandle = handle;
@@ -547,15 +547,15 @@ void ActionView::OnNewPresentation()
 
 void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance;
-    std::vector<qt3dsdm::CUICDMInstanceHandle> instances;
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance;
+    std::vector<qt3dsdm::Qt3DSDMInstanceHandle> instances;
 
     switch (inSelectable.getType()) {
     case Q3DStudio::SelectedValueTypes::Instance:
-        theInstance = inSelectable.getData<qt3dsdm::CUICDMInstanceHandle>();
+        theInstance = inSelectable.getData<qt3dsdm::Qt3DSDMInstanceHandle>();
         break;
     case Q3DStudio::SelectedValueTypes::MultipleInstances:
-        instances = inSelectable.getData<std::vector<qt3dsdm::CUICDMInstanceHandle>>();
+        instances = inSelectable.getData<std::vector<qt3dsdm::Qt3DSDMInstanceHandle>>();
         // handling only if we have one selected element.
         if (instances.size() == 1)
             theInstance = instances[0];
@@ -575,7 +575,7 @@ void ActionView::OnSelectionSet(Q3DStudio::SSelectedValue inSelectable)
     setItem(theInstance);
 }
 
-void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::CUICDMInstanceHandle inOwner)
+void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     CDoc *theDoc = GetDoc();
     qt3dsdm::CStudioSystem *theStudioSystem = theDoc->GetStudioSystem();
@@ -597,7 +597,7 @@ void ActionView::OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CU
     }
 }
 
-void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::CUICDMInstanceHandle inOwner)
+void ActionView::OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide, qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inSlide);
     Q_UNUSED(inOwner);
@@ -617,7 +617,7 @@ void ActionView::OnHandlerArgumentModified(qt3dsdm::CUICDMHandlerArgHandle inHan
     emitActionChanged();
 }
 
-void ActionView::OnInstancePropertyValueChanged(qt3dsdm::CUICDMInstanceHandle inInstance, qt3dsdm::CUICDMPropertyHandle inProperty)
+void ActionView::OnInstancePropertyValueChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     emitActionChanged();
 }
@@ -657,9 +657,9 @@ void ActionView::setTriggerObject(const qt3dsdm::SObjectRefType &object)
     auto theCmd = new CCmdDataModelActionSetTriggerObject(GetDoc(), action, object);
     const SActionInfo &theActionInfo = GetDoc()->GetStudioSystem()->GetActionCore()->GetActionInfo(action);
 
-    CUICDMInstanceHandle theBaseInstance = theActionInfo.m_Owner;
-    CUICDMInstanceHandle theObjectInstance = theBridge->GetInstance(theBaseInstance, object);
-    CUICDMInstanceHandle theOldInstance = theBridge->GetInstance(theBaseInstance, theActionInfo.m_TargetObject);
+    Qt3DSDMInstanceHandle theBaseInstance = theActionInfo.m_Owner;
+    Qt3DSDMInstanceHandle theObjectInstance = theBridge->GetInstance(theBaseInstance, object);
+    Qt3DSDMInstanceHandle theOldInstance = theBridge->GetInstance(theBaseInstance, theActionInfo.m_TargetObject);
     // old instance and object instance could be the same, for example if user changes the type
     // from Absolute to Path. In this case we don't need to reset handler or event.
     if (theOldInstance != theObjectInstance)
@@ -683,9 +683,9 @@ void ActionView::setTargetObject(const qt3dsdm::SObjectRefType &object)
     auto theCmd = new CCmdDataModelActionSetTargetObject(doc, action, object);
     const SActionInfo &theActionInfo = doc->GetStudioSystem()->GetActionCore()->GetActionInfo(action);
 
-    CUICDMInstanceHandle theBaseInstance = theActionInfo.m_Owner;
-    CUICDMInstanceHandle theObjectInstance = theBridge->GetInstance(theBaseInstance, object);
-    CUICDMInstanceHandle theOldInstance = theBridge->GetInstance(theBaseInstance, theActionInfo.m_TargetObject);
+    Qt3DSDMInstanceHandle theBaseInstance = theActionInfo.m_Owner;
+    Qt3DSDMInstanceHandle theObjectInstance = theBridge->GetInstance(theBaseInstance, object);
+    Qt3DSDMInstanceHandle theOldInstance = theBridge->GetInstance(theBaseInstance, theActionInfo.m_TargetObject);
     // old instance and object instance could be the same, for example if user changes the type
     // from Absolute to Path. In this case we don't need to reset handler or event.
     if (theOldInstance != theObjectInstance)
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h
index 91af50e7..1bee92ea 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.h
@@ -100,7 +100,7 @@ public:
 
     QSize sizeHint() const override;
 
-    void setItem(const qt3dsdm::CUICDMInstanceHandle &handle);
+    void setItem(const qt3dsdm::Qt3DSDMInstanceHandle &handle);
     QString itemIcon() const;
     QString itemText() const;
     QColor itemColor() const;
@@ -136,13 +136,13 @@ public:
 
     // Action callback
     void OnActionAdded(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
-                       qt3dsdm::CUICDMInstanceHandle inOwner);
+                       qt3dsdm::Qt3DSDMInstanceHandle inOwner);
     void OnActionDeleted(qt3dsdm::CUICDMActionHandle inAction, qt3dsdm::CUICDMSlideHandle inSlide,
-                         qt3dsdm::CUICDMInstanceHandle inOwner);
+                         qt3dsdm::Qt3DSDMInstanceHandle inOwner);
     void OnActionModified(qt3dsdm::CUICDMActionHandle inAction);
     void OnHandlerArgumentModified(qt3dsdm::CUICDMHandlerArgHandle inHandlerArgument);
-    void OnInstancePropertyValueChanged(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                        qt3dsdm::CUICDMPropertyHandle inProperty);
+    void OnInstancePropertyValueChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                        qt3dsdm::Qt3DSDMPropertyHandle inProperty);
 
 Q_SIGNALS:
     void itemChanged();
@@ -175,7 +175,7 @@ private:
     void initialize();
     QColor m_baseColor = QColor::fromRgb(75, 75, 75);
     QColor m_selectColor = Qt::transparent;
-    qt3dsdm::CUICDMInstanceHandle m_itemHandle;
+    qt3dsdm::Qt3DSDMInstanceHandle m_itemHandle;
     IObjectReferenceHelper *m_objRefHelper = nullptr;
     ActionModel *m_actionsModel = nullptr;
     PropertyModel *m_propertyModel = nullptr;
diff --git a/src/Authoring/Studio/Palettes/Action/PropertyModel.h b/src/Authoring/Studio/Palettes/Action/PropertyModel.h
index 5bf58887..481d2c41 100644
--- a/src/Authoring/Studio/Palettes/Action/PropertyModel.h
+++ b/src/Authoring/Studio/Palettes/Action/PropertyModel.h
@@ -15,7 +15,7 @@ struct PropertyInfo {
     Q_PROPERTY(qt3dsdm::AdditionalMetaDataType::Value additionalType MEMBER m_additionalType CONSTANT FINAL)
     Q_PROPERTY(QStringList possibleValues MEMBER m_possibleValues CONSTANT FINAL)
 
-    qt3dsdm::CUICDMPropertyHandle m_handle;
+    qt3dsdm::Qt3DSDMPropertyHandle m_handle;
     QString m_name;
     QString m_nameId;
     qt3dsdm::DataModelDataType::Value m_type;
diff --git a/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp
index af6ebb89..9020f38d 100644
--- a/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/GuideInspectable.cpp
@@ -318,5 +318,5 @@ void SGuideInspectableImpl::Rollback()
 
 void SGuideInspectableImpl::FireRefresh()
 {
-    m_Editor.FireImmediateRefresh(qt3dsdm::CUICDMInstanceHandle());
+    m_Editor.FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle());
 }
diff --git a/src/Authoring/Studio/Palettes/Inspector/IInspectableItem.h b/src/Authoring/Studio/Palettes/Inspector/IInspectableItem.h
index 227ee98f..b47822dc 100644
--- a/src/Authoring/Studio/Palettes/Inspector/IInspectableItem.h
+++ b/src/Authoring/Studio/Palettes/Inspector/IInspectableItem.h
@@ -77,7 +77,7 @@ public:
 class IInspectableObject
 {
 public:
-    virtual qt3dsdm::CUICDMInstanceHandle GetInspectableBaseInstance() = 0;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInspectableBaseInstance() = 0;
     virtual void SetInspectableObject(const qt3dsdm::SObjectRefType &) = 0;
     virtual qt3dsdm::SObjectRefType GetInspectableObject() = 0;
 };
@@ -85,7 +85,7 @@ public:
 class IInspectableEvent
 {
 public:
-    virtual qt3dsdm::CUICDMInstanceHandle GetInspectableInstance() = 0;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInspectableInstance() = 0;
     virtual qt3dsdm::CUICDMEventHandle GetInspectableEvent() = 0;
     virtual void SetInspectableEvent(const qt3dsdm::CUICDMEventHandle &inEventHandle) = 0;
 };
@@ -156,7 +156,7 @@ class IInspectablePropertyItem : public IInspectableItem
 public:
     EInspectableItemTypes GetInspectableKind() override { return INSPECTABLEITEMTYPE_PROPERTY; }
     virtual void GetInspectablePropertyList(qt3dsdm::TPropertyHandleList &outList) = 0;
-    virtual qt3dsdm::CUICDMInstanceHandle GetInspectableInstance() = 0;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInspectableInstance() = 0;
 };
 
 //==============================================================================
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 60c65e28..d1831960 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -135,7 +135,7 @@ static QStringList renderableItems()
     return renderables;
 }
 
-static std::pair<bool, bool> getSlideCharacteristics(qt3dsdm::CUICDMInstanceHandle instance,
+static std::pair<bool, bool> getSlideCharacteristics(qt3dsdm::Qt3DSDMInstanceHandle instance,
                                                      const qt3dsdm::ISlideCore &slideCore,
                                                      const qt3dsdm::ISlideSystem &slideSystem)
 {
@@ -180,8 +180,8 @@ void InspectorControlModel::setInspectable(CInspectableBase *inInspectable)
     }
 }
 
-void InspectorControlModel::notifyInstancePropertyValue(qt3dsdm::CUICDMInstanceHandle inHandle,
-                                                        qt3dsdm::CUICDMPropertyHandle inProperty)
+void InspectorControlModel::notifyInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inHandle,
+                                                        qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     auto doc = g_StudioApp.GetCore()->GetDoc();
     bool changed = false;
@@ -190,7 +190,7 @@ void InspectorControlModel::notifyInstancePropertyValue(qt3dsdm::CUICDMInstanceH
         for (int p = 0; p < group.controlElements.count(); ++p) {
             QVariant& element = group.controlElements[p];
             InspectorControlBase *property = element.value<InspectorControlBase *>();
-            qt3dsdm::CUICDMInstanceHandle imageInstance;
+            qt3dsdm::Qt3DSDMInstanceHandle imageInstance;
             if (property->m_dataType == qt3dsdm::DataModelDataType::Long4
                 && property->m_property.Valid()) {
                 imageInstance = doc->GetDocumentReader().GetImageInstanceForProperty(
@@ -600,7 +600,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
     case qt3dsdm::DataModelDataType::Long4:
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::Image) {
             qt3dsdm::Option<qt3dsdm::SLong4> guid = qt3dsdm::get<qt3dsdm::SLong4>(value);
-            qt3dsdm::CUICDMInstanceHandle imageInstance = doc->GetDocumentReader()
+            qt3dsdm::Qt3DSDMInstanceHandle imageInstance = doc->GetDocumentReader()
                     .GetInstanceForGuid(guid);
             if (imageInstance.Valid()) {
                 Q3DStudio::CString path = doc->GetDocumentReader().GetSourcePath(imageInstance);
@@ -657,7 +657,7 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
         if (element->m_propertyType == qt3dsdm::AdditionalMetaDataType::ObjectRef) {
             IObjectReferenceHelper *objRefHelper = doc->GetDataModelObjectReferenceHelper();
             if (objRefHelper) {
-                qt3dsdm::CUICDMInstanceHandle refInstance = objRefHelper->Resolve(value, instance);
+                qt3dsdm::Qt3DSDMInstanceHandle refInstance = objRefHelper->Resolve(value, instance);
                 element->m_value = objRefHelper->LookupObjectFormalName(refInstance).toQString();
             }
         }
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
index d7762d34..cec12175 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.h
@@ -84,8 +84,8 @@ public:
     QString m_title;
     QString m_tooltip;
 
-    qt3dsdm::CUICDMInstanceHandle m_instance;
-    qt3dsdm::CUICDMPropertyHandle m_property;
+    qt3dsdm::Qt3DSDMInstanceHandle m_instance;
+    qt3dsdm::Qt3DSDMPropertyHandle m_property;
 
     bool m_animatable  = false;
     bool m_animated = false;
@@ -157,7 +157,7 @@ private:
     void updatePropertyValue(InspectorControlBase *element) const;
     void rebuildTree();
     void refreshTree();
-    void notifyInstancePropertyValue(qt3dsdm::CUICDMInstanceHandle, qt3dsdm::CUICDMPropertyHandle inProperty);
+    void notifyInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void updateAnimateToggleState(InspectorControlBase* inItem);
 
     std::shared_ptr<qt3dsdm::ISignalConnection> m_notifier;
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
index 697a842c..ec7ed844 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
@@ -427,12 +427,12 @@ void InspectorControlView::OnEndDataModelNotifications()
     m_inspectorControlModel->refresh();
 }
 
-void InspectorControlView::OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance)
+void InspectorControlView::OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     m_inspectorControlModel->refresh();
 }
 
-void InspectorControlView::OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance, long inInstanceCount)
+void InspectorControlView::OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance, long inInstanceCount)
 {
     m_inspectorControlModel->refresh();
 }
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
index 0b6b263c..312d78c0 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
@@ -77,8 +77,8 @@ public:
     // IDataModelListener
     void OnBeginDataModelNotifications() override;
     void OnEndDataModelNotifications() override;
-    void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) override;
-    void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    void OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
+    void OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                                     long inInstanceCount) override;
 
 
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.cpp b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.cpp
index 92f3bd36..556c2861 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.cpp
@@ -93,10 +93,10 @@ void ObjectBrowserView::setPathType(ObjectBrowserView::PathType type)
     }
 }
 
-qt3dsdm::CUICDMInstanceHandle ObjectBrowserView::selectedHandle() const
+qt3dsdm::Qt3DSDMInstanceHandle ObjectBrowserView::selectedHandle() const
 {
     auto handleId = m_model->index(m_selection, 0).data(ObjectListModel::HandleRole).toInt();
-    return qt3dsdm::CUICDMInstanceHandle(handleId);
+    return qt3dsdm::Qt3DSDMInstanceHandle(handleId);
 }
 
 void ObjectBrowserView::focusOutEvent(QFocusEvent *event)
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.h b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.h
index f87ea631..17c96884 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.h
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectBrowserView.h
@@ -70,7 +70,7 @@ public:
     PathType pathType() const {return m_pathType;}
     void setPathType(PathType type);
 
-    qt3dsdm::CUICDMInstanceHandle selectedHandle() const;
+    qt3dsdm::Qt3DSDMInstanceHandle selectedHandle() const;
 
 Q_SIGNALS:
     void modelChanged();
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
index c35b1806..84075a5e 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.cpp
@@ -42,7 +42,7 @@
 #include <QColor>
 
 ObjectListModel::ObjectListModel(CCore *core,
-                                 const qt3dsdm::CUICDMInstanceHandle &baseHandle, QObject *parent)
+                                 const qt3dsdm::Qt3DSDMInstanceHandle &baseHandle, QObject *parent)
     : QAbstractItemModel(parent)
     , m_core(core)
     , m_baseHandle(baseHandle)
@@ -141,12 +141,12 @@ QModelIndex ObjectListModel::parent(const QModelIndex &index) const
         return {};
 
     const auto handle = handleForIndex(index);
-    qt3dsdm::CUICDMInstanceHandle parentHandle = m_core->GetDoc()->GetAssetGraph()->GetParent(handle);
+    qt3dsdm::Qt3DSDMInstanceHandle parentHandle = m_core->GetDoc()->GetAssetGraph()->GetParent(handle);
     if (!parentHandle.Valid())
         return {};
 
     int row = 0;
-    qt3dsdm::CUICDMInstanceHandle grandParentHandle = m_core->GetDoc()->GetAssetGraph()
+    qt3dsdm::Qt3DSDMInstanceHandle grandParentHandle = m_core->GetDoc()->GetAssetGraph()
             ->GetParent(handle);
     const auto children = childrenList(m_slideHandle, grandParentHandle);
     const auto it = std::find(children.begin(), children.end(), parentHandle);
@@ -156,12 +156,12 @@ QModelIndex ObjectListModel::parent(const QModelIndex &index) const
     return createIndex(row, 0, (quintptr)(parentHandle));
 }
 
-qt3dsdm::CUICDMInstanceHandle ObjectListModel::handleForIndex(const QModelIndex &index) const
+qt3dsdm::Qt3DSDMInstanceHandle ObjectListModel::handleForIndex(const QModelIndex &index) const
 {
-    return static_cast<qt3dsdm::CUICDMInstanceHandle>(index.internalId());
+    return static_cast<qt3dsdm::Qt3DSDMInstanceHandle>(index.internalId());
 }
 
-qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle, const qt3dsdm::CUICDMInstanceHandle &handle) const
+qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle, const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
 {
     auto slideSystem = m_core->GetDoc()->GetStudioSystem()->GetSlideSystem();
     auto currentMaster = slideSystem->GetMasterSlide(slideHandle);
@@ -170,7 +170,7 @@ qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDM
     m_objRefHelper->GetChildInstanceList(handle, children, slideHandle, m_baseHandle);
     children.erase(
     std::remove_if(children.begin(), children.end(),
-                   [&slideHandle, slideSystem, &currentMaster](const qt3dsdm::CUICDMInstanceHandle &h) {
+                   [&slideHandle, slideSystem, &currentMaster](const qt3dsdm::Qt3DSDMInstanceHandle &h) {
                         const auto childSlide = slideSystem->GetAssociatedSlide(h);
                         if (!childSlide.Valid())
                             return true;
@@ -184,13 +184,13 @@ qt3dsdm::TInstanceHandleList ObjectListModel::childrenList(const qt3dsdm::CUICDM
     return children;
 }
 
-QString ObjectListModel::nameForHandle(const qt3dsdm::CUICDMInstanceHandle &handle) const
+QString ObjectListModel::nameForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle) const
 {
     const auto data = m_objRefHelper->GetInfo(handle);
     return data.m_Name.toQString();
 }
 
-QModelIndex ObjectListModel::indexForHandle(const qt3dsdm::CUICDMInstanceHandle &handle,
+QModelIndex ObjectListModel::indexForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle,
                                             const QModelIndex &startIndex) const
 {
     if (handle == m_baseHandle)
@@ -198,7 +198,7 @@ QModelIndex ObjectListModel::indexForHandle(const qt3dsdm::CUICDMInstanceHandle
 
     for (int i = 0; i < rowCount(startIndex); i++) {
         auto idx = index(i, 0, startIndex);
-        if (static_cast<qt3dsdm::CUICDMInstanceHandle>(idx.internalId()) == handle)
+        if (static_cast<qt3dsdm::Qt3DSDMInstanceHandle>(idx.internalId()) == handle)
             return idx;
         if (rowCount(idx) > 0)
             return indexForHandle(handle, idx);
diff --git a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
index 106dea07..18d84913 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
+++ b/src/Authoring/Studio/Palettes/Inspector/ObjectListModel.h
@@ -41,7 +41,7 @@ class ObjectListModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    ObjectListModel(CCore *core, const qt3dsdm::CUICDMInstanceHandle &baseHandle, QObject *parent = nullptr);
+    ObjectListModel(CCore *core, const qt3dsdm::Qt3DSDMInstanceHandle &baseHandle, QObject *parent = nullptr);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     int columnCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -61,21 +61,21 @@ public:
 
     QHash<int, QByteArray> roleNames() const override;
 
-    qt3dsdm::CUICDMInstanceHandle baseHandle() const {return m_baseHandle;}
+    qt3dsdm::Qt3DSDMInstanceHandle baseHandle() const {return m_baseHandle;}
 
 private:
-    qt3dsdm::CUICDMInstanceHandle handleForIndex(const QModelIndex &index) const;
+    qt3dsdm::Qt3DSDMInstanceHandle handleForIndex(const QModelIndex &index) const;
 
     qt3dsdm::TInstanceHandleList childrenList(const qt3dsdm::CUICDMSlideHandle &slideHandle,
-                                                    const qt3dsdm::CUICDMInstanceHandle &handle) const;
+                                                    const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
 
-    QString nameForHandle(const qt3dsdm::CUICDMInstanceHandle &handle) const;
+    QString nameForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle) const;
 
-    QModelIndex indexForHandle(const qt3dsdm::CUICDMInstanceHandle &handle, const QModelIndex &startIndex = {}) const;
+    QModelIndex indexForHandle(const qt3dsdm::Qt3DSDMInstanceHandle &handle, const QModelIndex &startIndex = {}) const;
 
     CCore *m_core;
     qt3dsdm::CUICDMSlideHandle m_slideHandle;
-    qt3dsdm::CUICDMInstanceHandle m_baseHandle;
+    qt3dsdm::Qt3DSDMInstanceHandle m_baseHandle;
     IObjectReferenceHelper *m_objRefHelper;
 };
 
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.cpp
index b87d9c99..41b74318 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.cpp
@@ -60,8 +60,8 @@ using namespace qt3dsdm;
  *	Constructor
  */
 CUICDMInspectable::CUICDMInspectable(CStudioApp &inApp, CCore *inCore,
-                                     qt3dsdm::CUICDMInstanceHandle inInstance,
-                                     qt3dsdm::CUICDMInstanceHandle inDualPersonalityInstance /*= 0*/)
+                                     qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                     qt3dsdm::Qt3DSDMInstanceHandle inDualPersonalityInstance /*= 0*/)
     : CInspectableBase(inCore)
     , m_Instance(inInstance)
     , m_DualPersonalityInstance((inDualPersonalityInstance != 0) ? inDualPersonalityInstance
@@ -211,7 +211,7 @@ Q3DStudio::CString CUICDMInspectable::GetGroupName(long inGroupIndex)
 /**
  *	Return the Inspectable Instance Handle for the Group, given the group index
  */
-CUICDMInstanceHandle CUICDMInspectable::GetGroupInstance(long inGroupIndex)
+Qt3DSDMInstanceHandle CUICDMInspectable::GetGroupInstance(long inGroupIndex)
 {
     Q_UNUSED(inGroupIndex);
     return m_DualPersonalityInstance;
@@ -229,7 +229,7 @@ EStudioObjectType CUICDMInspectable::GetObjectType()
             CDoc *theDoc = m_Core->GetDoc();
             CClientDataModelBridge *theBridge =
                 theDoc->GetStudioSystem()->GetClientDataModelBridge();
-            qt3dsdm::CUICDMInstanceHandle theInstance =
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance =
                 theBridge->GetOwningComponentInstance(theDoc->GetActiveSlide());
             Option<TCharStr> theObjTypeName = theMetaData.GetTypeForInstance(theInstance);
             if (theObjTypeName.hasValue()) {
@@ -307,7 +307,7 @@ bool CUICDMInspectable::IsMaster()
 //	{
 //		IPropertySystem* thePropertySystem = m_Core->GetDoc( )->GetStudioSystem(
 //)->GetPropertySystem( );
-//		CUICDMPropertyHandle theProperty =
+//		Qt3DSDMPropertyHandle theProperty =
 //thePropertySystem->GetAggregateInstancePropertyByName( m_Instance, L"type" );
 //		SValue theTypeValue;
 //		if ( theProperty && thePropertySystem->GetInstancePropertyValue( m_Instance,
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.h b/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.h
index 34bf543b..1a7dd24b 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMInspectable.h
@@ -51,13 +51,13 @@
 class CUICDMInspectable : public CInspectableBase
 {
 protected: // Fields
-    qt3dsdm::CUICDMInstanceHandle m_Instance;
-    qt3dsdm::CUICDMInstanceHandle m_DualPersonalityInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_Instance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_DualPersonalityInstance;
     CStudioApp &m_App;
 
 public: // Constructor
-    CUICDMInspectable(CStudioApp &inApp, CCore *inCore, qt3dsdm::CUICDMInstanceHandle inInstance,
-                      qt3dsdm::CUICDMInstanceHandle inDualPersonalityInstance = 0);
+    CUICDMInspectable(CStudioApp &inApp, CCore *inCore, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                      qt3dsdm::Qt3DSDMInstanceHandle inDualPersonalityInstance = 0);
 
 public: // CInspectableBase
     Q3DStudio::CString GetName() override;
@@ -68,7 +68,7 @@ public: // CInspectableBase
     bool IsValid() const override;
     bool IsMaster() override;
     virtual qt3dsdm::TMetaDataPropertyHandleList GetGroupProperties(long inGroupIndex);
-    virtual qt3dsdm::CUICDMInstanceHandle GetGroupInstance(long inGroupIndex);
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetGroupInstance(long inGroupIndex);
 
 protected:
     virtual Q3DStudio::CString GetGroupName(long inGroupIndex);
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.cpp
index bddc0906..e19eebd4 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.cpp
@@ -55,13 +55,13 @@ struct SMaterialTypeDropDown : public CGenericComboDropDown
         Q3DStudio::CString m_RelativePath;
         bool operator<(const SMaterialEntry &inOther) const { return m_Name < inOther.m_Name; }
     };
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     Q3DStudio::CAutoMemPtr<CGenericEditCommitListener> m_CommitListener;
     vector<SMaterialEntry> m_Materials;
     CDoc &m_Doc;
     TSignalConnectionPtr m_FileListPtr;
 
-    SMaterialTypeDropDown(CDoc &inDoc, CUICDMInstanceHandle inInstance)
+    SMaterialTypeDropDown(CDoc &inDoc, Qt3DSDMInstanceHandle inInstance)
         : m_Instance(inInstance)
         , m_Doc(inDoc)
     {
@@ -154,7 +154,7 @@ struct SMaterialTypeDropDown : public CGenericComboDropDown
     // Note that the this object is probably deleted when this happens or will be during its
     // execution.
     static void DoChangeObjectType(CDoc *inDoc, const Q3DStudio::CString &inNewType,
-                                   CUICDMInstanceHandle instance)
+                                   Qt3DSDMInstanceHandle instance)
     {
         using namespace Q3DStudio;
         SCOPED_DOCUMENT_EDITOR(*inDoc, QObject::tr("Set Property"))->SetMaterialType(instance, inNewType);
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.h b/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.h
index 119ace54..03d955a3 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMMaterialInspectable.h
@@ -49,7 +49,7 @@ class CUICDMMaterialInspectable : public CUICDMInspectable
 {
 public:
     CUICDMMaterialInspectable(CStudioApp &inApp, CCore *inCore,
-                              qt3dsdm::CUICDMInstanceHandle inInstance)
+                              qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         : CUICDMInspectable(inApp, inCore, inInstance)
     {
     }
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.cpp
index e9ec06fc..96a82925 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.cpp
@@ -43,8 +43,8 @@
 #include "UICDMStudioSystem.h"
 
 CUICDMSceneInspectable::CUICDMSceneInspectable(
-    CStudioApp &inApp, CCore *inCore, qt3dsdm::CUICDMInstanceHandle inInstance,
-    qt3dsdm::CUICDMInstanceHandle inCurrentActiveSlideInstance)
+    CStudioApp &inApp, CCore *inCore, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+    qt3dsdm::Qt3DSDMInstanceHandle inCurrentActiveSlideInstance)
     : CUICDMInspectable(inApp, inCore, inInstance)
     , m_CurrentActiveSlideInstance(inCurrentActiveSlideInstance)
 {
@@ -71,7 +71,7 @@ Q3DStudio::CString CUICDMSceneInspectable::GetGroupName(long inGroupIndex)
                                : ::LoadResourceString(IDS_PROPERTIES_SHARED);
 }
 
-qt3dsdm::CUICDMInstanceHandle CUICDMSceneInspectable::GetGroupInstance(long inGroupIndex)
+qt3dsdm::Qt3DSDMInstanceHandle CUICDMSceneInspectable::GetGroupInstance(long inGroupIndex)
 {
     return (inGroupIndex == 0) ? m_CurrentActiveSlideInstance : m_Instance;
 }
diff --git a/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.h b/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.h
index 55af3f4d..9b79c929 100644
--- a/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/UICDMSceneInspectable.h
@@ -49,8 +49,8 @@
 class CUICDMSceneInspectable : public CUICDMInspectable
 {
 public:
-    CUICDMSceneInspectable(CStudioApp &inApp, CCore *inCore, qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMInstanceHandle inCurrentActiveSlideInstance);
+    CUICDMSceneInspectable(CStudioApp &inApp, CCore *inCore, qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMInstanceHandle inCurrentActiveSlideInstance);
 
     bool IsValid() const override;
     // CUICDMInspectable
@@ -58,9 +58,9 @@ public:
 
 protected:
     inline Q3DStudio::CString GetGroupName(long inGroupIndex) override;
-    inline qt3dsdm::CUICDMInstanceHandle GetGroupInstance(long inGroupIndex) override;
+    inline qt3dsdm::Qt3DSDMInstanceHandle GetGroupInstance(long inGroupIndex) override;
 
-    qt3dsdm::CUICDMInstanceHandle m_CurrentActiveSlideInstance;
+    qt3dsdm::Qt3DSDMInstanceHandle m_CurrentActiveSlideInstance;
 };
 
 #endif
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
index 6e53166e..d7377247 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
@@ -150,12 +150,12 @@ void ProjectView::OnEndDataModelNotifications()
     m_ProjectModel->updateReferences(true);
 }
 
-void ProjectView::OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance)
+void ProjectView::OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     Q_UNUSED(inInstance);
 }
 
-void ProjectView::OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance, long inInstanceCount)
+void ProjectView::OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance, long inInstanceCount)
 {
     Q_UNUSED(inInstance);
     Q_UNUSED(inInstanceCount);
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.h b/src/Authoring/Studio/Palettes/Project/ProjectView.h
index 61e585ba..3679637e 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.h
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.h
@@ -79,8 +79,8 @@ public:
     // These are used during drag operations or during operations which
     // require immediate user feedback.  So they are unimplemented, effectively,
     // we ignore them.
-    void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) override;
-    void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    void OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
+    void OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                                     long inInstanceCount) override;
 
 Q_SIGNALS:
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index e02e31d9..3f0665e5 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -82,7 +82,7 @@ void SlideView::setShowMasterSlide(bool show)
 
     // We need to get the first slide in the correct master mode
     CDoc *theDoc = GetDoc();
-    qt3dsdm::CUICDMInstanceHandle theRoot = theDoc->GetActiveRootInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theRoot = theDoc->GetActiveRootInstance();
     CClientDataModelBridge *theBridge = GetBridge();
     qt3dsdm::CUICDMSlideHandle theNewActiveSlide =
         theBridge->GetOrCreateGraphRoot(theRoot); // this will return the master slide
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h
index cf58b21e..e7da6d19 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h
@@ -106,7 +106,7 @@ private:
     // state.
     TIntIntMap m_MasterSlideReturnPointers;
 
-    qt3dsdm::CUICDMInstanceHandle m_ActiveRoot; ///< the object containing the slides to be inspected.
+    qt3dsdm::Qt3DSDMInstanceHandle m_ActiveRoot; ///< the object containing the slides to be inspected.
     qt3dsdm::CUICDMSlideHandle m_ActiveSlideHandle; ///< the active slide handle
 };
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
index 1e419768..9c5a435c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.cpp
@@ -45,7 +45,7 @@
 using namespace qt3dsdm;
 
 CBehaviorTimelineItemBinding::CBehaviorTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                           CUICDMInstanceHandle inDataHandle)
+                                                           Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
index c7ea831c..2de74f3e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
@@ -50,7 +50,7 @@ class CBehaviorTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public:
     CBehaviorTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                 qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                                 qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     ~CBehaviorTimelineItemBinding() {}
 
     // CUICDMTimelineItemBinding
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
index de00a850..dfe055b4 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.cpp
@@ -55,7 +55,7 @@
 using namespace qt3dsdm;
 
 CGroupTimelineItemBinding::CGroupTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                     CUICDMInstanceHandle inDataHandle)
+                                                     Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
 }
@@ -71,7 +71,7 @@ bool CGroupTimelineItemBinding::OpenAssociatedEditor()
     if (GetObjectType() == OBJTYPE_COMPONENT) {
         ISlideSystem *theSlideSystem = m_StudioSystem->GetSlideSystem();
 
-        qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
         Q3DStudio::CId theId = m_StudioSystem->GetClientDataModelBridge()->GetGUID(theInstance);
         qt3dsdm::CUICDMSlideHandle theMasterSlide =
             theSlideSystem->GetMasterSlideByComponentGuid(GuidtoSLong4(theId));
@@ -94,7 +94,7 @@ bool CGroupTimelineItemBinding::OpenAssociatedEditor()
 bool CGroupTimelineItemBinding::IsImported() const
 {
 
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     qt3dsdm::IPropertySystem *thePropertySystem =
         m_TransMgr->GetDoc()->GetStudioSystem()->GetPropertySystem();
     qt3dsdm::SValue theValue;
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
index b4a216a4..b15cd73e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
@@ -52,7 +52,7 @@ class CGroupTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public:
     CGroupTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                              qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                              qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     ~CGroupTimelineItemBinding() {}
 
     // CUICDMTimelineItemBinding
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
index 26b9ec3e..6962b912 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.cpp
@@ -46,7 +46,7 @@
 using namespace qt3dsdm;
 
 CImageTimelineItemBinding::CImageTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                     CUICDMInstanceHandle inDataHandle)
+                                                     Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
index 37450a5b..9804df2b 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
@@ -52,7 +52,7 @@ class CImageTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public:
     CImageTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                              qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                              qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     virtual ~CImageTimelineItemBinding();
 
     // CUICDMTimelineItemBinding
@@ -64,15 +64,15 @@ public:
     void Bind(CBaseStateRow *inRow) override;
     bool OpenAssociatedEditor() override;
 
-    void SetPropertyHandle(qt3dsdm::CUICDMPropertyHandle inProperty)
+    void SetPropertyHandle(qt3dsdm::Qt3DSDMPropertyHandle inProperty)
     {
         m_PropertyHandle = inProperty;
     }
-    qt3dsdm::CUICDMPropertyHandle GetPropertyHandle() const { return m_PropertyHandle; }
+    qt3dsdm::Qt3DSDMPropertyHandle GetPropertyHandle() const { return m_PropertyHandle; }
 
 protected:
     Q3DStudio::CString m_Name;
-    qt3dsdm::CUICDMPropertyHandle m_PropertyHandle;
+    qt3dsdm::Qt3DSDMPropertyHandle m_PropertyHandle;
 };
 
 #endif // INCLUDED_IMAGE_TIMELINEITEM_BINDING_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
index 8a7c5aa7..70c8a289 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
@@ -117,7 +117,7 @@ bool CKeyframesManager::CanPerformKeyframeCopy()
 bool CKeyframesManager::CanPerformKeyframePaste()
 {
     if (m_PasteKeyframeCommandHelper && m_PasteKeyframeCommandHelper->HasCopiedKeyframes()) {
-        qt3dsdm::CUICDMInstanceHandle theSelectedInstance =
+        qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance =
             g_StudioApp.GetCore()->GetDoc()->GetSelectedInstance();
         if (theSelectedInstance.Valid()) {
             return true;
@@ -184,7 +184,7 @@ void CKeyframesManager::PasteKeyframes()
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
 
     if (m_PasteKeyframeCommandHelper && m_PasteKeyframeCommandHelper->HasCopiedKeyframes()) {
-        qt3dsdm::CUICDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
         if (theSelectedInstance.Valid()) {
             long theCurrentViewTimeInMilliseconds = theDoc->GetCurrentViewTime();
             CCmdDataModelInsertKeyframe *theInsertKeyframesCommand =
@@ -276,7 +276,7 @@ void CKeyframesManager::SetChangedKeyframes()
 {
 
     CDoc *theDoc = g_StudioApp.GetCore()->GetDoc();
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
     if (theSelectedInstance.Valid()) {
         using namespace Q3DStudio;
         Q3DStudio::ScopedDocumentEditor editor(*theDoc, L"Set Changed Keyframes", __FILE__,
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.h
index c5da47ae..304ed51a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.h
@@ -102,7 +102,7 @@ protected:
     COffsetKeyframesCommandHelper m_OffsetKeyframeCommandHelper; // so that we can commit on mouseup
     CPasteKeyframeCommandHelper *m_PasteKeyframeCommandHelper;
     std::set<CUICDMTimelineItemBinding *> m_InstanceSet;
-    std::vector<qt3dsdm::CUICDMInstanceHandle> m_InstanceList;
+    std::vector<qt3dsdm::Qt3DSDMInstanceHandle> m_InstanceList;
 };
 
 #endif // INCLUDED_IKEYFRAMES_MANAGER_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
index a8e2a941..51440999 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
@@ -60,10 +60,10 @@ using namespace qt3dsdm;
 
 namespace {
 
-bool ImageSlotIsFilled(qt3dsdm::IPropertySystem *inPropertySystem, CUICDMInstanceHandle inInstance,
+bool ImageSlotIsFilled(qt3dsdm::IPropertySystem *inPropertySystem, Qt3DSDMInstanceHandle inInstance,
                        const TCharStr &inStr)
 {
-    CUICDMPropertyHandle theProperty =
+    Qt3DSDMPropertyHandle theProperty =
         inPropertySystem->GetAggregateInstancePropertyByName(inInstance, inStr);
     SValue theValue;
     inPropertySystem->GetInstancePropertyValue(inInstance, theProperty, theValue);
@@ -77,7 +77,7 @@ bool ImageSlotIsFilled(qt3dsdm::IPropertySystem *inPropertySystem, CUICDMInstanc
 
 // helper function to find the image binding class that 'represents' this property
 inline CImageTimelineItemBinding *FindImageBindingByProperty(CBaseStateRow *inRow,
-                                                             CUICDMPropertyHandle inProperty)
+                                                             Qt3DSDMPropertyHandle inProperty)
 {
     if (!inRow || !inProperty.Valid())
         return nullptr;
@@ -96,7 +96,7 @@ inline CImageTimelineItemBinding *FindImageBindingByProperty(CBaseStateRow *inRo
 }
 
 CLayerTimelineItemBinding::CLayerTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                     qt3dsdm::CUICDMInstanceHandle inDataHandle)
+                                                     qt3dsdm::Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
@@ -105,7 +105,7 @@ CLayerTimelineItemBinding::CLayerTimelineItemBinding(CTimelineTranslationManager
 
     size_t thePropertyCount = theProperties.size();
     for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount; ++thePropertyIndex) {
-        CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+        Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
 
         AdditionalMetaDataType::Value theAdditionalMetaDataType =
             thePropertySystem->GetAdditionalMetaDataType(inDataHandle, theProperty);
@@ -134,7 +134,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
     static const TCharStr theLayerPrefix(L"Layer_");
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
 
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
         CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
@@ -142,7 +142,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
 
-        qt3dsdm::CUICDMInstanceHandle theChildInstance = theChildren.GetCurrent();
+        qt3dsdm::Qt3DSDMInstanceHandle theChildInstance = theChildren.GetCurrent();
         if (theChildInstance.Valid()) {
             std::shared_ptr<IDataCore> theDataCore =
                 m_TransMgr->GetStudioSystem()->GetFullSystem()->GetCoreSystem()->GetDataCore();
@@ -156,7 +156,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                     m_TransMgr->GetStudioSystem()->GetPropertySystem();
                 qt3dsdm::SLong4 theGuid;
                 {
-                    CUICDMPropertyHandle theTypeProperty =
+                    Qt3DSDMPropertyHandle theTypeProperty =
                         thePropertySystem->GetAggregateInstancePropertyByName(theChildInstance,
                                                                               L"id");
                     SValue theIdValue;
@@ -167,7 +167,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                 for (size_t theSlotIndex = 0, theSlotCount = m_ImageNameFormalNamePairs.size();
                      theSlotIndex < theSlotCount; ++theSlotIndex) {
                     bool theIsMatch = false;
-                    qt3dsdm::CUICDMPropertyHandle theProperty =
+                    qt3dsdm::Qt3DSDMPropertyHandle theProperty =
                         std::get<2>(m_ImageNameFormalNamePairs[theSlotIndex]);
                     SValue theValue;
                     const SUICDMPropertyDefinition &theDefinition(
@@ -198,7 +198,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                 }
             }
             if (theSlotCursor != (size_t)-1) {
-                CUICDMPropertyHandle theImageProperty =
+                Qt3DSDMPropertyHandle theImageProperty =
                     thePropertySystem->GetAggregateInstancePropertyByName(
                         m_DataHandle, std::get<0>(m_ImageNameFormalNamePairs[theSlotCursor]));
                 return GetOrCreateImageBinding(
@@ -211,7 +211,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
     return nullptr;
 }
 
-void CLayerTimelineItemBinding::OnAddChild(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CLayerTimelineItemBinding::OnAddChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace qt3dsdm;
     CClientDataModelBridge *theBridge = m_TransMgr->GetStudioSystem()->GetClientDataModelBridge();
@@ -222,7 +222,7 @@ void CLayerTimelineItemBinding::OnAddChild(qt3dsdm::CUICDMInstanceHandle inInsta
         CUICDMTimelineItemBinding::OnAddChild(inInstance);
 }
 
-void CLayerTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropertyHandle)
+void CLayerTimelineItemBinding::OnPropertyChanged(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     bool theHandled = false;
     if (m_Row) {
@@ -254,7 +254,7 @@ void CLayerTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropert
                         qt3dsdm::TCharStr theTempName =
                             std::get<0>(m_ImageNameFormalNamePairs[theNextImage]);
                         if (ImageSlotIsFilled(thePropertySystem, m_DataHandle, theTempName)) {
-                            CUICDMPropertyHandle theNextImageProperty =
+                            Qt3DSDMPropertyHandle theNextImageProperty =
                                 theBridge->GetAggregateInstancePropertyByName(m_DataHandle,
                                                                               theTempName);
                             theNextImageBinding =
@@ -286,8 +286,8 @@ void CLayerTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropert
         CUICDMTimelineItemBinding::OnPropertyChanged(inPropertyHandle);
 }
 
-qt3dsdm::CUICDMInstanceHandle
-CLayerTimelineItemBinding::GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyHandle)
+qt3dsdm::Qt3DSDMInstanceHandle
+CLayerTimelineItemBinding::GetImage(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
     SValue theImageValue;
@@ -298,10 +298,10 @@ CLayerTimelineItemBinding::GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyHand
 }
 
 ITimelineItemBinding *
-CLayerTimelineItemBinding::GetOrCreateImageBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+CLayerTimelineItemBinding::GetOrCreateImageBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                                    const wchar_t *inName)
 {
-    qt3dsdm::CUICDMInstanceHandle theImageInstance = GetImage(inPropertyHandle);
+    qt3dsdm::Qt3DSDMInstanceHandle theImageInstance = GetImage(inPropertyHandle);
     ITimelineItemBinding *theImageTimelineRow = m_TransMgr->GetBinding(theImageInstance);
     if (!theImageTimelineRow) // create
     {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
index 4770df97..9748dc4a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
@@ -48,7 +48,7 @@ class CStudioSystem;
 class CLayerTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public: // Types
-    typedef std::tuple<qt3dsdm::TCharStr, qt3dsdm::TCharStr, qt3dsdm::CUICDMPropertyHandle>
+    typedef std::tuple<qt3dsdm::TCharStr, qt3dsdm::TCharStr, qt3dsdm::Qt3DSDMPropertyHandle>
         TNameFormalNamePair;
     typedef std::vector<TNameFormalNamePair> TNameFormalNamePairList;
 
@@ -57,20 +57,20 @@ protected: // Members
 
 public: // Construction
     CLayerTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                              qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                              qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     virtual ~CLayerTimelineItemBinding();
 
 public: // CUICDMTimelineItemBinding
     EStudioObjectType GetObjectType() const override;
     // Hierarchy
     ITimelineItemBinding *GetChild(long inIndex) override;
-    void OnAddChild(qt3dsdm::CUICDMInstanceHandle inInstance) override;
+    void OnAddChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
     // Event callback
-    void OnPropertyChanged(qt3dsdm::CUICDMPropertyHandle inPropertyHandle) override;
+    void OnPropertyChanged(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle) override;
 
 protected:
-    qt3dsdm::CUICDMInstanceHandle GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
-    ITimelineItemBinding *GetOrCreateImageBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+    qt3dsdm::Qt3DSDMInstanceHandle GetImage(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
+    ITimelineItemBinding *GetOrCreateImageBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                                   const wchar_t *inName);
 };
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
index 95933144..dad8313c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.cpp
@@ -57,7 +57,7 @@
 using namespace qt3dsdm;
 
 CMaterialTimelineItemBinding::CMaterialTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                           CUICDMInstanceHandle inDataHandle)
+                                                           Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
@@ -66,7 +66,7 @@ CMaterialTimelineItemBinding::CMaterialTimelineItemBinding(CTimelineTranslationM
 
     size_t thePropertyCount = theProperties.size();
     for (size_t thePropertyIndex = 0; thePropertyIndex < thePropertyCount; ++thePropertyIndex) {
-        CUICDMPropertyHandle theProperty = theProperties[thePropertyIndex];
+        Qt3DSDMPropertyHandle theProperty = theProperties[thePropertyIndex];
 
         AdditionalMetaDataType::Value theAdditionalMetaDataType =
             thePropertySystem->GetAdditionalMetaDataType(inDataHandle, theProperty);
@@ -100,10 +100,10 @@ bool CMaterialTimelineItemBinding::ShowToggleControls() const
     return false;
 }
 
-bool ImageSlotIsFilled(qt3dsdm::IPropertySystem *inPropertySystem, CUICDMInstanceHandle inInstance,
+bool ImageSlotIsFilled(qt3dsdm::IPropertySystem *inPropertySystem, Qt3DSDMInstanceHandle inInstance,
                        const TCharStr &inStr)
 {
-    CUICDMPropertyHandle theProperty =
+    Qt3DSDMPropertyHandle theProperty =
         inPropertySystem->GetAggregateInstancePropertyByName(inInstance, inStr);
     SValue theValue;
     inPropertySystem->GetInstancePropertyValue(inInstance, theProperty, theValue);
@@ -154,13 +154,13 @@ ITimelineItemBinding *CMaterialTimelineItemBinding::GetChild(long inIndex)
             }
         }
     }
-    CUICDMPropertyHandle theImageProperty = thePropertySystem->GetAggregateInstancePropertyByName(
+    Qt3DSDMPropertyHandle theImageProperty = thePropertySystem->GetAggregateInstancePropertyByName(
         m_DataHandle, std::get<0>(m_ImageNameFormalNamePairs[theSlotCursor]));
     return GetOrCreateImageBinding(
         theImageProperty, std::get<1>(m_ImageNameFormalNamePairs[theSlotCursor]).wide_str());
 }
 
-void CMaterialTimelineItemBinding::OnAddChild(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CMaterialTimelineItemBinding::OnAddChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace qt3dsdm;
     CClientDataModelBridge *theBridge = m_TransMgr->GetStudioSystem()->GetClientDataModelBridge();
@@ -173,7 +173,7 @@ void CMaterialTimelineItemBinding::OnAddChild(qt3dsdm::CUICDMInstanceHandle inIn
 
 // helper function to find the image binding class that 'represents' this property
 inline CImageTimelineItemBinding *FindImageBindingByProperty(CBaseStateRow *inRow,
-                                                             CUICDMPropertyHandle inProperty)
+                                                             Qt3DSDMPropertyHandle inProperty)
 {
     if (!inRow || !inProperty.Valid())
         return nullptr;
@@ -190,7 +190,7 @@ inline CImageTimelineItemBinding *FindImageBindingByProperty(CBaseStateRow *inRo
     return theInvalidImageBinding;
 }
 
-void CMaterialTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropertyHandle)
+void CMaterialTimelineItemBinding::OnPropertyChanged(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     bool theHandled = false;
     if (m_Row) {
@@ -222,7 +222,7 @@ void CMaterialTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inProp
                         qt3dsdm::TCharStr theTempName =
                             std::get<0>(m_ImageNameFormalNamePairs[theNextImage]);
                         if (ImageSlotIsFilled(thePropertySystem, m_DataHandle, theTempName)) {
-                            CUICDMPropertyHandle theNextImageProperty =
+                            Qt3DSDMPropertyHandle theNextImageProperty =
                                 theBridge->GetAggregateInstancePropertyByName(m_DataHandle,
                                                                               theTempName);
                             theNextImageBinding =
@@ -254,7 +254,7 @@ void CMaterialTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inProp
         CUICDMTimelineItemBinding::OnPropertyChanged(inPropertyHandle);
 }
 
-void CMaterialTimelineItemBinding::OnPropertyLinked(CUICDMPropertyHandle inPropertyHandle)
+void CMaterialTimelineItemBinding::OnPropertyLinked(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     bool theHandled = false;
     if (m_Row) {
@@ -281,7 +281,7 @@ void CMaterialTimelineItemBinding::OnPropertyLinked(CUICDMPropertyHandle inPrope
                         qt3dsdm::TCharStr theTempName =
                             std::get<0>(m_ImageNameFormalNamePairs[theNextImage]);
                         if (ImageSlotIsFilled(thePropertySystem, m_DataHandle, theTempName)) {
-                            CUICDMPropertyHandle theNextImageProperty =
+                            Qt3DSDMPropertyHandle theNextImageProperty =
                                 theBridge->GetAggregateInstancePropertyByName(m_DataHandle,
                                                                               theTempName);
                             theNextImageBinding =
@@ -305,8 +305,8 @@ void CMaterialTimelineItemBinding::OnPropertyLinked(CUICDMPropertyHandle inPrope
         CUICDMTimelineItemBinding::OnPropertyLinked(inPropertyHandle);
 }
 
-qt3dsdm::CUICDMInstanceHandle
-CMaterialTimelineItemBinding::GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyHandle)
+qt3dsdm::Qt3DSDMInstanceHandle
+CMaterialTimelineItemBinding::GetImage(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle)
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
     SValue theImageValue;
@@ -317,10 +317,10 @@ CMaterialTimelineItemBinding::GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyH
 }
 
 ITimelineItemBinding *
-CMaterialTimelineItemBinding::GetOrCreateImageBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+CMaterialTimelineItemBinding::GetOrCreateImageBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                                       const wchar_t *inName)
 {
-    qt3dsdm::CUICDMInstanceHandle theImageInstance = GetImage(inPropertyHandle);
+    qt3dsdm::Qt3DSDMInstanceHandle theImageInstance = GetImage(inPropertyHandle);
     ITimelineItemBinding *theImageTimelineRow = m_TransMgr->GetBinding(theImageInstance);
     if (!theImageTimelineRow) // create
     {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
index 76733575..d1618e96 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
@@ -59,7 +59,7 @@ protected: // Members
 
 public: // Construction
     CMaterialTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                 qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                                 qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     virtual ~CMaterialTimelineItemBinding();
 
 public: // CUICDMTimelineItemBinding
@@ -69,14 +69,14 @@ public: // CUICDMTimelineItemBinding
     // Hierarchy
     long GetChildrenCount() override;
     ITimelineItemBinding *GetChild(long inIndex) override;
-    void OnAddChild(qt3dsdm::CUICDMInstanceHandle inInstance) override;
+    void OnAddChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
     // Event callback
-    void OnPropertyChanged(qt3dsdm::CUICDMPropertyHandle inPropertyHandle) override;
-    void OnPropertyLinked(qt3dsdm::CUICDMPropertyHandle inPropertyHandle) override;
+    void OnPropertyChanged(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle) override;
+    void OnPropertyLinked(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle) override;
 
 protected:
-    qt3dsdm::CUICDMInstanceHandle GetImage(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
-    ITimelineItemBinding *GetOrCreateImageBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+    qt3dsdm::Qt3DSDMInstanceHandle GetImage(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
+    ITimelineItemBinding *GetOrCreateImageBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                                   const wchar_t *inName);
 };
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PasteKeyframesCommandHelper.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/PasteKeyframesCommandHelper.h
index 2d4d0993..1d8be579 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PasteKeyframesCommandHelper.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PasteKeyframesCommandHelper.h
@@ -53,7 +53,7 @@ public: // Construction
     ~CPasteKeyframeCommandHelper() {}
 
     // inTime should be relative to the earliest keyframe time in this list
-    void AddKeyframeData(qt3dsdm::CUICDMPropertyHandle inProperty, float inKeyframeTime,
+    void AddKeyframeData(qt3dsdm::Qt3DSDMPropertyHandle inProperty, float inKeyframeTime,
                          qt3dsdm::SGetOrSetKeyframeInfo *inInfos, size_t inInfoCount)
     {
         m_CopiedKeyframeList.push_back(CCmdDataModelInsertKeyframe::STimeKeyframeData(
@@ -72,7 +72,7 @@ public: // Construction
     //
     // 2. The first pasted keyframe is at current view time and the rest are offset accordingly.
     CCmdDataModelInsertKeyframe *GetCommand(CDoc *inDoc, long inTimeOffsetInMilliseconds,
-                                            qt3dsdm::CUICDMInstanceHandle inTargetInstance)
+                                            qt3dsdm::Qt3DSDMInstanceHandle inTargetInstance)
     {
         using namespace qt3dsdm;
 
@@ -85,7 +85,7 @@ public: // Construction
             TCharStr thePropertyName = thePropertySystem->GetName(theIter->m_Property);
             DataModelDataType::Value thePropertyType =
                 thePropertySystem->GetDataType(theIter->m_Property);
-            CUICDMPropertyHandle theTargetPropertyHandle =
+            Qt3DSDMPropertyHandle theTargetPropertyHandle =
                 theBridge->GetAggregateInstancePropertyByName(inTargetInstance, thePropertyName);
             if (theTargetPropertyHandle.Valid()) // property exists on target
             {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
index 49663ed7..a3667182 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.cpp
@@ -33,7 +33,7 @@
 using namespace qt3dsdm;
 
 CPathAnchorPointTimelineItemBinding::CPathAnchorPointTimelineItemBinding(
-    CTimelineTranslationManager *inMgr, CUICDMInstanceHandle inDataHandle)
+    CTimelineTranslationManager *inMgr, Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr, inDataHandle)
 {
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
index 30a1230e..1b343cc5 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
@@ -52,7 +52,7 @@ class CPathAnchorPointTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public: // Construction
     CPathAnchorPointTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                        qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                                        qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
 
     bool ShowToggleControls() const override { return false; }
     bool IsVisible() const override { return true; }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
index 73712ee3..3bab231e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
@@ -51,7 +51,7 @@ class CPathTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public: // Construction
     CPathTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                             qt3dsdm::CUICDMInstanceHandle inDataHandle)
+                             qt3dsdm::Qt3DSDMInstanceHandle inDataHandle)
         : CUICDMTimelineItemBinding(inMgr, inDataHandle)
     {
     }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
index 083994ea..8627f62f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.cpp
@@ -50,7 +50,7 @@
 using namespace qt3dsdm;
 
 CSlideTimelineItemBinding::CSlideTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                     CUICDMInstanceHandle inDataHandle)
+                                                     Qt3DSDMInstanceHandle inDataHandle)
     : CUICDMTimelineItemBinding(inMgr)
 {
     qt3dsdm::CUICDMSlideHandle theSlideHandle =
@@ -58,17 +58,17 @@ CSlideTimelineItemBinding::CSlideTimelineItemBinding(CTimelineTranslationManager
 
     // Get the owning component of m_SlideHandle.
     // This should return CAsset OBJTYPE_SCENE or OBJTYPE_COMPONENT.
-    qt3dsdm::CUICDMInstanceHandle theInstance =
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance =
         m_StudioSystem->GetClientDataModelBridge()->GetOwningComponentInstance(theSlideHandle);
     SetInstanceHandle(theInstance);
 
     // Listen to change on Asset name
     IStudioFullSystemSignalProvider *theEngine = m_StudioSystem->GetFullSystemSignalProvider();
-    std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle)> theSetter(
+    std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> theSetter(
         std::bind(&CSlideTimelineItemBinding::OnPropertyChanged, this, std::placeholders::_2));
     m_Connection = theEngine->ConnectInstancePropertyValue(
         std::bind(qt3dsdm::MaybackCallbackInstancePropertyValue<std::function<void(
-                        CUICDMInstanceHandle, CUICDMPropertyHandle)>>,
+                        Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>>,
                     std::placeholders::_1, std::placeholders::_2, theInstance,
                     m_StudioSystem->GetClientDataModelBridge()->GetNameProperty(), theSetter));
 }
@@ -91,7 +91,7 @@ void CSlideTimelineItemBinding::Bind(CBaseStateRow *inRow)
 
 bool CSlideTimelineItemBinding::IsValidTransaction(EUserTransaction inTransaction)
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     switch (inTransaction) {
     // Disable the following context menus
     case EUserTransaction_Rename:
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
index 8f0e5974..f96ed9b9 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
@@ -52,7 +52,7 @@ class CSlideTimelineItemBinding : public CUICDMTimelineItemBinding
 {
 public:
     CSlideTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                              qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                              qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     ~CSlideTimelineItemBinding() {}
 
     // CUICDMTimelineItemBinding
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
index a5450a3f..7f88309f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.cpp
@@ -68,7 +68,7 @@ CTimelineBreadCrumbProvider::~CTimelineBreadCrumbProvider()
  * determine the color and text string for this breadcrumb
  */
 static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
-                                  qt3dsdm::CUICDMInstanceHandle inInstance, CDoc *inDoc)
+                                  qt3dsdm::Qt3DSDMInstanceHandle inInstance, CDoc *inDoc)
 {
     // Get the MasterSlide Handle associated with inAsset
     CClientDataModelBridge *theBridge = inDoc->GetStudioSystem()->GetClientDataModelBridge();
@@ -95,7 +95,7 @@ static inline void FillBreadCrumb(SBreadCrumb &outBreadCrumb,
     else {
         CUICDMSlideHandle theActiveSlide =
             theSlideSystem->GetSlideByIndex(theMasterSlide, theActiveIndex);
-        CUICDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theActiveSlide);
+        Qt3DSDMInstanceHandle theInstanceHandle = theSlideSystem->GetSlideInstance(theActiveSlide);
         ASSERT(theInstanceHandle.Valid());
         outBreadCrumb.m_String += theBridge->GetName(theInstanceHandle).toQString();
     }
@@ -166,7 +166,7 @@ void CTimelineBreadCrumbProvider::RefreshSlideList()
 {
     ClearSlideList();
 
-    qt3dsdm::CUICDMInstanceHandle theActiveRoot = m_Doc->GetActiveRootInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theActiveRoot = m_Doc->GetActiveRootInstance();
     if (!theActiveRoot.Valid())
         return;
     FillSlideList(theActiveRoot);
@@ -196,7 +196,7 @@ void CTimelineBreadCrumbProvider::ClearSlideList()
  * This will recurse up the time context tree, so that we can fill the list in a top-down (i.e
  * Scene) first manner
  */
-void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (!inInstance.Valid())
         return;
@@ -210,17 +210,17 @@ void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::CUICDMInstanceHandle in
 
     m_BreadCrumbList.push_back(inInstance);
 
-    CUICDMPropertyHandle theNameProp =
+    Qt3DSDMPropertyHandle theNameProp =
         m_Doc->GetStudioSystem()->GetClientDataModelBridge()->GetNameProperty();
     IStudioFullSystemSignalProvider *theEngine =
         m_Doc->GetStudioSystem()->GetFullSystemSignalProvider();
-    std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle)> theSetter(
+    std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> theSetter(
         std::bind(&CTimelineBreadCrumbProvider::OnNameDirty, this));
 
     // Listen to name changes on the Asset
     m_Connections.push_back(theEngine->ConnectInstancePropertyValue(
         std::bind(qt3dsdm::MaybackCallbackInstancePropertyValue<std::function<void(
-                        CUICDMInstanceHandle, CUICDMPropertyHandle)>>,
+                        Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>>,
                     std::placeholders::_1, std::placeholders::_2, inInstance, theNameProp, theSetter)));
 
     // Listen to name changes on the non-master Slides
@@ -230,10 +230,10 @@ void CTimelineBreadCrumbProvider::FillSlideList(qt3dsdm::CUICDMInstanceHandle in
 
     for (long theIndex = 1; theIndex < theSlideCount; ++theIndex) {
         CUICDMSlideHandle theSlide = theSlideSystem->GetSlideByIndex(theMasterSlide, theIndex);
-        CUICDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(theSlide);
+        Qt3DSDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(theSlide);
         m_Connections.push_back(theEngine->ConnectInstancePropertyValue(
             std::bind(qt3dsdm::MaybackCallbackInstancePropertyValue<std::function<void(
-                            CUICDMInstanceHandle, CUICDMPropertyHandle)>>,
+                            Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>>,
                         std::placeholders::_1, std::placeholders::_2, theSlideInstance, theNameProp, theSetter)));
     }
 }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
index 73495a6d..f3a7e4c5 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
@@ -62,10 +62,10 @@ public:
 
 protected:
     void ClearSlideList();
-    void FillSlideList(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void FillSlideList(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
 protected:
-    std::vector<qt3dsdm::CUICDMInstanceHandle> m_BreadCrumbList;
+    std::vector<qt3dsdm::Qt3DSDMInstanceHandle> m_BreadCrumbList;
     CDoc *m_Doc;
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
         m_Connections; /// connections to the UICDM
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
index cc4c4211..bff9a60e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
@@ -77,13 +77,13 @@ CTimelineTranslationManager::~CTimelineTranslationManager()
     delete m_BreadCrumbProvider;
 }
 
-ITimelineItemBinding *CTimelineTranslationManager::GetOrCreate(CUICDMInstanceHandle inInstance)
+ITimelineItemBinding *CTimelineTranslationManager::GetOrCreate(Qt3DSDMInstanceHandle inInstance)
 {
     ITimelineItemBinding *theBinding = GetBinding(inInstance);
     if (!theBinding) {
         CUICDMTimelineItemBinding *theReturn = nullptr;
         qt3dsdm::IPropertySystem *thePropertySystem = GetStudioSystem()->GetPropertySystem();
-        CUICDMPropertyHandle theTypeProperty =
+        Qt3DSDMPropertyHandle theTypeProperty =
             thePropertySystem->GetAggregateInstancePropertyByName(inInstance, L"type");
 
         SValue theTypeValue;
@@ -185,7 +185,7 @@ void CTimelineTranslationManager::Unregister(ITimelineItemBinding *inTimelineIte
     for (; theInstanceIter != m_InstanceHandleBindingMap.end(); ++theInstanceIter) {
         if (theInstanceIter->second == inTimelineItem) {
             // If this is the currently selected object and make sure that is cleared.
-            qt3dsdm::CUICDMInstanceHandle theSelectedInstance =
+            qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance =
                 g_StudioApp.GetCore()->GetDoc()->GetSelectedInstance();
             if (theSelectedInstance.Valid() && theSelectedInstance == theInstanceIter->first)
                 theDeselectItem = true;
@@ -226,7 +226,7 @@ long CTimelineTranslationManager::GetCurrentViewTime() const
  * @return the Binding object that corresponds to this instance.
  */
 CUICDMTimelineItemBinding *
-CTimelineTranslationManager::GetBinding(CUICDMInstanceHandle inHandle) const
+CTimelineTranslationManager::GetBinding(Qt3DSDMInstanceHandle inHandle) const
 {
     TInstanceHandleBindingMap::const_iterator theIter = m_InstanceHandleBindingMap.find(inHandle);
     if (theIter != m_InstanceHandleBindingMap.end())
@@ -236,7 +236,7 @@ CTimelineTranslationManager::GetBinding(CUICDMInstanceHandle inHandle) const
 
 CUICDMTimelineItemBinding *CTimelineTranslationManager::GetSelectedBinding() const
 {
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance =
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance =
         g_StudioApp.GetCore()->GetDoc()->GetSelectedInstance();
     if (theSelectedInstance.Valid()) {
         CUICDMTimelineItemBinding *theBinding = GetBinding(theSelectedInstance);
@@ -348,8 +348,8 @@ CStudioSystem *CTimelineTranslationManager::GetStudioSystem() const
     return g_StudioApp.GetCore()->GetDoc()->GetStudioSystem();
 }
 
-void CTimelineTranslationManager::OnAnimationCreated(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty)
+void CTimelineTranslationManager::OnAnimationCreated(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMTimelineItemBinding *theTimelineBinding =
         dynamic_cast<CUICDMTimelineItemBinding *>(GetBinding(inInstance));
@@ -357,8 +357,8 @@ void CTimelineTranslationManager::OnAnimationCreated(CUICDMInstanceHandle inInst
         theTimelineBinding->AddPropertyRow(inProperty);
 }
 
-void CTimelineTranslationManager::OnAnimationDeleted(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty)
+void CTimelineTranslationManager::OnAnimationDeleted(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMTimelineItemBinding *theTimelineBinding =
         dynamic_cast<CUICDMTimelineItemBinding *>(GetBinding(inInstance));
@@ -366,8 +366,8 @@ void CTimelineTranslationManager::OnAnimationDeleted(CUICDMInstanceHandle inInst
         theTimelineBinding->RemovePropertyRow(inProperty);
 }
 
-void CTimelineTranslationManager::OnPropertyLinked(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty)
+void CTimelineTranslationManager::OnPropertyLinked(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMTimelineItemBinding *theTimelineBinding =
         dynamic_cast<CUICDMTimelineItemBinding *>(GetBinding(inInstance));
@@ -375,8 +375,8 @@ void CTimelineTranslationManager::OnPropertyLinked(CUICDMInstanceHandle inInstan
         theTimelineBinding->OnPropertyLinked(inProperty);
 }
 
-void CTimelineTranslationManager::OnPropertyUnlinked(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty)
+void CTimelineTranslationManager::OnPropertyUnlinked(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty)
 {
     OnPropertyLinked(inInstance, inProperty);
 }
@@ -422,8 +422,8 @@ void CTimelineTranslationManager::OnKeyframeUpdated(CUICDMKeyframeHandle inKeyfr
     // else, keyframe has been nuked, ignore this event, we'll get a KeyframeDeleted
 }
 
-void CTimelineTranslationManager::OnPropertyChanged(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                    qt3dsdm::CUICDMPropertyHandle inProperty)
+void CTimelineTranslationManager::OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                    qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMTimelineItemBinding *theTimelineBinding =
         dynamic_cast<CUICDMTimelineItemBinding *>(GetBinding(inInstance));
@@ -448,7 +448,7 @@ void CTimelineTranslationManager::OnDynamicKeyframeChanged(qt3dsdm::CUICDMAnimat
     }
 }
 
-void CTimelineTranslationManager::OnAssetCreated(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CTimelineTranslationManager::OnAssetCreated(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     CClientDataModelBridge *theDataModelBridge = GetStudioSystem()->GetClientDataModelBridge();
 
@@ -456,7 +456,7 @@ void CTimelineTranslationManager::OnAssetCreated(qt3dsdm::CUICDMInstanceHandle i
         EnsureLoaded(inInstance);
 }
 
-void CTimelineTranslationManager::OnAssetDeleted(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CTimelineTranslationManager::OnAssetDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     // You can't assume the instance is valid.  Someone may have deleted a large number of items
     // from the model and then decided to send notifications after the fact.
@@ -495,7 +495,7 @@ void CTimelineTranslationManager::OnChildMoved(int /*inParent*/, int inChild, lo
  */
 void CTimelineTranslationManager::OnActionEvent(qt3dsdm::CUICDMActionHandle inAction,
                                                 qt3dsdm::CUICDMSlideHandle inSlide,
-                                                qt3dsdm::CUICDMInstanceHandle inOwner)
+                                                qt3dsdm::Qt3DSDMInstanceHandle inOwner)
 {
     Q_UNUSED(inAction);
 
@@ -528,7 +528,7 @@ void CTimelineTranslationManager::SetSelected(Q3DStudio::SSelectedValue inSelect
 {
     qt3dsdm::TInstanceHandleList theInstances = inSelectable.GetSelectedInstances();
     for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
-        CUICDMInstanceHandle theInstance(theInstances[idx]);
+        Qt3DSDMInstanceHandle theInstance(theInstances[idx]);
         if (GetStudioSystem()->IsInstance(theInstance)) {
             ITimelineItemBinding *theBinding = EnsureLoaded(theInstance);
             if (theBinding) {
@@ -540,14 +540,14 @@ void CTimelineTranslationManager::SetSelected(Q3DStudio::SSelectedValue inSelect
     }
 }
 
-ITimelineItemBinding *CTimelineTranslationManager::EnsureLoaded(CUICDMInstanceHandle inHandle)
+ITimelineItemBinding *CTimelineTranslationManager::EnsureLoaded(Qt3DSDMInstanceHandle inHandle)
 {
     ITimelineItemBinding *theBinding = GetBinding(inHandle);
     bool rowLoaded = theBinding != nullptr && theBinding->GetRow() != nullptr;
     if (rowLoaded == false) {
         // tell my parent to load me
         CClientDataModelBridge *theDataModelBridge = GetStudioSystem()->GetClientDataModelBridge();
-        CUICDMInstanceHandle theParent = theDataModelBridge->GetParentInstance(inHandle);
+        Qt3DSDMInstanceHandle theParent = theDataModelBridge->GetParentInstance(inHandle);
         if (theParent.Valid()) {
             ITimelineItemBinding *theParentBinding = EnsureLoaded(theParent);
             if (theParentBinding)
@@ -576,7 +576,7 @@ ITimelineItemBinding *CTimelineTranslationManager::EnsureLoaded(CUICDMInstanceHa
 /**
  * remember the expanded state for the current presentation
  */
-bool CTimelineTranslationManager::IsExpanded(CUICDMInstanceHandle inInstance) const
+bool CTimelineTranslationManager::IsExpanded(Qt3DSDMInstanceHandle inInstance) const
 {
     TInstanceHandleExpandedMap::const_iterator theIter =
         m_InstanceHandleExpandedMap.find(inInstance);
@@ -590,7 +590,7 @@ bool CTimelineTranslationManager::IsExpanded(CUICDMInstanceHandle inInstance) co
 /**
  * remember the expanded state for the current presentation
  */
-void CTimelineTranslationManager::SetExpanded(CUICDMInstanceHandle inInstance, bool inExpanded)
+void CTimelineTranslationManager::SetExpanded(Qt3DSDMInstanceHandle inInstance, bool inExpanded)
 {
     TInstanceHandleExpandedMap::iterator theIter = m_InstanceHandleExpandedMap.find(inInstance);
     if (theIter != m_InstanceHandleExpandedMap.end()) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
index 46219fbc..217aa43e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
@@ -71,11 +71,11 @@ class CTimelineTranslationManager
 {
 protected: // Typedefs
     // UICDM support
-    typedef std::map<qt3dsdm::CUICDMInstanceHandle, CUICDMTimelineItemBinding *>
+    typedef std::map<qt3dsdm::Qt3DSDMInstanceHandle, CUICDMTimelineItemBinding *>
         TInstanceHandleBindingMap;
 
     // Store expanded state
-    typedef std::map<qt3dsdm::CUICDMInstanceHandle, bool> TInstanceHandleExpandedMap; // UICDM support
+    typedef std::map<qt3dsdm::Qt3DSDMInstanceHandle, bool> TInstanceHandleExpandedMap; // UICDM support
 
 protected: // Properties
     // UICDM support
@@ -93,7 +93,7 @@ public:
     ~CTimelineTranslationManager();
 
 public:
-    ITimelineItemBinding *GetOrCreate(qt3dsdm::CUICDMInstanceHandle inInstance);
+    ITimelineItemBinding *GetOrCreate(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void CreateNewPropertyRow(ITimelineItemProperty *inTimelineItemPropertyBinding,
                               CBaseStateRow *inParentRow, CPropertyRow *inNextRow);
     void RemovePropertyRow(ITimelineItemProperty *inTimelineItemPropertyBinding);
@@ -105,7 +105,7 @@ public:
     IBreadCrumbProvider *GetBreadCrumbProvider() const;
     CBaseStateRow *GetSelectedRow() const;
     long GetCurrentViewTime() const;
-    CUICDMTimelineItemBinding *GetBinding(qt3dsdm::CUICDMInstanceHandle inHandle) const;
+    CUICDMTimelineItemBinding *GetBinding(qt3dsdm::Qt3DSDMInstanceHandle inHandle) const;
     CUICDMTimelineItemBinding *GetSelectedBinding() const;
 
     void ClearKeyframeSelection();
@@ -115,14 +115,14 @@ public:
     qt3dsdm::CStudioSystem *GetStudioSystem() const;
 
     // UICDM callback
-    void OnAnimationCreated(qt3dsdm::CUICDMInstanceHandle inInstance,
-                            qt3dsdm::CUICDMPropertyHandle inProperty);
-    void OnAnimationDeleted(qt3dsdm::CUICDMInstanceHandle inInstance,
-                            qt3dsdm::CUICDMPropertyHandle inProperty);
-    void OnPropertyLinked(qt3dsdm::CUICDMInstanceHandle inInstance,
-                          qt3dsdm::CUICDMPropertyHandle inProperty);
-    void OnPropertyUnlinked(qt3dsdm::CUICDMInstanceHandle inInstance,
-                            qt3dsdm::CUICDMPropertyHandle inProperty);
+    void OnAnimationCreated(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                            qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    void OnAnimationDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                            qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    void OnPropertyLinked(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                          qt3dsdm::Qt3DSDMPropertyHandle inProperty);
+    void OnPropertyUnlinked(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                            qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void RefreshKeyframe(qt3dsdm::CUICDMAnimationHandle inAnimation,
                          qt3dsdm::CUICDMKeyframeHandle inKeyframe,
                          ETimelineKeyframeTransaction inTransaction);
@@ -131,30 +131,30 @@ public:
     void OnKeyframeDeleted(qt3dsdm::CUICDMAnimationHandle inAnimation,
                            qt3dsdm::CUICDMKeyframeHandle inKeyframe);
     void OnKeyframeUpdated(qt3dsdm::CUICDMKeyframeHandle inKeyframe);
-    void OnPropertyChanged(qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMPropertyHandle inProperty);
+    void OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void OnDynamicKeyframeChanged(qt3dsdm::CUICDMAnimationHandle inAnimation, bool inDynamic);
 
-    void OnAssetCreated(qt3dsdm::CUICDMInstanceHandle inInstance);
-    void OnAssetDeleted(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void OnAssetCreated(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    void OnAssetDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void OnChildAdded(int inParent, int inChild, long inIndex);
     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,
-                       qt3dsdm::CUICDMInstanceHandle inOwner);
+                       qt3dsdm::Qt3DSDMInstanceHandle inOwner);
 
     // Helper function to iterate over all bindings
     void ClearBindingsKeyframeSelection();
     CDoc *GetDoc() const;
 
     // Store expanded state
-    bool IsExpanded(qt3dsdm::CUICDMInstanceHandle inInstance) const;
-    void SetExpanded(qt3dsdm::CUICDMInstanceHandle inInstance, bool inExpanded);
+    bool IsExpanded(qt3dsdm::Qt3DSDMInstanceHandle inInstance) const;
+    void SetExpanded(qt3dsdm::Qt3DSDMInstanceHandle inInstance, bool inExpanded);
 
 protected:
     void SetSelected(Q3DStudio::SSelectedValue inSelectable, bool inSelected);
-    ITimelineItemBinding *EnsureLoaded(qt3dsdm::CUICDMInstanceHandle inHandle);
+    ITimelineItemBinding *EnsureLoaded(qt3dsdm::Qt3DSDMInstanceHandle inHandle);
 };
 
 #endif // INCLUDED_TIMELINE_TRANSLATIONMANAGER_H
\ No newline at end of file
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.cpp
index 59945db6..39551e13 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.cpp
@@ -75,7 +75,7 @@
 using namespace qt3dsdm;
 
 CUICDMTimelineItemBinding::CUICDMTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                                                     CUICDMInstanceHandle inDataHandle)
+                                                     Qt3DSDMInstanceHandle inDataHandle)
     : m_Row(nullptr)
     , m_TransMgr(inMgr)
     , m_DataHandle(inDataHandle)
@@ -106,7 +106,7 @@ CUICDMTimelineItemBinding::~CUICDMTimelineItemBinding()
 }
 
 // helpers
-bool CUICDMTimelineItemBinding::UICDMGetBoolean(qt3dsdm::CUICDMPropertyHandle inProperty) const
+bool CUICDMTimelineItemBinding::UICDMGetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_StudioSystem->GetPropertySystem();
     SValue theValue;
@@ -114,7 +114,7 @@ bool CUICDMTimelineItemBinding::UICDMGetBoolean(qt3dsdm::CUICDMPropertyHandle in
     return qt3dsdm::get<bool>(theValue);
 }
 
-void CUICDMTimelineItemBinding::UICDMSetBoolean(qt3dsdm::CUICDMPropertyHandle inProperty,
+void CUICDMTimelineItemBinding::UICDMSetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                                 bool inValue, const QString &inNiceText) const
 {
     CDoc *theDoc = dynamic_cast<CDoc *>(g_StudioApp.GetCore()->GetDoc());
@@ -122,7 +122,7 @@ void CUICDMTimelineItemBinding::UICDMSetBoolean(qt3dsdm::CUICDMPropertyHandle in
         ->SetInstancePropertyValue(m_DataHandle, inProperty, inValue);
 }
 
-void CUICDMTimelineItemBinding::SetInstanceHandle(qt3dsdm::CUICDMInstanceHandle inDataHandle)
+void CUICDMTimelineItemBinding::SetInstanceHandle(qt3dsdm::Qt3DSDMInstanceHandle inDataHandle)
 {
     m_DataHandle = inDataHandle;
 }
@@ -138,8 +138,8 @@ bool CUICDMTimelineItemBinding::IsMaster() const
     Q3DStudio::IDocumentReader &theReader(theDoc->GetDocumentReader());
     if (GetObjectType() == OBJTYPE_IMAGE) {
         CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
-        CUICDMInstanceHandle theParent;
-        CUICDMPropertyHandle theProperty;
+        Qt3DSDMInstanceHandle theParent;
+        Qt3DSDMPropertyHandle theProperty;
         bool isPropertyLinked;
 
         theBridge->GetMaterialFromImageInstance(GetInstance(), theParent, theProperty);
@@ -153,12 +153,12 @@ bool CUICDMTimelineItemBinding::IsMaster() const
 
         return isPropertyLinked;
     }
-    CUICDMInstanceHandle theQueryHandle(m_DataHandle);
+    Qt3DSDMInstanceHandle theQueryHandle(m_DataHandle);
     if (GetObjectType() == OBJTYPE_PATHANCHORPOINT)
         theQueryHandle = theReader.GetParent(m_DataHandle);
 
     // logic: you can't unlink name, so if name is linked then, this is master.
-    CUICDMPropertyHandle theNamePropHandle =
+    Qt3DSDMPropertyHandle theNamePropHandle =
         m_StudioSystem->GetPropertySystem()->GetAggregateInstancePropertyByName(theQueryHandle,
                                                                                 L"name");
     return theReader.IsPropertyLinked(theQueryHandle, theNamePropHandle);
@@ -264,7 +264,7 @@ bool CUICDMTimelineItemBinding::ChildrenHasAction(bool inMaster)
         TSlideInstancePairList theGraphInstances;
         m_StudioSystem->GetSlideSystem()->GetAssociatedInstances(theSlide, theGraphInstances);
 
-        qt3dsdm::CUICDMInstanceHandle theObservedInstance = GetInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theObservedInstance = GetInstance();
         if (theObservedInstance.Valid()) {
             for (TSlideInstancePairList::const_iterator theIter = theGraphInstances.begin();
                  theIter != theGraphInstances.end(); ++theIter) {
@@ -272,7 +272,7 @@ bool CUICDMTimelineItemBinding::ChildrenHasAction(bool inMaster)
                     CUICDMActionHandle theAction =
                         theActionCore->GetActionByInstance(theIter->second);
                     SActionInfo theActionInfo = theActionCore->GetActionInfo(theAction);
-                    CUICDMInstanceHandle theAcionOwner = theActionInfo.m_Owner;
+                    Qt3DSDMInstanceHandle theAcionOwner = theActionInfo.m_Owner;
                     if (theAcionOwner.Valid()
                         && IsAscendant(theAcionOwner, theObservedInstance, theDoc->GetAssetGraph()))
                         return true;
@@ -322,7 +322,7 @@ Q3DStudio::CString CUICDMTimelineItemBinding::GetName() const
 {
     if (m_StudioSystem->IsInstance(m_DataHandle) == false)
         return L"";
-    CUICDMPropertyHandle theNamePropHandle =
+    Qt3DSDMPropertyHandle theNamePropHandle =
         m_StudioSystem->GetPropertySystem()->GetAggregateInstancePropertyByName(m_DataHandle,
                                                                                 L"name");
     SValue theNameValue;
@@ -360,7 +360,7 @@ void CUICDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
         }
     }
     // Set the name no matter it's unique or not
-    CUICDMPropertyHandle theNamePropHandle =
+    Qt3DSDMPropertyHandle theNamePropHandle =
         m_StudioSystem->GetPropertySystem()->GetAggregateInstancePropertyByName(m_DataHandle,
                                                                                 L"name");
     Q3DStudio::SCOPED_DOCUMENT_EDITOR(*m_TransMgr->GetDoc(), QObject::tr("Set Name"))
@@ -391,10 +391,10 @@ void CUICDMTimelineItemBinding::OnCollapsed()
     // Preserves legacy behavior where collapsing a tree will select that root, if any of its
     // descendant was selected
     // TODO: This won't work for Image (because Image is Material's property, not child)
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         CDoc *theDoc = m_TransMgr->GetDoc();
-        qt3dsdm::CUICDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = theDoc->GetSelectedInstance();
         if (theSelectedInstance.Valid()
             && IsAscendant(theSelectedInstance, theInstance, theDoc->GetAssetGraph()))
             SetSelected(false);
@@ -416,20 +416,20 @@ void CUICDMTimelineItemBinding::DoStartDrag(CControlWindowListener *inWndListene
     inWndListener->DoStartDrag(this);
 }
 
-inline qt3dsdm::CUICDMInstanceHandle CUICDMTimelineItemBinding::GetInstance() const
+inline qt3dsdm::Qt3DSDMInstanceHandle CUICDMTimelineItemBinding::GetInstance() const
 {
     return m_DataHandle;
 }
 
 void CUICDMTimelineItemBinding::SetDropTarget(CDropTarget *inTarget)
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     inTarget->SetInstance(theInstance);
 }
 
 long CUICDMTimelineItemBinding::GetChildrenCount()
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
         CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
@@ -442,7 +442,7 @@ long CUICDMTimelineItemBinding::GetChildrenCount()
 
 ITimelineItemBinding *CUICDMTimelineItemBinding::GetChild(long inIndex)
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     if (theInstance.Valid()) {
         Q3DStudio::CGraphIterator theChildren;
         CUICDMSlideHandle theActiveSlide = m_TransMgr->GetDoc()->GetActiveSlide();
@@ -450,7 +450,7 @@ ITimelineItemBinding *CUICDMTimelineItemBinding::GetChild(long inIndex)
                                      theChildren, theActiveSlide);
         theChildren += inIndex;
 
-        qt3dsdm::CUICDMInstanceHandle theChildInstance = theChildren.GetCurrent();
+        qt3dsdm::Qt3DSDMInstanceHandle theChildInstance = theChildren.GetCurrent();
         if (theChildInstance.Valid())
             return m_TransMgr->GetOrCreate(theChildInstance);
     }
@@ -537,7 +537,7 @@ void CUICDMTimelineItemBinding::Bind(CBaseStateRow *inRow)
     }
 
     // Set selection status
-    CUICDMInstanceHandle theSelectedInstance = m_TransMgr->GetDoc()->GetSelectedInstance();
+    Qt3DSDMInstanceHandle theSelectedInstance = m_TransMgr->GetDoc()->GetSelectedInstance();
     m_Row->OnSelected(m_DataHandle == theSelectedInstance);
 }
 
@@ -550,7 +550,7 @@ void CUICDMTimelineItemBinding::Release()
 
 bool CUICDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransaction)
 {
-    qt3dsdm::CUICDMInstanceHandle theInstance = GetInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance();
     switch (inTransaction) {
     case EUserTransaction_Rename:
         return (GetObjectType() != OBJTYPE_SCENE && GetObjectType() != OBJTYPE_IMAGE);
@@ -585,7 +585,7 @@ bool CUICDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransactio
                 // component.
                 // This may include behavior assets which may be directly attached to the Scene.
                 // This is because by principal, components cannot exist on the Scene directly.
-                qt3dsdm::CUICDMInstanceHandle theParentInstance =
+                qt3dsdm::Qt3DSDMInstanceHandle theParentInstance =
                     theBridge->GetParentInstance(theInstance);
                 if (theObjectType != OBJTYPE_LAYER && theObjectType != OBJTYPE_SCENE
                     && theObjectType != OBJTYPE_MATERIAL && theObjectType != OBJTYPE_IMAGE
@@ -688,7 +688,7 @@ void CUICDMTimelineItemBinding::RemoveProperty(ITimelineItemProperty *inProperty
 {
     Q_UNUSED(inProperty);
     // TODO: This function has no use in UICDM world. This is replaced by RemovePropertyRow(
-    // CUICDMPropertyHandle inPropertyHandle ).
+    // Qt3DSDMPropertyHandle inPropertyHandle ).
     // Decide if this function should be removed from ITimelineItemBinding.
 }
 
@@ -779,7 +779,7 @@ void CUICDMTimelineItemBinding::SelectKeyframes(bool inSelected, long inTime /*=
     DoSelectKeyframes(inSelected, inTime, false);
 }
 
-CUICDMInstanceHandle CUICDMTimelineItemBinding::GetInstanceHandle() const
+Qt3DSDMInstanceHandle CUICDMTimelineItemBinding::GetInstanceHandle() const
 {
     return m_DataHandle;
 }
@@ -797,13 +797,13 @@ void CUICDMTimelineItemBinding::OnEndDataModelNotifications()
     RefreshStateRow();
 }
 void CUICDMTimelineItemBinding::OnImmediateRefreshInstanceSingle(
-    qt3dsdm::CUICDMInstanceHandle inInstance)
+    qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (inInstance == m_DataHandle)
         RefreshStateRow(true);
 }
 void CUICDMTimelineItemBinding::OnImmediateRefreshInstanceMultiple(
-    qt3dsdm::CUICDMInstanceHandle *inInstance, long inInstanceCount)
+    qt3dsdm::Qt3DSDMInstanceHandle *inInstance, long inInstanceCount)
 {
     for (long idx = 0; idx < inInstanceCount; ++idx)
         if (inInstance[idx] == m_DataHandle) {
@@ -837,7 +837,7 @@ ITimelineTimebar *CUICDMTimelineItemBinding::CreateTimelineTimebar()
 }
 
 ITimelineItemProperty *
-CUICDMTimelineItemBinding::GetPropertyBinding(CUICDMPropertyHandle inPropertyHandle)
+CUICDMTimelineItemBinding::GetPropertyBinding(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     TPropertyBindingMap::iterator theIter = m_PropertyBindingMap.find(inPropertyHandle);
     // check if it already exists
@@ -847,7 +847,7 @@ CUICDMTimelineItemBinding::GetPropertyBinding(CUICDMPropertyHandle inPropertyHan
 }
 
 ITimelineItemProperty *
-CUICDMTimelineItemBinding::GetOrCreatePropertyBinding(CUICDMPropertyHandle inPropertyHandle)
+CUICDMTimelineItemBinding::GetOrCreatePropertyBinding(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     ITimelineItemProperty *theProperty = GetPropertyBinding(inPropertyHandle);
     // check if it already exists
@@ -868,7 +868,7 @@ CUICDMTimelineItemBinding::GetOrCreatePropertyBinding(CUICDMPropertyHandle inPro
  * @param inAppend true to skip the check to find where to insert. ( true if this is a
  * loading/initializing step, where the call is already done in order )
  */
-void CUICDMTimelineItemBinding::AddPropertyRow(CUICDMPropertyHandle inPropertyHandle,
+void CUICDMTimelineItemBinding::AddPropertyRow(Qt3DSDMPropertyHandle inPropertyHandle,
                                                bool inAppend /*= false */)
 {
     ITimelineItemProperty *theTimelineProperty = GetPropertyBinding(inPropertyHandle);
@@ -912,7 +912,7 @@ void CUICDMTimelineItemBinding::AddPropertyRow(CUICDMPropertyHandle inPropertyHa
     AddKeyframes(theTimelineProperty);
 }
 
-void CUICDMTimelineItemBinding::RemovePropertyRow(CUICDMPropertyHandle inPropertyHandle)
+void CUICDMTimelineItemBinding::RemovePropertyRow(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     TPropertyBindingMap::iterator theIter = m_PropertyBindingMap.find(inPropertyHandle);
     if (theIter != m_PropertyBindingMap.end()) {
@@ -933,7 +933,7 @@ void CUICDMTimelineItemBinding::RemovePropertyRow(CUICDMPropertyHandle inPropert
 
 // called when a keyframe is inserted, deleted or updated in the data model
 void CUICDMTimelineItemBinding::RefreshPropertyKeyframe(
-    qt3dsdm::CUICDMPropertyHandle inPropertyHandle, qt3dsdm::CUICDMKeyframeHandle inKeyframe,
+    qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle, qt3dsdm::CUICDMKeyframeHandle inKeyframe,
     ETimelineKeyframeTransaction inTransaction)
 {
     TPropertyBindingMap::iterator theIter = m_PropertyBindingMap.find(inPropertyHandle);
@@ -984,7 +984,7 @@ void CUICDMTimelineItemBinding::UIRefreshPropertyKeyframe(long inOffset)
     m_Row->GetTimebar()->SetDirty(true);
 }
 
-void CUICDMTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropertyHandle)
+void CUICDMTimelineItemBinding::OnPropertyChanged(Qt3DSDMPropertyHandle inPropertyHandle)
 { // Refresh UI
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
     if (m_Row && (inPropertyHandle == theBridge->GetNameProperty()
@@ -996,7 +996,7 @@ void CUICDMTimelineItemBinding::OnPropertyChanged(CUICDMPropertyHandle inPropert
         m_Row->OnDirty();
 }
 
-void CUICDMTimelineItemBinding::OnPropertyLinked(CUICDMPropertyHandle inPropertyHandle)
+void CUICDMTimelineItemBinding::OnPropertyLinked(Qt3DSDMPropertyHandle inPropertyHandle)
 {
     if (m_StudioSystem->GetAnimationSystem()->IsPropertyAnimated(m_DataHandle, inPropertyHandle)) {
         // Refresh property row by delete and recreate
@@ -1191,7 +1191,7 @@ void CUICDMTimelineItemBinding::UpdateKeyframe(IKeyframe *inKeyframe,
         m_Row->GetTimebar()->SetDirty(true);
 }
 
-void CUICDMTimelineItemBinding::OnAddChild(CUICDMInstanceHandle inInstance)
+void CUICDMTimelineItemBinding::OnAddChild(Qt3DSDMInstanceHandle inInstance)
 {
     CDoc *theDoc = m_TransMgr->GetDoc();
     CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
@@ -1203,7 +1203,7 @@ void CUICDMTimelineItemBinding::OnAddChild(CUICDMInstanceHandle inInstance)
         // Only add if the asset is in the current active component, and it's a master asset or in
         // the current slide
         ITimelineItemBinding *theNextItem = nullptr;
-        qt3dsdm::CUICDMInstanceHandle theParentInstance = GetInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theParentInstance = GetInstance();
         // Figure out where to insert this row, if applicable.
         // CAsset has a list of children, and not necessarily all are active in this slide (e.g.
         // non-master children)
@@ -1223,7 +1223,7 @@ void CUICDMTimelineItemBinding::OnAddChild(CUICDMInstanceHandle inInstance)
     }
 }
 
-void CUICDMTimelineItemBinding::OnDeleteChild(CUICDMInstanceHandle inInstance)
+void CUICDMTimelineItemBinding::OnDeleteChild(Qt3DSDMInstanceHandle inInstance)
 {
     ITimelineItemBinding *theChild = m_TransMgr->GetOrCreate(inInstance);
     if (theChild) {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.h
index 70bef066..6498c74c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemBinding.h
@@ -70,13 +70,13 @@ class CUICDMTimelineItemBinding : public ITimelineItemBinding,
 
 {
 protected: // Typedef
-    typedef std::map<qt3dsdm::CUICDMPropertyHandle, CUICDMTimelineItemProperty *> TPropertyBindingMap;
+    typedef std::map<qt3dsdm::Qt3DSDMPropertyHandle, CUICDMTimelineItemProperty *> TPropertyBindingMap;
     typedef std::vector<CUICDMAssetTimelineKeyframe> TAssetKeyframeList;
 
 protected:
     CBaseStateRow *m_Row;
     CTimelineTranslationManager *m_TransMgr;
-    qt3dsdm::CUICDMInstanceHandle m_DataHandle;
+    qt3dsdm::Qt3DSDMInstanceHandle m_DataHandle;
     ITimelineItemBinding *m_Parent;
     ITimelineTimebar *m_TimelineTimebar;
     TPropertyBindingMap m_PropertyBindingMap;
@@ -88,15 +88,15 @@ protected:
 
 public:
     CUICDMTimelineItemBinding(CTimelineTranslationManager *inMgr,
-                              qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                              qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     CUICDMTimelineItemBinding(CTimelineTranslationManager *inMgr);
     virtual ~CUICDMTimelineItemBinding();
 
 protected:
-    bool UICDMGetBoolean(qt3dsdm::CUICDMPropertyHandle inProperty) const;
-    void UICDMSetBoolean(qt3dsdm::CUICDMPropertyHandle inProperty, bool inValue,
+    bool UICDMGetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const;
+    void UICDMSetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty, bool inValue,
                          const QString &inNiceText) const;
-    void SetInstanceHandle(qt3dsdm::CUICDMInstanceHandle inDataHandle);
+    void SetInstanceHandle(qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
 
 public:
     // ITimelineItem
@@ -167,26 +167,26 @@ public:
     void SelectKeyframes(bool inSelected, long inTime = -1) override;
 
     // IUICDMSelectable
-    virtual qt3dsdm::CUICDMInstanceHandle GetInstanceHandle() const;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInstanceHandle() const;
 
     // IDragable
     long GetFlavor() const override;
 
     void OnBeginDataModelNotifications() override;
     void OnEndDataModelNotifications() override;
-    void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) override;
-    void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    void OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override;
+    void OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                                     long inInstanceCount) override;
     void RefreshStateRow(bool inRefreshChildren = false);
 
-    virtual void AddPropertyRow(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+    virtual void AddPropertyRow(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                 bool inAppend = false);
-    virtual void RemovePropertyRow(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
-    virtual void RefreshPropertyKeyframe(qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
+    virtual void RemovePropertyRow(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
+    virtual void RefreshPropertyKeyframe(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
                                          qt3dsdm::CUICDMKeyframeHandle,
                                          ETimelineKeyframeTransaction inTransaction);
-    virtual void OnPropertyChanged(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
-    virtual void OnPropertyLinked(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
+    virtual void OnPropertyChanged(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
+    virtual void OnPropertyLinked(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
 
     virtual void UIRefreshPropertyKeyframe(long inOffset);
     // Keyframe manipulation
@@ -195,20 +195,20 @@ public:
     virtual void DoSelectKeyframes(bool inSelected, long inTime, bool inUpdateUI);
     virtual void OnPropertySelection(long inTime);
 
-    virtual void OnAddChild(qt3dsdm::CUICDMInstanceHandle inInstance);
-    virtual void OnDeleteChild(qt3dsdm::CUICDMInstanceHandle inInstance);
+    virtual void OnAddChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+    virtual void OnDeleteChild(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
     void UpdateActionStatus();
 
     Q3DStudio::CId GetGuid() const;
 
     // Bridge between asset & UICDM. Ideally we should be fully UICDM
-    virtual qt3dsdm::CUICDMInstanceHandle GetInstance() const;
+    virtual qt3dsdm::Qt3DSDMInstanceHandle GetInstance() const;
 
 protected:
     virtual ITimelineTimebar *CreateTimelineTimebar();
-    ITimelineItemProperty *GetPropertyBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
-    ITimelineItemProperty *GetOrCreatePropertyBinding(qt3dsdm::CUICDMPropertyHandle inPropertyHandle);
+    ITimelineItemProperty *GetPropertyBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
+    ITimelineItemProperty *GetOrCreatePropertyBinding(qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle);
     void RemoveAllPropertyBindings();
     void AddKeyframes(ITimelineItemProperty *inPropertyBinding);
     bool
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.cpp
index 2e83be77..619ac860 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.cpp
@@ -73,8 +73,8 @@ inline float UICDMToColor(float inValue)
 }
 
 CUICDMTimelineItemProperty::CUICDMTimelineItemProperty(CTimelineTranslationManager *inTransMgr,
-                                                       CUICDMPropertyHandle inPropertyHandle,
-                                                       CUICDMInstanceHandle inInstance)
+                                                       Qt3DSDMPropertyHandle inPropertyHandle,
+                                                       Qt3DSDMInstanceHandle inInstance)
     : m_Row(nullptr)
     , m_InstanceHandle(inInstance)
     , m_PropertyHandle(inPropertyHandle)
@@ -145,7 +145,7 @@ void CUICDMTimelineItemProperty::ReleaseKeyframes()
 }
 
 // Type doesn't change and due to the logic required to figure this out, cache it.
-void CUICDMTimelineItemProperty::InitializeCachedVariables(qt3dsdm::CUICDMInstanceHandle inInstance)
+void CUICDMTimelineItemProperty::InitializeCachedVariables(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     using namespace Q3DStudio;
     qt3dsdm::IPropertySystem *thePropertySystem = m_TransMgr->GetStudioSystem()->GetPropertySystem();
@@ -563,8 +563,8 @@ bool CUICDMTimelineItemProperty::CreateKeyframeIfNonExistent(
 }
 
 void CUICDMTimelineItemProperty::OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
-                                                             qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                             qt3dsdm::CUICDMPropertyHandle inProperty)
+                                                             qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                             qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     if (inInstance == m_InstanceHandle && inProperty == m_PropertyHandle) {
         // Re-bind to keyframes because the ones we should be pointing to will have changed.
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.h
index 325b4600..a1107d7c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineItemProperty.h
@@ -51,8 +51,8 @@ class CUICDMTimelineItemProperty : public ITimelineItemProperty
 {
 public:
     CUICDMTimelineItemProperty(CTimelineTranslationManager *inTransMgr,
-                               qt3dsdm::CUICDMPropertyHandle inPropertyHandle,
-                               qt3dsdm::CUICDMInstanceHandle inInstance);
+                               qt3dsdm::Qt3DSDMPropertyHandle inPropertyHandle,
+                               qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     virtual ~CUICDMTimelineItemProperty();
 
     // ITimelineProperty
@@ -91,12 +91,12 @@ public:
     void RefreshKeyFrames(void);
 
 protected:
-    void InitializeCachedVariables(qt3dsdm::CUICDMInstanceHandle inInstance);
+    void InitializeCachedVariables(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     bool CreateKeyframeIfNonExistent(qt3dsdm::CUICDMKeyframeHandle inKeyframe,
                                      qt3dsdm::CUICDMAnimationHandle inOwningAnimation);
     void OnPropertyLinkStatusChanged(qt3dsdm::CUICDMSlideHandle inSlide,
-                                     qt3dsdm::CUICDMInstanceHandle inInstance,
-                                     qt3dsdm::CUICDMPropertyHandle inProperty);
+                                     qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                     qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void CreateKeyframes();
     void ReleaseKeyframes();
 
@@ -104,8 +104,8 @@ protected:
     typedef std::vector<CUICDMTimelineKeyframe *> TKeyframeList;
 
     CPropertyRow *m_Row;
-    qt3dsdm::CUICDMInstanceHandle m_InstanceHandle;
-    qt3dsdm::CUICDMPropertyHandle m_PropertyHandle;
+    qt3dsdm::Qt3DSDMInstanceHandle m_InstanceHandle;
+    qt3dsdm::Qt3DSDMPropertyHandle m_PropertyHandle;
     CTimelineTranslationManager *m_TransMgr;
     std::vector<qt3dsdm::CUICDMAnimationHandle> m_AnimationHandles;
     TKeyframeList m_Keyframes;
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.cpp
index 533f650c..93fa0591 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.cpp
@@ -54,7 +54,7 @@
 
 CUICDMTimelineTimebar::CUICDMTimelineTimebar(
     CTimelineTranslationManager *inTimelineTranslationManager,
-    qt3dsdm::CUICDMInstanceHandle inDataHandle)
+    qt3dsdm::Qt3DSDMInstanceHandle inDataHandle)
     : Q3DStudio::CUpdateableDocumentEditor(*inTimelineTranslationManager->GetDoc())
     , m_TimelineTranslationManager(inTimelineTranslationManager)
     , m_PropertySystem(inTimelineTranslationManager->GetStudioSystem()->GetPropertySystem())
@@ -83,8 +83,8 @@ CUICDMTimelineTimebar::CUICDMTimelineTimebar(
     OnPropertyChanged(m_DataHandle, theClientDataModelBridge->GetSceneAsset().m_TimebarText);
 }
 
-void CUICDMTimelineTimebar::OnPropertyChanged(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                              qt3dsdm::CUICDMPropertyHandle inProperty)
+void CUICDMTimelineTimebar::OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                              qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     if (m_DataHandle == inInstance) {
         bool needsInvalidate = false;
@@ -165,8 +165,8 @@ CUICDMTimelineTimebar::~CUICDMTimelineTimebar()
 // TODO: Can we put this on IInstancePropertyCore?
 template <typename T>
 T GetInstancePropertyValue(qt3dsdm::IPropertySystem *inPropertySystem,
-                           qt3dsdm::CUICDMInstanceHandle inInstanceHandle,
-                           qt3dsdm::CUICDMPropertyHandle inProperty)
+                           qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle,
+                           qt3dsdm::Qt3DSDMPropertyHandle inProperty)
 {
     qt3dsdm::SValue theValue;
     inPropertySystem->GetInstancePropertyValue(inInstanceHandle, inProperty, theValue);
@@ -237,7 +237,7 @@ void CUICDMTimelineTimebar::SetTimebarColor(const ::CColor &inColor)
 {
     using namespace Q3DStudio;
     if (inColor != m_Color) {
-        qt3dsdm::CUICDMInstanceHandle theHandle = m_DataHandle;
+        qt3dsdm::Qt3DSDMInstanceHandle theHandle = m_DataHandle;
         SCOPED_DOCUMENT_EDITOR(*m_TimelineTranslationManager->GetDoc(), QObject::tr("Set Timebar Color"))
             ->SetTimebarColor(theHandle, inColor);
     }
@@ -247,7 +247,7 @@ void CUICDMTimelineTimebar::SetTimebarComment(const Q3DStudio::CString &inCommen
 {
     using namespace Q3DStudio;
     if (inComment != m_Comment) {
-        qt3dsdm::CUICDMInstanceHandle theHandle = m_DataHandle;
+        qt3dsdm::Qt3DSDMInstanceHandle theHandle = m_DataHandle;
         SCOPED_DOCUMENT_EDITOR(*m_TimelineTranslationManager->GetDoc(), QObject::tr("Set Timebar Text"))
             ->SetTimebarText(theHandle, inComment);
     }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.h
index 7a36e699..c8789663 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/UICDMTimelineTimebar.h
@@ -56,20 +56,20 @@ class CUICDMTimelineTimebar : public ITimelineTimebar, public Q3DStudio::CUpdate
 {
 public:
     CUICDMTimelineTimebar(CTimelineTranslationManager *inTimelineTranslationManager,
-                          qt3dsdm::CUICDMInstanceHandle inDataHandle);
+                          qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
     virtual ~CUICDMTimelineTimebar();
 
 protected:
     CTimelineTranslationManager *m_TimelineTranslationManager;
     qt3dsdm::IPropertySystem *m_PropertySystem;
-    qt3dsdm::CUICDMInstanceHandle m_DataHandle; // The Instance Handle for this Timeline Timeber.
-    qt3dsdm::CUICDMPropertyHandle m_StartTime;
-    qt3dsdm::CUICDMPropertyHandle m_EndTime;
+    qt3dsdm::Qt3DSDMInstanceHandle m_DataHandle; // The Instance Handle for this Timeline Timeber.
+    qt3dsdm::Qt3DSDMPropertyHandle m_StartTime;
+    qt3dsdm::Qt3DSDMPropertyHandle m_EndTime;
     ::CColor m_Color; // Timebar color
     Q3DStudio::CString m_Comment; // Timebar comment text
     std::shared_ptr<qt3dsdm::ISignalConnection> m_PropertyChangedSignal;
-    void OnPropertyChanged(qt3dsdm::CUICDMInstanceHandle inInstance,
-                           qt3dsdm::CUICDMPropertyHandle inProperty);
+    void OnPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                           qt3dsdm::Qt3DSDMPropertyHandle inProperty);
 
 public:
     // ITimelineTimebar
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
index 82fbcc05..eb59da9a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
@@ -161,7 +161,7 @@ void CTimelineControl::ViewSlide(qt3dsdm::CUICDMSlideHandle inSlide)
     m_ActiveSlide = inSlide;
 
     qt3dsdm::ISlideSystem *theSlideSystem = GetDoc()->GetStudioSystem()->GetSlideSystem();
-    qt3dsdm::CUICDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(inSlide);
+    qt3dsdm::Qt3DSDMInstanceHandle theSlideInstance = theSlideSystem->GetSlideInstance(inSlide);
     CSlideRow *theSlideRow = new CSlideRow(m_TranslationManager->GetOrCreate(theSlideInstance));
     theSlideRow->SetTimelineControl(this);
 
diff --git a/src/Authoring/Studio/Render/StudioPickValues.h b/src/Authoring/Studio/Render/StudioPickValues.h
index 57eb2884..6cb7563b 100644
--- a/src/Authoring/Studio/Render/StudioPickValues.h
+++ b/src/Authoring/Studio/Render/StudioPickValues.h
@@ -36,7 +36,7 @@
 
 namespace qt3ds {
 namespace studio {
-    using qt3dsdm::CUICDMInstanceHandle;
+    using qt3dsdm::Qt3DSDMInstanceHandle;
     using qt3dsdm::CUICDMGuideHandle;
 
     struct StudioPickValueTypes
@@ -89,7 +89,7 @@ namespace studio {
     };
 
     template <>
-    struct SStudioPickValueTypeMap<CUICDMInstanceHandle>
+    struct SStudioPickValueTypeMap<Qt3DSDMInstanceHandle>
     {
         static StudioPickValueTypes::Enum GetType() { return StudioPickValueTypes::Instance; }
     };
@@ -116,7 +116,7 @@ namespace studio {
     {
         typedef StudioPickValueTypes::Enum TIdType;
         enum {
-            TBufferSize = Q3DStudio::StaticMaxSize<qt3dsdm::CUICDMInstanceHandle,
+            TBufferSize = Q3DStudio::StaticMaxSize<qt3dsdm::Qt3DSDMInstanceHandle,
                                                    SWidgetPick,
                                                    qt3dsdm::CUICDMGuideHandle,
                                                    SPathPick>::value
@@ -135,7 +135,7 @@ namespace studio {
         {
             switch (inType) {
             case StudioPickValueTypes::Instance:
-                return inVisitor(*qt3ds::NVUnionCast<qt3dsdm::CUICDMInstanceHandle *>(inData));
+                return inVisitor(*qt3ds::NVUnionCast<qt3dsdm::Qt3DSDMInstanceHandle *>(inData));
             case StudioPickValueTypes::Widget:
                 return inVisitor(*qt3ds::NVUnionCast<SWidgetPick *>(inData));
             case StudioPickValueTypes::Guide:
@@ -154,7 +154,7 @@ namespace studio {
         {
             switch (inType) {
             case StudioPickValueTypes::Instance:
-                return inVisitor(*qt3ds::NVUnionCast<const qt3dsdm::CUICDMInstanceHandle *>(inData));
+                return inVisitor(*qt3ds::NVUnionCast<const qt3dsdm::Qt3DSDMInstanceHandle *>(inData));
             case StudioPickValueTypes::Widget:
                 return inVisitor(*qt3ds::NVUnionCast<const SWidgetPick *>(inData));
             case StudioPickValueTypes::Guide:
@@ -179,7 +179,7 @@ namespace studio {
     struct SStudioPickValue : public TStudioPickValueType
     {
         SStudioPickValue() {}
-        SStudioPickValue(CUICDMInstanceHandle inst)
+        SStudioPickValue(Qt3DSDMInstanceHandle inst)
             : TStudioPickValueType(inst)
         {
         }
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp
index f9962c6f..8d1873f5 100644
--- a/src/Authoring/Studio/Render/StudioRenderer.cpp
+++ b/src/Authoring/Studio/Render/StudioRenderer.cpp
@@ -125,7 +125,7 @@ struct SRendererImpl : public IStudioRenderer,
     }
 
     // IDocSceneGraph
-    QT3DSVec3 GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inHandle, CPt inPoint) override
+    QT3DSVec3 GetIntendedPosition(qt3dsdm::Qt3DSDMInstanceHandle inHandle, CPt inPoint) override
     {
         if (m_Translation)
             return m_Translation->GetIntendedPosition(inHandle, inPoint);
@@ -339,7 +339,7 @@ struct SRendererImpl : public IStudioRenderer,
 
     void EditCameraZoomToFit() override
     {
-        qt3dsdm::CUICDMInstanceHandle theInstance = m_Doc.GetSelectedInstance();
+        qt3dsdm::Qt3DSDMInstanceHandle theInstance = m_Doc.GetSelectedInstance();
         if (!m_Translation || m_Translation->m_EditCameraEnabled == false)
             return;
         // If we aren't pointed at a node then bounce up the asset graph till we are.
@@ -420,7 +420,7 @@ struct SRendererImpl : public IStudioRenderer,
 
     // Fired during 3d drag or mouse move events (or keyframe drag) or likewise
     // events so that views that need to update based on the new data can.
-    void OnImmediateRefreshInstanceSingle(qt3dsdm::CUICDMInstanceHandle inInstance) override
+    void OnImmediateRefreshInstanceSingle(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override
     {
         if (m_Translation) {
             m_Translation->MarkDirty(inInstance);
@@ -429,7 +429,7 @@ struct SRendererImpl : public IStudioRenderer,
         }
     }
     // Same thing, but fired when more than one instance is being refreshed.
-    void OnImmediateRefreshInstanceMultiple(qt3dsdm::CUICDMInstanceHandle *inInstance,
+    void OnImmediateRefreshInstanceMultiple(qt3dsdm::Qt3DSDMInstanceHandle *inInstance,
                                                     long inInstanceCount) override
     {
         // Pass to translation system
@@ -441,7 +441,7 @@ struct SRendererImpl : public IStudioRenderer,
         Render();
     }
 
-    void OnReloadEffectInstance(qt3dsdm::CUICDMInstanceHandle inInstance) override
+    void OnReloadEffectInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance) override
     {
         if (m_Translation)
             m_Translation->ReleaseEffect(inInstance);
@@ -544,7 +544,7 @@ struct SRendererImpl : public IStudioRenderer,
 
     void OnSelectionChange() { RequestRender(); }
 
-    qt3dsdm::CUICDMInstanceHandle GetAnchorPointFromPick(SPathPick &inPick)
+    qt3dsdm::Qt3DSDMInstanceHandle GetAnchorPointFromPick(SPathPick &inPick)
     {
         return m_Translation->GetAnchorPoint(inPick);
     }
@@ -580,7 +580,7 @@ struct SRendererImpl : public IStudioRenderer,
             m_RenderContext->EndRender();
             // If we definitely did not pick a widget.
             if (m_PickResult.getType() == StudioPickValueTypes::Instance) {
-                qt3dsdm::CUICDMInstanceHandle theHandle(m_PickResult.getData<CUICDMInstanceHandle>());
+                qt3dsdm::Qt3DSDMInstanceHandle theHandle(m_PickResult.getData<Qt3DSDMInstanceHandle>());
 
                 if (theHandle != m_Doc.GetSelectedInstance())
                     m_Doc.SelectUICDMObject(theHandle);
@@ -588,7 +588,7 @@ struct SRendererImpl : public IStudioRenderer,
                 m_Doc.NotifySelectionChanged(m_PickResult.getData<qt3dsdm::CUICDMGuideHandle>());
             else if (m_PickResult.getType() == StudioPickValueTypes::Path) {
                 SPathPick thePick = m_PickResult.getData<SPathPick>();
-                qt3dsdm::CUICDMInstanceHandle theAnchorHandle =
+                qt3dsdm::Qt3DSDMInstanceHandle theAnchorHandle =
                     m_Translation->GetAnchorPoint(thePick);
                 if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) {
                     m_Doc.SelectUICDMObject(theAnchorHandle);
@@ -836,10 +836,10 @@ struct SRendererImpl : public IStudioRenderer,
             m_RenderContext->EndRender();
 
             if (theResult.getType() == StudioPickValueTypes::Instance)
-                m_Doc.SelectAndNavigateToUICDMObject(theResult.getData<CUICDMInstanceHandle>());
+                m_Doc.SelectAndNavigateToUICDMObject(theResult.getData<Qt3DSDMInstanceHandle>());
             else if (theResult.getType() == StudioPickValueTypes::Path) {
                 SPathPick thePickValue = theResult.getData<SPathPick>();
-                qt3dsdm::CUICDMInstanceHandle theAnchorHandle =
+                qt3dsdm::Qt3DSDMInstanceHandle theAnchorHandle =
                     m_Translation->GetAnchorPoint(thePickValue);
                 if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) {
                     m_Doc.SelectUICDMObject(theAnchorHandle);
diff --git a/src/Authoring/Studio/Render/StudioRendererImpl.h b/src/Authoring/Studio/Render/StudioRendererImpl.h
index 08d813e9..584a06a5 100644
--- a/src/Authoring/Studio/Render/StudioRendererImpl.h
+++ b/src/Authoring/Studio/Render/StudioRendererImpl.h
@@ -127,8 +127,8 @@ namespace studio {
     using qt3dsdm::SFloat3;
     using qt3dsdm::SLong4;
     using qt3dsdm::SComposerObjectDefinitions;
-    using qt3dsdm::CUICDMInstanceHandle;
-    using qt3dsdm::CUICDMPropertyHandle;
+    using qt3dsdm::Qt3DSDMInstanceHandle;
+    using qt3dsdm::Qt3DSDMPropertyHandle;
 }
 }
 #endif
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
index d5dbe058..f7fc26c3 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
@@ -76,16 +76,16 @@ using namespace qt3dsdm;
 struct STranslatorUICDMParser
 {
     STranslation &m_Context;
-    CUICDMInstanceHandle m_InstanceHandle;
-    STranslatorUICDMParser(STranslation &inContext, CUICDMInstanceHandle inInstance)
+    Qt3DSDMInstanceHandle m_InstanceHandle;
+    STranslatorUICDMParser(STranslation &inContext, Qt3DSDMInstanceHandle inInstance)
         : m_Context(inContext)
         , m_InstanceHandle(inInstance)
     {
     }
-    CUICDMInstanceHandle GetInstanceHandle() { return m_InstanceHandle; }
+    Qt3DSDMInstanceHandle GetInstanceHandle() { return m_InstanceHandle; }
 
     template <typename TDataType>
-    inline Option<TDataType> GetPropertyValue(qt3dsdm::CUICDMPropertyHandle inProperty)
+    inline Option<TDataType> GetPropertyValue(qt3dsdm::Qt3DSDMPropertyHandle inProperty)
     {
         Option<SValue> theValue =
             m_Context.m_Reader.GetRawInstancePropertyValue(GetInstanceHandle(), inProperty);
@@ -94,7 +94,7 @@ struct STranslatorUICDMParser
         return Empty();
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, QT3DSF32 &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, QT3DSF32 &outValue)
     {
         Option<float> theValue = GetPropertyValue<float>(inProperty);
         if (theValue.hasValue()) {
@@ -104,7 +104,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, QT3DSU32 &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, QT3DSU32 &outValue)
     {
         auto theValue = GetPropertyValue<qt3ds::QT3DSI32>(inProperty);
         if (theValue.hasValue()) {
@@ -114,7 +114,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, QT3DSI32 &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, QT3DSI32 &outValue)
     {
         auto theValue = GetPropertyValue<qt3ds::QT3DSI32>(inProperty);
         if (theValue.hasValue()) {
@@ -124,7 +124,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseRadianProperty(CUICDMPropertyHandle inProperty, QT3DSF32 &outValue)
+    bool ParseRadianProperty(Qt3DSDMPropertyHandle inProperty, QT3DSF32 &outValue)
     {
         if (ParseProperty(inProperty, outValue)) {
             TORAD(outValue);
@@ -132,7 +132,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseRadianProperty(CUICDMPropertyHandle inProperty, QT3DSVec3 &outValue)
+    bool ParseRadianProperty(Qt3DSDMPropertyHandle inProperty, QT3DSVec3 &outValue)
     {
         if (ParseProperty(inProperty, outValue)) {
             TORAD(outValue.x);
@@ -142,7 +142,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseOpacityProperty(CUICDMPropertyHandle inProperty, QT3DSF32 &outValue)
+    bool ParseOpacityProperty(Qt3DSDMPropertyHandle inProperty, QT3DSF32 &outValue)
     {
         if (ParseProperty(inProperty, outValue)) {
             outValue = (1.0f / 100.0f) * outValue;
@@ -150,7 +150,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseRotationOrder(CUICDMPropertyHandle inProperty, QT3DSU32 &outValue)
+    bool ParseRotationOrder(Qt3DSDMPropertyHandle inProperty, QT3DSU32 &outValue)
     {
         qt3ds::render::CRegisteredString temp;
         if (ParseProperty(inProperty, temp)) {
@@ -159,7 +159,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseOrientation(CUICDMPropertyHandle inProperty, qt3ds::render::NodeFlags &outValue)
+    bool ParseOrientation(Qt3DSDMPropertyHandle inProperty, qt3ds::render::NodeFlags &outValue)
     {
         qt3ds::render::CRegisteredString temp;
         if (ParseProperty(inProperty, temp)) {
@@ -170,7 +170,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, bool &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, bool &outValue)
     {
         Option<bool> theValue = GetPropertyValue<bool>(inProperty);
         if (theValue.hasValue()) {
@@ -179,7 +179,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseProperty(CUICDMPropertyHandle inProperty, QT3DSVec2 &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, QT3DSVec2 &outValue)
     {
         Option<qt3dsdm::SFloat2> theValue = GetPropertyValue<qt3dsdm::SFloat2>(inProperty);
         if (theValue.hasValue()) {
@@ -188,7 +188,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseProperty(CUICDMPropertyHandle inProperty, QT3DSVec3 &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, QT3DSVec3 &outValue)
     {
         Option<SFloat3> theValue = GetPropertyValue<SFloat3>(inProperty);
         if (theValue.hasValue()) {
@@ -197,7 +197,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::CRegisteredString &outValue)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, qt3ds::render::CRegisteredString &outValue)
     {
         Option<qt3dsdm::TDataStrPtr> theValue = GetPropertyValue<qt3dsdm::TDataStrPtr>(inProperty);
         if (theValue.hasValue() && *theValue) {
@@ -208,7 +208,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseAndResolveSourcePath(qt3dsdm::CUICDMPropertyHandle inProperty,
+    bool ParseAndResolveSourcePath(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                    qt3ds::render::CRegisteredString &outValue)
     {
         if (ParseProperty(inProperty, outValue)) {
@@ -225,7 +225,7 @@ struct STranslatorUICDMParser
     }
 
     template <typename TEnumType>
-    bool ParseEnumProperty(qt3dsdm::CUICDMPropertyHandle inProperty, TEnumType &ioValue)
+    bool ParseEnumProperty(qt3dsdm::Qt3DSDMPropertyHandle inProperty, TEnumType &ioValue)
     {
         qt3ds::render::CRegisteredString temp;
         if (ParseProperty(inProperty, temp)) {
@@ -245,7 +245,7 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseNodeFlagsProperty(qt3dsdm::CUICDMPropertyHandle inProperty,
+    bool ParseNodeFlagsProperty(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                 qt3ds::render::NodeFlags &outValue,
                                 qt3ds::render::NodeFlagValues::Enum theFlag)
     {
@@ -256,7 +256,7 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseNodeFlagsInverseProperty(qt3dsdm::CUICDMPropertyHandle inProperty,
+    bool ParseNodeFlagsInverseProperty(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                        qt3ds::render::NodeFlags &outValue,
                                        qt3ds::render::NodeFlagValues::Enum theFlag)
     {
@@ -267,11 +267,11 @@ struct STranslatorUICDMParser
         }
         return false;
     }
-    bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SImage *&ioImage)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, qt3ds::render::SImage *&ioImage)
     {
         Option<SLong4> theData = GetPropertyValue<SLong4>(inProperty);
         if (theData.hasValue()) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(
                 m_Context.m_Reader.GetInstanceForGuid(*theData));
             SGraphObjectTranslator *imageTranslator = m_Context.GetOrCreateTranslator(theInstance);
             if (imageTranslator
@@ -286,11 +286,11 @@ struct STranslatorUICDMParser
         return false;
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SGraphObject *&ioObjRef)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, qt3ds::render::SGraphObject *&ioObjRef)
     {
         Option<SObjectRefType> theData = GetPropertyValue<SObjectRefType>(inProperty);
         if (theData.hasValue()) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(
                 m_Context.m_Reader.GetInstanceForObjectRef(m_InstanceHandle, *theData));
             SGraphObjectTranslator *theItemTranslator =
                 m_Context.GetOrCreateTranslator(theInstance);
@@ -300,12 +300,12 @@ struct STranslatorUICDMParser
         return true;
     }
 
-    bool ParseProperty(CUICDMPropertyHandle inProperty, qt3ds::render::SNode *&ioNodePtr)
+    bool ParseProperty(Qt3DSDMPropertyHandle inProperty, qt3ds::render::SNode *&ioNodePtr)
     {
         Option<SObjectRefType> theData = GetPropertyValue<SObjectRefType>(inProperty);
         SNode *theNewNodePtr = nullptr;
         if (theData.hasValue()) {
-            qt3dsdm::CUICDMInstanceHandle theInstance(
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance(
                 m_Context.m_Reader.GetInstanceForObjectRef(m_InstanceHandle, *theData));
             SGraphObjectTranslator *theItemTranslator =
                 m_Context.GetOrCreateTranslator(theInstance);
@@ -520,7 +520,7 @@ struct STranslatorUICDMParser
 
 struct SSceneTranslator : public SGraphObjectTranslator
 {
-    SSceneTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SSceneTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SScene)())
     {
     }
@@ -535,7 +535,7 @@ struct SSceneTranslator : public SGraphObjectTranslator
         for (long idx = 0, end = inContext.m_AssetGraph.GetChildCount(GetInstanceHandle());
              idx < end; ++idx) {
             SGraphObjectTranslator::PushTranslation(inContext);
-            qt3dsdm::CUICDMInstanceHandle theLayer =
+            qt3dsdm::Qt3DSDMInstanceHandle theLayer =
                 inContext.m_AssetGraph.GetChild(GetInstanceHandle(), idx);
             SGraphObjectTranslator *theTranslator = inContext.GetOrCreateTranslator(theLayer);
             if (theTranslator
@@ -581,12 +581,12 @@ struct SSceneTranslator : public SGraphObjectTranslator
 
 struct SNodeTranslator : public SGraphObjectTranslator
 {
-    SNodeTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SNodeTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SNode)())
     {
         Initialize();
     }
-    SNodeTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, SNode &inNode)
+    SNodeTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, SNode &inNode)
         : SGraphObjectTranslator(inInstance, inNode)
     {
         Initialize();
@@ -652,7 +652,7 @@ struct SNodeTranslator : public SGraphObjectTranslator
 
 struct SLayerTranslator : public SNodeTranslator
 {
-    SLayerTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SLayerTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SLayer)())
     {
     }
@@ -698,7 +698,7 @@ struct SLayerTranslator : public SNodeTranslator
 };
 struct SLightTranslator : public SNodeTranslator
 {
-    SLightTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SLightTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SLight)())
     {
     }
@@ -716,7 +716,7 @@ struct SLightTranslator : public SNodeTranslator
 };
 struct SCameraTranslator : public SNodeTranslator
 {
-    SCameraTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SCameraTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SCamera)())
     {
     }
@@ -730,7 +730,7 @@ struct SCameraTranslator : public SNodeTranslator
 };
 struct SModelTranslator : public SNodeTranslator
 {
-    SModelTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SModelTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SModel)())
     {
     }
@@ -746,7 +746,7 @@ struct SModelTranslator : public SNodeTranslator
         theItem.m_FirstMaterial = nullptr;
         for (long idx = 0, end = inContext.m_AssetGraph.GetChildCount(GetInstanceHandle());
              idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theItemHandle =
+            qt3dsdm::Qt3DSDMInstanceHandle theItemHandle =
                 inContext.m_AssetGraph.GetChild(GetInstanceHandle(), idx);
             SGraphObjectTranslator *theTranslator = inContext.GetOrCreateTranslator(theItemHandle);
             if (theTranslator && IsMaterial(theTranslator->GetGraphObject())) {
@@ -800,7 +800,7 @@ static float ToFloat(const Option<SValue> &inValue)
 struct SPathSubPathTranslator : public SGraphObjectTranslator
 {
     eastl::vector<qt3ds::render::SPathAnchorPoint> m_PathBuffer;
-    SPathSubPathTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SPathSubPathTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SPathSubPath)())
     {
     }
@@ -815,7 +815,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator
         QT3DSU32 anchorCount = 0;
         for (QT3DSI32 idx = 0, end = inContext.m_AssetGraph.GetChildCount(GetInstanceHandle());
              idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theAnchor =
+            qt3dsdm::Qt3DSDMInstanceHandle theAnchor =
                 inContext.m_AssetGraph.GetChild(GetInstanceHandle(), idx);
             if (theReader.GetObjectTypeName(theAnchor) == L"PathAnchorPoint")
                 ++anchorCount;
@@ -823,7 +823,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator
         QT3DSU32 anchorIdx = 0;
         for (QT3DSI32 idx = 0, end = inContext.m_AssetGraph.GetChildCount(GetInstanceHandle());
              idx < end; ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theAnchor =
+            qt3dsdm::Qt3DSDMInstanceHandle theAnchor =
                 inContext.m_AssetGraph.GetChild(GetInstanceHandle(), idx);
             if (theReader.GetObjectTypeName(theAnchor) == L"PathAnchorPoint") {
                 SFloat2 theAnchorPos = ToFloat2(theReader.GetInstancePropertyValue(
@@ -859,7 +859,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator
 
 struct SPathTranslator : public SNodeTranslator
 {
-    SPathTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SPathTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SPath)())
     {
     }
@@ -897,7 +897,7 @@ struct SPathTranslator : public SNodeTranslator
 
 struct SDefaultMaterialTranslator : public SGraphObjectTranslator
 {
-    SDefaultMaterialTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
+    SDefaultMaterialTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SDefaultMaterial)())
     {
@@ -910,7 +910,7 @@ struct SDefaultMaterialTranslator : public SGraphObjectTranslator
         STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES
 
-        // qt3dsdm::CUICDMInstanceHandle parent = inContext.m_AssetGraph.GetParent(
+        // qt3dsdm::Qt3DSDMInstanceHandle parent = inContext.m_AssetGraph.GetParent(
         // GetInstanceHandle() );
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Lightmaps.m_LightmapIndirect,
                                 theItem.m_Lightmaps.m_LightmapIndirect);
@@ -928,7 +928,7 @@ struct SDefaultMaterialTranslator : public SGraphObjectTranslator
 
 struct SImageTranslator : public SGraphObjectTranslator
 {
-    SImageTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    SImageTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SImage)())
     {
     }
@@ -960,7 +960,7 @@ struct SImageTranslator : public SGraphObjectTranslator
 
 struct STextTranslator : public SNodeTranslator
 {
-    STextTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    STextTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SNodeTranslator(inInstance, *QT3DS_NEW(inAlloc, SText)())
     {
     }
@@ -990,7 +990,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator
     eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType> m_ConvertStr;
     TIdxToPropertyMap m_PropertyMap;
 
-    SDynamicObjectTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &,
+    SDynamicObjectTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &,
                              SDynamicObject &inObject)
         : SGraphObjectTranslator(inInstance, inObject)
     {
@@ -1010,7 +1010,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator
                 qt3ds::foundation::ConvertUTF(theDefinition.m_Name.c_str(), 0, m_ConvertStr);
                 const wchar_t *thePropName =
                     reinterpret_cast<const wchar_t *>(m_ConvertStr.c_str());
-                qt3dsdm::CUICDMPropertyHandle theProperty =
+                qt3dsdm::Qt3DSDMPropertyHandle theProperty =
                     inContext.m_Reader.FindProperty(GetInstanceHandle(), thePropName);
                 if (theProperty.Valid())
                     m_PropertyMap.push_back(eastl::make_pair(idx, theProperty.GetHandleValue()));
@@ -1021,7 +1021,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator
         for (TIdxToPropertyMap::iterator theIter = m_PropertyMap.begin(), end = m_PropertyMap.end();
              theIter != end; ++theIter) {
             const SPropertyDefinition &theDefinition(theProperties[theIter->first]);
-            qt3dsdm::CUICDMPropertyHandle theProperty = theIter->second;
+            qt3dsdm::Qt3DSDMPropertyHandle theProperty = theIter->second;
             // Sometimes it is possible to have dirty properties that no longer exist, e.g.
             // when undoing standard material -> custom material change. We just ignore changes
             // to such properties.
@@ -1104,7 +1104,7 @@ struct SEffectTranslator : public SDynamicObjectTranslator
     // TODO - move this map to inContext and have it looked up by name.
     IEffectSystem *m_EffectSystem;
 
-    SEffectTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc,
+    SEffectTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc,
                       SEffect &inEffect)
         : SDynamicObjectTranslator(inInstance, inAlloc, inEffect)
         , m_EffectSystem(nullptr)
@@ -1129,7 +1129,7 @@ struct SCustomMaterialTranslator : public SDynamicObjectTranslator
 {
     ICustomMaterialSystem *m_MaterialSystem;
 
-    SCustomMaterialTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
+    SCustomMaterialTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                               qt3ds::NVAllocatorCallback &inAlloc, SCustomMaterial &inMaterial)
         : SDynamicObjectTranslator(inInstance, inAlloc, inMaterial)
         , m_MaterialSystem(nullptr)
@@ -1164,7 +1164,7 @@ struct SCustomMaterialTranslator : public SDynamicObjectTranslator
 };
 struct SReferencedMaterialTranslator : public SGraphObjectTranslator
 {
-    SReferencedMaterialTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
+    SReferencedMaterialTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                   qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SReferencedMaterial)())
     {
@@ -1272,7 +1272,7 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
 {
     eastl::vector<SRenderPropertyValueUpdate> m_PropertyUpdates;
 
-    SRenderPluginTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
+    SRenderPluginTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                             qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SRenderPlugin)())
     {
@@ -1282,7 +1282,7 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
     {
         SRenderPlugin &theItem = static_cast<SRenderPlugin &>(GetGraphObject());
         // First, get the instance via resolving the source path.
-        CUICDMPropertyHandle sourcepath =
+        Qt3DSDMPropertyHandle sourcepath =
             inContext.m_Reader.FindProperty(GetInstanceHandle(), L"sourcepath");
         Option<SValue> theSourcePath =
             inContext.m_Reader.GetInstancePropertyValue(GetInstanceHandle(), sourcepath);
@@ -1428,18 +1428,18 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
 struct SAliasTranslator : public SGraphObjectTranslator
 {
     SGraphObjectTranslator *m_ReferenceTree;
-    CUICDMInstanceHandle m_ReferencedInstance;
-    SAliasTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
+    Qt3DSDMInstanceHandle m_ReferencedInstance;
+    SAliasTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3ds::NVAllocatorCallback &inAlloc)
         : SGraphObjectTranslator(inInstance, *QT3DS_NEW(inAlloc, SNode)())
         , m_ReferenceTree(nullptr)
     {
     }
     void RecurseAndCreateTranslators(STranslation &inContext,
-                                     qt3dsdm::CUICDMInstanceHandle inInstance)
+                                     qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     {
         for (QT3DSI32 idx = 0, end = inContext.m_AssetGraph.GetChildCount(inInstance); idx < end;
              ++idx) {
-            qt3dsdm::CUICDMInstanceHandle theChild = inContext.m_AssetGraph.GetChild(inInstance, idx);
+            qt3dsdm::Qt3DSDMInstanceHandle theChild = inContext.m_AssetGraph.GetChild(inInstance, idx);
             inContext.GetOrCreateTranslator(theChild, m_InstanceHandle);
             RecurseAndCreateTranslators(inContext, theChild);
         }
@@ -1449,7 +1449,7 @@ struct SAliasTranslator : public SGraphObjectTranslator
         STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
         Option<SObjectRefType> theData = theParser.GetPropertyValue<SObjectRefType>(
             inContext.m_ObjectDefinitions.m_Alias.m_ReferencedNode);
-        m_ReferencedInstance = CUICDMInstanceHandle();
+        m_ReferencedInstance = Qt3DSDMInstanceHandle();
         m_ReferenceTree = nullptr;
         ((SNode *)m_GraphObject)->m_Flags.SetDirty(true);
         if (theData.hasValue()) {
@@ -1462,7 +1462,7 @@ struct SAliasTranslator : public SGraphObjectTranslator
                     && !GraphObjectTypes::IsNodeType(m_ReferenceTree->GetGraphObject().m_Type)) {
                     QT3DS_ASSERT(false);
                     m_ReferenceTree = nullptr;
-                    m_ReferencedInstance = CUICDMInstanceHandle();
+                    m_ReferencedInstance = Qt3DSDMInstanceHandle();
                 } else {
                     RecurseAndCreateTranslators(inContext, m_ReferencedInstance);
                 }
@@ -1504,13 +1504,13 @@ struct SAliasTranslator : public SGraphObjectTranslator
             return *m_ReferenceTree->m_GraphObject;
         return *m_GraphObject;
     }
-    qt3dsdm::CUICDMInstanceHandle GetSceneGraphInstanceHandle() override
+    qt3dsdm::Qt3DSDMInstanceHandle GetSceneGraphInstanceHandle() override
     {
         if (m_ReferencedInstance.Valid())
             return m_ReferencedInstance;
         return m_InstanceHandle;
     }
-    CUICDMInstanceHandle GetInstanceHandle() override { return m_InstanceHandle; }
+    Qt3DSDMInstanceHandle GetInstanceHandle() override { return m_InstanceHandle; }
 
     SGraphObject &GetNonAliasedGraphObject() override { return *m_GraphObject; }
 };
@@ -1533,13 +1533,13 @@ bool STranslation::IncludeNode(const SNode &inNode)
     return false;
 }
 
-void STranslation::ReleaseEffect(qt3dsdm::CUICDMInstanceHandle inInstance)
+void STranslation::ReleaseEffect(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (m_Reader.IsInstance(inInstance) == false)
         return;
 
     qt3dsdm::ComposerObjectTypes::Enum theType = m_ObjectDefinitions.GetType(inInstance);
-    qt3dsdm::CUICDMInstanceHandle theParentClass = m_Reader.GetFirstBaseClass(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theParentClass = m_Reader.GetFirstBaseClass(inInstance);
 
     if (theType == NULL && theParentClass.Valid())
         theType = m_ObjectDefinitions.GetType(theParentClass);
@@ -1562,11 +1562,11 @@ void STranslation::ReleaseEffect(qt3dsdm::CUICDMInstanceHandle inInstance)
     }
 }
 
-SGraphObjectTranslator *STranslation::CreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance)
+SGraphObjectTranslator *STranslation::CreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     SGraphObjectTranslator *theNewTranslator = nullptr;
     qt3dsdm::ComposerObjectTypes::Enum theType = m_ObjectDefinitions.GetType(inInstance);
-    qt3dsdm::CUICDMInstanceHandle theParentClass = m_Reader.GetFirstBaseClass(inInstance);
+    qt3dsdm::Qt3DSDMInstanceHandle theParentClass = m_Reader.GetFirstBaseClass(inInstance);
     if (theType == NULL && theParentClass.Valid())
         theType = m_ObjectDefinitions.GetType(theParentClass);
 
@@ -1693,8 +1693,8 @@ bool CompareTranslator(const STranslation::THandleTranslatorPair &first,
 
 struct STranslatorPredicate
 {
-    CUICDMInstanceHandle m_Instance;
-    STranslatorPredicate(CUICDMInstanceHandle &ins)
+    Qt3DSDMInstanceHandle m_Instance;
+    STranslatorPredicate(Qt3DSDMInstanceHandle &ins)
         : m_Instance(ins)
     {
     }
@@ -1706,7 +1706,7 @@ struct STranslatorPredicate
 
 Option<STranslation::THandleTranslatorPair>
 FindTranslator(STranslation::THandleTranslatorPairList &inList,
-               CUICDMInstanceHandle inInstance = CUICDMInstanceHandle())
+               Qt3DSDMInstanceHandle inInstance = Qt3DSDMInstanceHandle())
 {
     STranslation::THandleTranslatorPairList::iterator iter =
         eastl::find_if(inList.begin(), inList.end(), STranslatorPredicate(inInstance));
@@ -1715,14 +1715,14 @@ FindTranslator(STranslation::THandleTranslatorPairList &inList,
     return Empty();
 }
 
-SGraphObjectTranslator *STranslation::GetOrCreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance)
+SGraphObjectTranslator *STranslation::GetOrCreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
-    return GetOrCreateTranslator(inInstance, CUICDMInstanceHandle());
+    return GetOrCreateTranslator(inInstance, Qt3DSDMInstanceHandle());
 }
 
 SGraphObjectTranslator *
-STranslation::GetOrCreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                    qt3dsdm::CUICDMInstanceHandle inAliasInstance)
+STranslation::GetOrCreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                    qt3dsdm::Qt3DSDMInstanceHandle inAliasInstance)
 {
     TInstanceToTranslatorMap::iterator theTranslatorList =
         m_TranslatorMap.insert(eastl::make_pair(inInstance, THandleTranslatorPairList())).first;
@@ -1747,22 +1747,22 @@ STranslation::GetOrCreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
 }
 
 STranslation::THandleTranslatorPairList &
-STranslation::GetTranslatorsForInstance(qt3dsdm::CUICDMInstanceHandle inInstance)
+STranslation::GetTranslatorsForInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     return m_TranslatorMap.insert(eastl::make_pair(inInstance, THandleTranslatorPairList()))
         .first->second;
 }
 
-qt3dsdm::CUICDMInstanceHandle STranslation::GetAnchorPoint(QT3DSU32 inAnchorIndex)
+qt3dsdm::Qt3DSDMInstanceHandle STranslation::GetAnchorPoint(QT3DSU32 inAnchorIndex)
 {
     SGraphObjectTranslator *thePathTranslator =
         static_cast<SGraphObjectTranslator *>(m_PathWidget->GetNode().m_UserData.m_UserData);
     if (thePathTranslator == nullptr)
-        return qt3dsdm::CUICDMInstanceHandle();
-    qt3dsdm::CUICDMInstanceHandle thePathHandle = thePathTranslator->GetInstanceHandle();
+        return qt3dsdm::Qt3DSDMInstanceHandle();
+    qt3dsdm::Qt3DSDMInstanceHandle thePathHandle = thePathTranslator->GetInstanceHandle();
     QT3DSU32 theAnchorIndex = 0;
     for (QT3DSI32 idx = 0, end = m_AssetGraph.GetChildCount(thePathHandle); idx < end; ++idx) {
-        qt3dsdm::CUICDMInstanceHandle theChildInstance = m_AssetGraph.GetChild(thePathHandle, idx);
+        qt3dsdm::Qt3DSDMInstanceHandle theChildInstance = m_AssetGraph.GetChild(thePathHandle, idx);
         if (m_Doc.GetDocumentReader().GetObjectTypeName(theChildInstance) == L"SubPath") {
             QT3DSI32 numAnchors = m_AssetGraph.GetChildCount(theChildInstance);
             QT3DSU32 endIndex = theAnchorIndex + (QT3DSU32)numAnchors;
@@ -1772,10 +1772,10 @@ qt3dsdm::CUICDMInstanceHandle STranslation::GetAnchorPoint(QT3DSU32 inAnchorInde
                 theAnchorIndex = endIndex;
         }
     }
-    return qt3dsdm::CUICDMInstanceHandle();
+    return qt3dsdm::Qt3DSDMInstanceHandle();
 }
 
-qt3dsdm::CUICDMInstanceHandle STranslation::GetAnchorPoint(SPathPick &inPick)
+qt3dsdm::Qt3DSDMInstanceHandle STranslation::GetAnchorPoint(SPathPick &inPick)
 {
     return GetAnchorPoint(inPick.m_AnchorIndex);
 }
@@ -1784,7 +1784,7 @@ namespace qt3ds {
 namespace studio {
     struct SEditCameraLayerTranslator : public SLayerTranslator
     {
-        SEditCameraLayerTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
+        SEditCameraLayerTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                                    qt3ds::NVAllocatorCallback &inAlloc)
             : SLayerTranslator(inInstance, inAlloc)
         {
@@ -1830,11 +1830,11 @@ STranslation::STranslation(IStudioRenderer &inRenderer, IUICRenderContext &inCon
 {
     m_EditCamera.m_Flags.SetActive(true);
     m_EditLight.m_Flags.SetActive(true);
-    qt3dsdm::CUICDMInstanceHandle theScene = m_AssetGraph.GetRoot(0);
+    qt3dsdm::Qt3DSDMInstanceHandle theScene = m_AssetGraph.GetRoot(0);
     m_GraphIterator.ClearResults();
     m_AssetGraph.GetDepthFirst(m_GraphIterator, theScene);
     for (; !m_GraphIterator.IsDone(); ++m_GraphIterator) {
-        qt3dsdm::CUICDMInstanceHandle theInstance(m_GraphIterator.GetCurrent());
+        qt3dsdm::Qt3DSDMInstanceHandle theInstance(m_GraphIterator.GetCurrent());
         GetOrCreateTranslator(theInstance);
     }
     qt3dsdm::IStudioFullSystemSignalProvider *theProvider = m_FullSystem.GetSignalProvider();
@@ -1888,7 +1888,7 @@ STranslation::STranslation(IStudioRenderer &inRenderer, IUICRenderContext &inCon
 }
 
 void STranslation::BuildRenderGraph(SGraphObjectTranslator &inParent,
-                                    CUICDMInstanceHandle inAliasHandle)
+                                    Qt3DSDMInstanceHandle inAliasHandle)
 {
     SGraphObjectTranslator &theParentTranslator(inParent);
     theParentTranslator.ClearChildren();
@@ -1908,7 +1908,7 @@ void STranslation::BuildRenderGraph(SGraphObjectTranslator &inParent,
         inAliasHandle = inParent.GetInstanceHandle();
     for (long idx = 0, end = m_AssetGraph.GetChildCount(inParent.GetSceneGraphInstanceHandle());
          idx < end; ++idx) {
-        qt3dsdm::CUICDMInstanceHandle theChild(
+        qt3dsdm::Qt3DSDMInstanceHandle theChild(
             m_AssetGraph.GetChild(inParent.GetSceneGraphInstanceHandle(), idx));
         SGraphObjectTranslator *theTranslator = GetOrCreateTranslator(theChild, inAliasHandle);
         if (theTranslator == nullptr)
@@ -1964,7 +1964,7 @@ void STranslation::BuildRenderGraph(SGraphObjectTranslator &inParent,
 }
 
 void STranslation::DeactivateScan(SGraphObjectTranslator &inParent,
-                                  CUICDMInstanceHandle inAliasHandle)
+                                  Qt3DSDMInstanceHandle inAliasHandle)
 {
     SGraphObjectTranslator &theParentTranslator(inParent);
     // Alias handles propagate down the scene graph.
@@ -1972,7 +1972,7 @@ void STranslation::DeactivateScan(SGraphObjectTranslator &inParent,
         inAliasHandle = inParent.GetInstanceHandle();
     for (long idx = 0, end = m_AssetGraph.GetChildCount(inParent.GetSceneGraphInstanceHandle());
          idx < end; ++idx) {
-        qt3dsdm::CUICDMInstanceHandle theChild(
+        qt3dsdm::Qt3DSDMInstanceHandle theChild(
             m_AssetGraph.GetChild(inParent.GetSceneGraphInstanceHandle(), idx));
         SGraphObjectTranslator *theTranslator = GetOrCreateTranslator(theChild, inAliasHandle);
         if (theTranslator == nullptr)
@@ -1983,8 +1983,8 @@ void STranslation::DeactivateScan(SGraphObjectTranslator &inParent,
 }
 
 // We build the render graph every time we render.  This may seem wasteful
-void STranslation::BuildRenderGraph(qt3dsdm::CUICDMInstanceHandle inParent,
-                                    CUICDMInstanceHandle inAliasHandle)
+void STranslation::BuildRenderGraph(qt3dsdm::Qt3DSDMInstanceHandle inParent,
+                                    Qt3DSDMInstanceHandle inAliasHandle)
 {
     SGraphObjectTranslator *theParentTranslator = GetOrCreateTranslator(inParent, inAliasHandle);
     if (theParentTranslator == nullptr)
@@ -2001,7 +2001,7 @@ void STranslation::ReleaseTranslation(Q3DStudio::TIdentifier inInstance)
     m_TranslatorMap.erase(inInstance);
 }
 
-void STranslation::MarkDirty(qt3dsdm::CUICDMInstanceHandle inInstance)
+void STranslation::MarkDirty(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     // Anchor points are not handled individually.
     if (m_Reader.GetObjectTypeName(inInstance) == L"PathAnchorPoint")
@@ -2309,7 +2309,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
 
         for (size_t selectedIdx = 0, selectedEnd = theHandles.size(); selectedIdx < selectedEnd;
              ++selectedIdx) {
-            qt3dsdm::CUICDMInstanceHandle theInstance = theHandles[selectedIdx];
+            qt3dsdm::Qt3DSDMInstanceHandle theInstance = theHandles[selectedIdx];
             if (theInstance
                 != m_Doc.GetDocumentReader().GetComponentForSlide(m_Doc.GetActiveSlide())) {
                 if (m_Doc.GetDocumentReader().GetObjectTypeName(theInstance)
@@ -2573,7 +2573,7 @@ bool STranslation::IsPathWidgetActive()
     qt3dsdm::TInstanceHandleList theHandles = m_Doc.GetSelectedValue().GetSelectedInstances();
     for (size_t selectedIdx = 0, selectedEnd = theHandles.size(); selectedIdx < selectedEnd;
          ++selectedIdx) {
-        qt3dsdm::CUICDMInstanceHandle theInstance(theHandles[selectedIdx]);
+        qt3dsdm::Qt3DSDMInstanceHandle theInstance(theHandles[selectedIdx]);
         if (m_Doc.GetDocumentReader().GetObjectTypeName(theInstance) == L"PathAnchorPoint")
             theInstance = m_AssetGraph.GetParent(m_AssetGraph.GetParent(theInstance));
         SGraphObjectTranslator *theTranslator = GetOrCreateTranslator(theInstance);
@@ -2798,7 +2798,7 @@ SStudioPickValue STranslation::Pick(CPt inMouseCoords, TranslationSelectMode::En
                     theModelPtr =
                         static_cast<const SNode *>(&theTranslator->GetNonAliasedGraphObject());
                 }
-                CUICDMInstanceHandle theActiveComponent =
+                Qt3DSDMInstanceHandle theActiveComponent =
                     m_Reader.GetComponentForSlide(m_Doc.GetActiveSlide());
                 if (inSelectMode == TranslationSelectMode::Group) {
                     // Bounce up the hierarchy till one of two conditions are met
@@ -2814,9 +2814,9 @@ SStudioPickValue STranslation::Pick(CPt inMouseCoords, TranslationSelectMode::En
                         SNode *parentNode = myNode->m_Parent;
                         SGraphObjectTranslator *theParentTranslator =
                             parentNode->m_UserData.DynamicCast<SGraphObjectTranslator>();
-                        CUICDMInstanceHandle myComponent =
+                        Qt3DSDMInstanceHandle myComponent =
                             m_Reader.GetAssociatedComponent(theTranslator->GetInstanceHandle());
-                        CUICDMInstanceHandle myParentComponent = m_Reader.GetAssociatedComponent(
+                        Qt3DSDMInstanceHandle myParentComponent = m_Reader.GetAssociatedComponent(
                             theParentTranslator->GetInstanceHandle());
                         if (parentNode->m_Type == GraphObjectTypes::Layer) {
                             if (myParentComponent != theActiveComponent)
@@ -2877,7 +2877,7 @@ qt3ds::foundation::Option<qt3dsdm::SGuideInfo> STranslation::PickRulers(CPt inMo
     return qt3ds::foundation::Option<qt3dsdm::SGuideInfo>();
 }
 
-QT3DSVec3 STranslation::GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inInstance, CPt inPos)
+QT3DSVec3 STranslation::GetIntendedPosition(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CPt inPos)
 {
     ClearDirtySet();
     SGraphObjectTranslator *theTranslator = GetOrCreateTranslator(inInstance);
@@ -2889,7 +2889,7 @@ QT3DSVec3 STranslation::GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inInst
     SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*theNode);
     {
         // Get the node's parent
-        CUICDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
+        Qt3DSDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
         SGraphObjectTranslator *theParentTranslator = GetOrCreateTranslator(theParent);
         if (theParentTranslator
             && GraphObjectTypes::IsNodeType(theParentTranslator->GetGraphObject().m_Type))
@@ -3556,7 +3556,7 @@ void STranslation::PerformGuideDrag(CUICDMGuideHandle inGuide, CPt inPoint,
         break;
     }
     inEditor.EnsureEditor(L"Drag Guide", __FILE__, __LINE__).UpdateGuide(inGuide, theInfo);
-    inEditor.FireImmediateRefresh(qt3dsdm::CUICDMInstanceHandle());
+    inEditor.FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle());
 }
 
 void STranslation::CheckGuideInPresentationRect(CUICDMGuideHandle inGuide,
@@ -3617,17 +3617,17 @@ void STranslation::PerformPathDrag(qt3ds::studio::SPathPick &inPathPick, CPt inO
         // Now find the anchor point; nontrivial.
         SPathTranslator *theTranslator =
             reinterpret_cast<SPathTranslator *>(thePrepResult->m_Node->m_UserData.m_UserData);
-        qt3dsdm::CUICDMInstanceHandle thePathHandle = theTranslator->GetInstanceHandle();
-        qt3dsdm::CUICDMInstanceHandle theAnchorHandle = GetAnchorPoint(inPathPick);
+        qt3dsdm::Qt3DSDMInstanceHandle thePathHandle = theTranslator->GetInstanceHandle();
+        qt3dsdm::Qt3DSDMInstanceHandle theAnchorHandle = GetAnchorPoint(inPathPick);
 
         if (theAnchorHandle.Valid()) {
-            qt3dsdm::CUICDMPropertyHandle thePosProperty =
+            qt3dsdm::Qt3DSDMPropertyHandle thePosProperty =
                 m_ObjectDefinitions.m_PathAnchorPoint.m_Position.m_Property;
-            qt3dsdm::CUICDMPropertyHandle theAngleProperty =
+            qt3dsdm::Qt3DSDMPropertyHandle theAngleProperty =
                 m_ObjectDefinitions.m_PathAnchorPoint.m_IncomingAngle.m_Property;
-            qt3dsdm::CUICDMPropertyHandle theIncomingDistanceProperty =
+            qt3dsdm::Qt3DSDMPropertyHandle theIncomingDistanceProperty =
                 m_ObjectDefinitions.m_PathAnchorPoint.m_IncomingDistance.m_Property;
-            qt3dsdm::CUICDMPropertyHandle theOutgoingDistanceProperty =
+            qt3dsdm::Qt3DSDMPropertyHandle theOutgoingDistanceProperty =
                 m_ObjectDefinitions.m_PathAnchorPoint.m_OutgoingDistance.m_Property;
 
             IDocumentReader &theReader(m_Doc.GetDocumentReader());
@@ -3721,10 +3721,10 @@ void STranslation::OnNudge(ENudgeDirection inDirection, int inToolmode, int inFl
     // Increment the acceleration for every 5 key presses
     float theAcceleration = static_cast<float>(qt3ds::foundation::floor(m_KeyRepeat / 5.0)) + 1.0f;
 
-    CUICDMPropertyHandle thePropertyHandle;
+    Qt3DSDMPropertyHandle thePropertyHandle;
     SFloat3 theValue;
     const wchar_t *theCommandName = L"";
-    qt3dsdm::CUICDMInstanceHandle theInstanceHandle = m_Doc.GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theInstanceHandle = m_Doc.GetSelectedInstance();
     CDispatchDataModelImmediateScope __dispatchScope(*m_Doc.GetCore()->GetDispatch(),
                                                      theInstanceHandle);
     // See what tool mode we are in
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h
index d2fada18..b3c9465a 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.h
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h
@@ -68,15 +68,15 @@ namespace studio {
     struct SGraphObjectTranslator
     {
     protected:
-        qt3dsdm::CUICDMInstanceHandle m_InstanceHandle;
+        qt3dsdm::Qt3DSDMInstanceHandle m_InstanceHandle;
 
     public:
         // This will never be null.  The reason it is a pointer is because
         // alias translators need to switch which graph object they point to
-        qt3dsdm::CUICDMInstanceHandle m_AliasInstanceHandle;
+        qt3dsdm::Qt3DSDMInstanceHandle m_AliasInstanceHandle;
         SGraphObject *m_GraphObject;
         QT3DSU32 m_DirtyIndex;
-        SGraphObjectTranslator(qt3dsdm::CUICDMInstanceHandle inInstance, SGraphObject &inObj)
+        SGraphObjectTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance, SGraphObject &inObj)
             : m_InstanceHandle(inInstance)
             , m_GraphObject(&inObj)
             , m_DirtyIndex(QT3DS_MAX_U32)
@@ -94,12 +94,12 @@ namespace studio {
         virtual void AppendChild(SGraphObject &inChild) = 0;
         virtual SGraphObject &GetGraphObject() { return *m_GraphObject; }
         virtual SGraphObject &GetNonAliasedGraphObject() { return *m_GraphObject; }
-        virtual qt3dsdm::CUICDMInstanceHandle GetInstanceHandle() { return m_InstanceHandle; }
-        virtual qt3dsdm::CUICDMInstanceHandle GetSceneGraphInstanceHandle()
+        virtual qt3dsdm::Qt3DSDMInstanceHandle GetInstanceHandle() { return m_InstanceHandle; }
+        virtual qt3dsdm::Qt3DSDMInstanceHandle GetSceneGraphInstanceHandle()
         {
             return m_InstanceHandle;
         }
-        virtual qt3dsdm::CUICDMInstanceHandle GetPossiblyAliasedInstanceHandle()
+        virtual qt3dsdm::Qt3DSDMInstanceHandle GetPossiblyAliasedInstanceHandle()
         {
             if (m_AliasInstanceHandle.Valid())
                 return m_AliasInstanceHandle;
@@ -325,13 +325,13 @@ namespace studio {
 
     struct STranslation : public qt3ds::render::IUICRenderNodeFilter
     {
-        typedef eastl::pair<qt3dsdm::CUICDMInstanceHandle, SGraphObjectTranslator *>
+        typedef eastl::pair<qt3dsdm::Qt3DSDMInstanceHandle, SGraphObjectTranslator *>
             THandleTranslatorPair;
         typedef eastl::vector<THandleTranslatorPair> THandleTranslatorPairList;
         // Now that we have aliases, one instance handle can map to several translators.  One
         // translator, however, only
         // maps to one instance handle.
-        typedef nvhash_map<qt3dsdm::CUICDMInstanceHandle, THandleTranslatorPairList, eastl::hash<int>>
+        typedef nvhash_map<qt3dsdm::Qt3DSDMInstanceHandle, THandleTranslatorPairList, eastl::hash<int>>
             TInstanceToTranslatorMap;
         IStudioRenderer &m_Renderer;
         IUICRenderContext &m_UICContext;
@@ -407,9 +407,9 @@ namespace studio {
             MarkDirty(inInstance);
         }
 
-        void MarkDirty(qt3dsdm::CUICDMInstanceHandle inInstance);
+        void MarkDirty(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
 
-        void MarkDirty(qt3dsdm::CUICDMInstanceHandle *inInstance, long inInstanceCount)
+        void MarkDirty(qt3dsdm::Qt3DSDMInstanceHandle *inInstance, long inInstanceCount)
         {
             for (long idx = 0; idx < inInstanceCount; ++idx)
                 MarkDirty(inInstance[idx]);
@@ -488,14 +488,14 @@ namespace studio {
             m_DirtySet.clear();
         }
         // We build the render graph every time we render.  This may seem wasteful
-        void BuildRenderGraph(qt3dsdm::CUICDMInstanceHandle inParent,
-                              CUICDMInstanceHandle inAliasHandle = qt3dsdm::CUICDMInstanceHandle());
+        void BuildRenderGraph(qt3dsdm::Qt3DSDMInstanceHandle inParent,
+                              Qt3DSDMInstanceHandle inAliasHandle = qt3dsdm::Qt3DSDMInstanceHandle());
         void
         BuildRenderGraph(SGraphObjectTranslator &inParent,
-                         qt3dsdm::CUICDMInstanceHandle inAliasHandle = qt3dsdm::CUICDMInstanceHandle());
+                         qt3dsdm::Qt3DSDMInstanceHandle inAliasHandle = qt3dsdm::Qt3DSDMInstanceHandle());
         void
         DeactivateScan(SGraphObjectTranslator &inParent,
-                       qt3dsdm::CUICDMInstanceHandle inAliasHandle = qt3dsdm::CUICDMInstanceHandle());
+                       qt3dsdm::Qt3DSDMInstanceHandle inAliasHandle = qt3dsdm::Qt3DSDMInstanceHandle());
         void PreRender();
         void Render(int inWidgetId, bool inDrawGuides);
         void EndRender();
@@ -514,7 +514,7 @@ namespace studio {
 
         SNode *GetSelectedNode()
         {
-            qt3dsdm::CUICDMInstanceHandle theHandle = m_Doc.GetSelectedInstance();
+            qt3dsdm::Qt3DSDMInstanceHandle theHandle = m_Doc.GetSelectedInstance();
             SGraphObjectTranslator *theTranslator = GetOrCreateTranslator(theHandle);
             if (theTranslator
                 && GraphObjectTypes::IsNodeType(theTranslator->GetGraphObject().m_Type))
@@ -559,7 +559,7 @@ namespace studio {
             inEditor.FireImmediateRefresh(m_Doc.GetSelectedInstance());
         }
 
-        QT3DSVec3 GetIntendedPosition(qt3dsdm::CUICDMInstanceHandle inInstance, CPt inPos);
+        QT3DSVec3 GetIntendedPosition(qt3dsdm::Qt3DSDMInstanceHandle inInstance, CPt inPos);
 
         void ApplyPositionalChange(QT3DSVec3 inDiff, SNode &inNode,
                                    CUpdateableDocumentEditor &inEditor);
@@ -633,19 +633,19 @@ namespace studio {
 
         SNode *GetEditCameraLayer();
 
-        void ReleaseEffect(qt3dsdm::CUICDMInstanceHandle inInstance);
+        void ReleaseEffect(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
         // Create a new translator for this type.  Do not add to any maps or anything else.
-        SGraphObjectTranslator *CreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance);
+        SGraphObjectTranslator *CreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
         // Returns the canonical translator for a given instance or creates a new translator if none
         // exist.
-        SGraphObjectTranslator *GetOrCreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance);
+        SGraphObjectTranslator *GetOrCreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
         // Create a new aliased translator for this type.
-        SGraphObjectTranslator *GetOrCreateTranslator(qt3dsdm::CUICDMInstanceHandle inInstance,
-                                                      qt3dsdm::CUICDMInstanceHandle inAliasInstance);
+        SGraphObjectTranslator *GetOrCreateTranslator(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                                      qt3dsdm::Qt3DSDMInstanceHandle inAliasInstance);
         THandleTranslatorPairList &
-        GetTranslatorsForInstance(qt3dsdm::CUICDMInstanceHandle inInstance);
-        qt3dsdm::CUICDMInstanceHandle GetAnchorPoint(SPathPick &inPick);
-        qt3dsdm::CUICDMInstanceHandle GetAnchorPoint(QT3DSU32 inAnchorIndex);
+        GetTranslatorsForInstance(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
+        qt3dsdm::Qt3DSDMInstanceHandle GetAnchorPoint(SPathPick &inPick);
+        qt3dsdm::Qt3DSDMInstanceHandle GetAnchorPoint(QT3DSU32 inAnchorIndex);
     };
 
     struct SDisableUseClearColor
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
index 1402a189..bccf7d34 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
@@ -1065,7 +1065,7 @@ Q3DStudio::CString CStudioApp::GetPasteType()
 bool CStudioApp::CanChangeTimebarColor()
 {
     bool theRetVal = true;
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = m_Core->GetDoc()->GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = m_Core->GetDoc()->GetSelectedInstance();
     if (!theSelectedInstance.Valid()
         || m_Core->GetDoc()->GetStudioSystem()->GetClientDataModelBridge()->IsSceneInstance(
                theSelectedInstance))
@@ -1108,7 +1108,7 @@ void CStudioApp::HandleDuplicateCommand()
 bool CStudioApp::CanDuplicateObject()
 {
     // Get the currently selected object
-    qt3dsdm::CUICDMInstanceHandle theSelectedInstance = m_Core->GetDoc()->GetSelectedInstance();
+    qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = m_Core->GetDoc()->GetSelectedInstance();
     if (!theSelectedInstance.Valid())
         return false;
 
@@ -1334,7 +1334,7 @@ CInspectableBase *CStudioApp::GetInspectableFromSelectable(Q3DStudio::SSelectedV
             CDoc *theDoc = m_Core->GetDoc();
             qt3dsdm::TInstanceHandleList theSelectedInstances =
                 theDoc->GetSelectedValue().GetSelectedInstances();
-            qt3dsdm::CUICDMInstanceHandle theSelectedInstance;
+            qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance;
             if (theSelectedInstances.size() == 1)
                 theSelectedInstance = theSelectedInstances[0];
 
@@ -1346,7 +1346,7 @@ CInspectableBase *CStudioApp::GetInspectableFromSelectable(Q3DStudio::SSelectedV
                 // Slide, scene or component
                 if (theSelectedInstance
                     == theBridge->GetOwningComponentInstance(theCurrentActiveSlide)) {
-                    CUICDMInstanceHandle theCurrentActiveSlideInstance =
+                    Qt3DSDMInstanceHandle theCurrentActiveSlideInstance =
                         theDoc->GetStudioSystem()->GetSlideSystem()->GetSlideInstance(
                             theCurrentActiveSlide);
 
diff --git a/src/Authoring/UICDM/Systems/ActionSystem.cpp b/src/Authoring/UICDM/Systems/ActionSystem.cpp
index 1f486d97..e6aebc0f 100644
--- a/src/Authoring/UICDM/Systems/ActionSystem.cpp
+++ b/src/Authoring/UICDM/Systems/ActionSystem.cpp
@@ -35,8 +35,8 @@ namespace qt3dsdm {
 
 CActionSystem::CActionSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
                              TSlideGraphCorePtr inSlideGraphCore, TActionCorePtr inActionCore,
-                             TSlideSystemPtr inSlideSystem, CUICDMInstanceHandle inActionInstance,
-                             CUICDMPropertyHandle inActionEyeball)
+                             TSlideSystemPtr inSlideSystem, Qt3DSDMInstanceHandle inActionInstance,
+                             Qt3DSDMPropertyHandle inActionEyeball)
     : m_DataCore(inDataCore)
     , m_SlideCore(inSlideCore)
     , m_SlideGraphCore(inSlideGraphCore)
@@ -49,13 +49,13 @@ CActionSystem::CActionSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
 }
 
 CUICDMActionHandle CActionSystem::CreateAction(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inOwner,
+                                               Qt3DSDMInstanceHandle inOwner,
                                                SLong4 inTriggerTargetObjects)
 {
     Q_ASSERT(inSlide.Valid() && inOwner.Valid());
 
     // Create Action instance handle that derives from Action instance
-    CUICDMInstanceHandle theActionInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle theActionInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theActionInstance, m_ActionInstance);
 
     // Associate Action instance handle with Slide
@@ -74,14 +74,14 @@ CUICDMActionHandle CActionSystem::CreateAction(CUICDMSlideHandle inSlide,
 
 void CActionSystem::DeleteAction(CUICDMActionHandle inAction)
 {
-    CUICDMInstanceHandle theActionInstance;
+    Qt3DSDMInstanceHandle theActionInstance;
     SActionInfo theActionInfo = m_ActionCore->GetActionInfo(inAction);
     m_ActionCore->DeleteAction(inAction, theActionInstance);
     m_DataCore->DeleteInstance(theActionInstance);
     GetSignalSender()->SendActionDeleted(inAction, theActionInfo.m_Slide, theActionInfo.m_Owner);
 }
 
-void CActionSystem::GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+void CActionSystem::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                TActionHandleList &outActions) const
 {
     // Get all actions that exist in inSlide
@@ -101,7 +101,7 @@ bool CActionSystem::GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
                                           CUICDMActionHandle inAction) const
 {
     SValue theValue;
-    CUICDMInstanceHandle theInstance = m_ActionCore->GetActionInstance(inAction);
+    Qt3DSDMInstanceHandle theInstance = m_ActionCore->GetActionInstance(inAction);
     // Get the eyeball property value from SlideCore. There is no animation on eyeball so we can
     // query SlideCore directly.
     m_SlideCore->GetInstancePropertyValue(inActiveSlide, theInstance, m_ActionEyeball, theValue);
@@ -113,7 +113,7 @@ bool CActionSystem::GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
 void CActionSystem::SetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
                                           CUICDMActionHandle inAction, bool inValue)
 {
-    CUICDMInstanceHandle theInstance = m_ActionCore->GetActionInstance(inAction);
+    Qt3DSDMInstanceHandle theInstance = m_ActionCore->GetActionInstance(inAction);
     // Set the eyeball property value to SlideCore.
     m_SlideCore->ForceSetInstancePropertyValue(inActiveSlide, theInstance, m_ActionEyeball,
                                                inValue);
diff --git a/src/Authoring/UICDM/Systems/ActionSystem.h b/src/Authoring/UICDM/Systems/ActionSystem.h
index 96e87476..fbf6835f 100644
--- a/src/Authoring/UICDM/Systems/ActionSystem.h
+++ b/src/Authoring/UICDM/Systems/ActionSystem.h
@@ -49,21 +49,21 @@ class CActionSystem : public IActionSystem
 
     TSlideSystemPtr m_SlideSystem;
 
-    CUICDMInstanceHandle m_ActionInstance;
-    CUICDMPropertyHandle m_ActionEyeball;
+    Qt3DSDMInstanceHandle m_ActionInstance;
+    Qt3DSDMPropertyHandle m_ActionEyeball;
 
     std::shared_ptr<ISignalItem> m_Signaller;
 
 public:
     CActionSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
                   TSlideGraphCorePtr inSlideGraphCore, TActionCorePtr inActionCore,
-                  TSlideSystemPtr inSlideSystem, CUICDMInstanceHandle inActionInstance,
-                  CUICDMPropertyHandle inActionEyeball);
+                  TSlideSystemPtr inSlideSystem, Qt3DSDMInstanceHandle inActionInstance,
+                  Qt3DSDMPropertyHandle inActionEyeball);
 
-    CUICDMActionHandle CreateAction(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    CUICDMActionHandle CreateAction(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                             SLong4 inTriggerTargetObjects) override;
     void DeleteAction(CUICDMActionHandle inAction) override;
-    void GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const override;
 
     bool GetActionEyeballValue(CUICDMSlideHandle inActiveSlide,
diff --git a/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.cpp b/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.cpp
index 1b4ad72f..6865ef07 100644
--- a/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.cpp
@@ -36,9 +36,9 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMActionHandle CActionCoreProducer::CreateAction(CUICDMInstanceHandle inInstance,
+CUICDMActionHandle CActionCoreProducer::CreateAction(Qt3DSDMInstanceHandle inInstance,
                                                      CUICDMSlideHandle inSlide,
-                                                     CUICDMInstanceHandle inOwner,
+                                                     Qt3DSDMInstanceHandle inOwner,
                                                      SLong4 inTriggerTargetObjects)
 {
     CUICDMActionHandle retval =
@@ -48,7 +48,7 @@ CUICDMActionHandle CActionCoreProducer::CreateAction(CUICDMInstanceHandle inInst
 }
 
 void CActionCoreProducer::DeleteAction(CUICDMActionHandle inAction,
-                                       CUICDMInstanceHandle &outInstance)
+                                       Qt3DSDMInstanceHandle &outInstance)
 {
     // Ensure action exists
     SAction *theAction = CSimpleActionCore::GetActionNF(inAction, m_Data->m_Objects);
@@ -64,7 +64,7 @@ const SActionInfo &CActionCoreProducer::GetActionInfo(CUICDMActionHandle inActio
     return m_Data->GetActionInfo(inAction);
 }
 
-void CActionCoreProducer::GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+void CActionCoreProducer::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                      TActionHandleList &outActions) const
 {
     return m_Data->GetActions(inSlide, inOwner, outActions);
@@ -75,7 +75,7 @@ void CActionCoreProducer::GetActions(CUICDMSlideHandle inSlide, TActionHandleLis
     return m_Data->GetActions(inSlide, outActions);
 }
 
-void CActionCoreProducer::GetActions(CUICDMInstanceHandle inOwner,
+void CActionCoreProducer::GetActions(Qt3DSDMInstanceHandle inOwner,
                                      TActionHandleList &outActions) const
 {
     return m_Data->GetActions(inOwner, outActions);
@@ -86,13 +86,13 @@ void CActionCoreProducer::GetActions(TActionHandleList &outActions) const
     return m_Data->GetActions(outActions);
 }
 
-CUICDMInstanceHandle CActionCoreProducer::GetActionInstance(CUICDMActionHandle inAction) const
+Qt3DSDMInstanceHandle CActionCoreProducer::GetActionInstance(CUICDMActionHandle inAction) const
 {
     return m_Data->GetActionInstance(inAction);
 }
 
 CUICDMActionHandle
-CActionCoreProducer::GetActionByInstance(CUICDMInstanceHandle inActionInstance) const
+CActionCoreProducer::GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const
 {
     return m_Data->GetActionByInstance(inActionInstance);
 }
diff --git a/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.h b/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.h
index 20e6569e..1c1fe255 100644
--- a/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.h
+++ b/src/Authoring/UICDM/Systems/Cores/ActionCoreProducer.h
@@ -59,17 +59,17 @@ public:
     IStringTable &GetStringTable() const override { return m_Data->GetStringTable(); }
     TStringTablePtr GetStringTablePtr() const override { return m_Data->GetStringTablePtr(); }
     // Action
-    CUICDMActionHandle CreateAction(CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
-                                    CUICDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
-    void DeleteAction(CUICDMActionHandle inAction, CUICDMInstanceHandle &outInstance) override;
+    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+                                    Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
+    void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
     const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
-    void GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                     TActionHandleList &outActions) const override;
     void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const override;
-    void GetActions(CUICDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
+    void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
     void GetActions(TActionHandleList &outActions) const override;
-    CUICDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
-    CUICDMActionHandle GetActionByInstance(CUICDMInstanceHandle inActionInstance) const override;
+    Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
+    CUICDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
 
     // Action Properties
     void SetTriggerObject(CUICDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
diff --git a/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.cpp b/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.cpp
index ad8698cb..ff420db7 100644
--- a/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.cpp
@@ -108,8 +108,8 @@ struct SLookupCacheDoUndoOp : public ITransaction
 };
 
 CUICDMAnimationHandle
-CAnimationCoreProducer::CreateAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                        CUICDMPropertyHandle inProperty, size_t inIndex,
+CAnimationCoreProducer::CreateAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                        Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                         EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
 {
     CUICDMAnimationHandle retval = m_Data->CreateAnimation(inSlide, inInstance, inProperty, inIndex,
@@ -145,8 +145,8 @@ void CAnimationCoreProducer::DeleteAnimation(CUICDMAnimationHandle inAnimation)
 }
 
 CUICDMAnimationHandle CAnimationCoreProducer::GetAnimation(CUICDMSlideHandle inSlide,
-                                                           CUICDMInstanceHandle inInstance,
-                                                           CUICDMPropertyHandle inProperty,
+                                                           Qt3DSDMInstanceHandle inInstance,
+                                                           Qt3DSDMPropertyHandle inProperty,
                                                            size_t inIndex) const
 {
     return m_Data->GetAnimation(inSlide, inInstance, inProperty, inIndex);
@@ -339,7 +339,7 @@ size_t CAnimationCoreProducer::GetKeyframeCount(CUICDMAnimationHandle inAnimatio
 }
 
 void CAnimationCoreProducer::OffsetAnimations(CUICDMSlideHandle inSlide,
-                                              CUICDMInstanceHandle inInstance,
+                                              Qt3DSDMInstanceHandle inInstance,
                                               long inMillisecondOffset)
 {
     float theOffsetSeconds = static_cast<float>(inMillisecondOffset) / 1000.f;
@@ -392,9 +392,9 @@ bool CAnimationCoreProducer::AnimationValid(CUICDMAnimationHandle inAnimation) c
 }
 
 void CAnimationCoreProducer::CopyAnimations(CUICDMSlideHandle inSourceSlide,
-                                            CUICDMInstanceHandle inSourceInstance,
+                                            Qt3DSDMInstanceHandle inSourceInstance,
                                             CUICDMSlideHandle inDestSlide,
-                                            CUICDMInstanceHandle inDestInstance)
+                                            Qt3DSDMInstanceHandle inDestInstance)
 {
     std::vector<SAnimationTrack *> theAnimations;
     for (THandleObjectMap::const_iterator iter = m_Data->m_Objects.begin(),
@@ -422,8 +422,8 @@ void CAnimationCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
 }
 
 TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationCreated(
-    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                               CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback)
+    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                               Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
 {
     return GetSignalProvider()->ConnectAnimationCreated(inCallback);
 }
@@ -433,8 +433,8 @@ TSignalConnectionPtr CAnimationCoreProducer::ConnectBeforeAnimationDeleted(
     return GetSignalProvider()->ConnectBeforeAnimationDeleted(inCallback);
 }
 TSignalConnectionPtr CAnimationCoreProducer::ConnectAnimationDeleted(
-    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                               CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback)
+    const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                               Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback)
 {
     return GetSignalProvider()->ConnectAnimationDeleted(inCallback);
 }
diff --git a/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.h b/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.h
index 1d180a6f..1d96dfb2 100644
--- a/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.h
+++ b/src/Authoring/UICDM/Systems/Cores/AnimationCoreProducer.h
@@ -65,18 +65,18 @@ public:
     // IAnimationManger implementation
 
     CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, size_t inIndex,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
                                           bool inFirstKeyframeDynamic) override;
     void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
-    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, size_t inIndex) const override;
+    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle 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, CUICDMInstanceHandle inInstance,
+    void GetSpecificInstanceAnimations(CUICDMSlideHandle 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, CUICDMInstanceHandle inInstance,
+    void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                           long inMillisecondOffset) override;
 
     void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
@@ -109,20 +109,20 @@ public:
     bool KeyframeValid(CUICDMKeyframeHandle inKeyframe) const override;
     bool AnimationValid(CUICDMAnimationHandle inAnimation) const override;
 
-    void CopyAnimations(CUICDMSlideHandle inSourceSlide, CUICDMInstanceHandle inSourceInstance,
-                        CUICDMSlideHandle inDestSlide, CUICDMInstanceHandle inDestInstance) override;
+    void CopyAnimations(CUICDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
+                        CUICDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
 
     // ITransactionProducer implementation
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
 
     TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, 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, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                                   Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override;
     TSignalConnectionPtr ConnectKeyframeInserted(
         const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
             &inCallback) override;
diff --git a/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.cpp b/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.cpp
index 6d52d171..f861de7c 100644
--- a/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.cpp
@@ -36,29 +36,29 @@
 #endif
 namespace qt3dsdm {
 
-CUICDMInstanceHandle CDataCoreProducer::CreateInstance(CUICDMInstanceHandle inTargetId)
+Qt3DSDMInstanceHandle CDataCoreProducer::CreateInstance(Qt3DSDMInstanceHandle inTargetId)
 {
-    CUICDMInstanceHandle retval = m_Data->CreateInstance(inTargetId);
+    Qt3DSDMInstanceHandle retval = m_Data->CreateInstance(inTargetId);
     CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
     GetDataCoreSender()->SignalInstanceCreated(retval);
     return retval;
 }
 
-inline tuple<CUICDMPropertyHandle, SUICDMPropertyDefinition>
-TransformProperty(CUICDMPropertyHandle inProperty, CSimpleDataCore &inData)
+inline tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>
+TransformProperty(Qt3DSDMPropertyHandle inProperty, CSimpleDataCore &inData)
 {
     return make_tuple(inProperty, inData.GetProperty(inProperty));
 }
 
-inline void SignalPropertyRemoved(CUICDMInstanceHandle inInstance,
-                                  tuple<CUICDMPropertyHandle, SUICDMPropertyDefinition> inData,
+inline void SignalPropertyRemoved(Qt3DSDMInstanceHandle inInstance,
+                                  tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition> inData,
                                   IDataCoreSignalSender *inSender)
 {
     inSender->SignalPropertyRemoved(inInstance, get<0>(inData), get<1>(inData).m_Name.wide_str(),
                                     get<1>(inData).m_Type);
 }
 
-void CDataCoreProducer::DeleteInstance(CUICDMInstanceHandle inInstance)
+void CDataCoreProducer::DeleteInstance(Qt3DSDMInstanceHandle inInstance)
 {
     TIntList theProperties;
     TIntList theInstances;
@@ -77,10 +77,10 @@ void CDataCoreProducer::DeleteInstance(CUICDMInstanceHandle inInstance)
                                         std::ref(m_Data->m_Objects), m_Consumer));
     }
 
-    vector<tuple<CUICDMPropertyHandle, SUICDMPropertyDefinition>> theDefinitionList;
+    vector<tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>> theDefinitionList;
     theDefinitionList.resize(theProperties.size());
 
-    function<tuple<CUICDMPropertyHandle, SUICDMPropertyDefinition>(CUICDMPropertyHandle)>
+    function<tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>(Qt3DSDMPropertyHandle)>
         thePropertyTransform(bind(TransformProperty, std::placeholders::_1, ref(*m_Data)));
     transform(theProperties.begin(), theProperties.end(), theDefinitionList.begin(),
               thePropertyTransform);
@@ -93,8 +93,8 @@ void CDataCoreProducer::DeleteInstance(CUICDMInstanceHandle inInstance)
                                    std::placeholders::_1, GetDataCoreSender()));
 }
 
-bool CDataCoreProducer::IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                                CUICDMInstanceHandle inParent) const
+bool CDataCoreProducer::IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                                Qt3DSDMInstanceHandle inParent) const
 {
     return m_Data->IsInstanceOrDerivedFrom(inInstance, inParent);
 }
@@ -104,7 +104,7 @@ void CDataCoreProducer::GetInstances(TInstanceHandleList &outInstances) const
     m_Data->GetInstances(outInstances);
 }
 void CDataCoreProducer::GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
-                                                CUICDMInstanceHandle inParentHandle) const
+                                                Qt3DSDMInstanceHandle inParentHandle) const
 {
     m_Data->GetInstancesDerivedFrom(outInstances, inParentHandle);
 }
@@ -122,8 +122,8 @@ struct ClearInstanceParentCacheTransaction : public ITransaction
     void Undo() override { m_Instance.ClearParentCache(); }
 };
 
-void CDataCoreProducer::DeriveInstance(CUICDMInstanceHandle inInstance,
-                                       CUICDMInstanceHandle inParent)
+void CDataCoreProducer::DeriveInstance(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMInstanceHandle inParent)
 {
     m_Data->DeriveInstance(inInstance, inParent);
     TDataModelInstancePtr theInstance =
@@ -141,16 +141,16 @@ void CDataCoreProducer::DeriveInstance(CUICDMInstanceHandle inInstance,
     GetDataCoreSender()->SignalInstanceDerived(inInstance, inParent);
 }
 
-void CDataCoreProducer::GetInstanceParents(CUICDMInstanceHandle inHandle,
+void CDataCoreProducer::GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
                                            TInstanceHandleList &outParents) const
 {
     m_Data->GetInstanceParents(inHandle, outParents);
 }
 
-CUICDMPropertyHandle CDataCoreProducer::AddProperty(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle CDataCoreProducer::AddProperty(Qt3DSDMInstanceHandle inInstance,
                                                     TCharPtr inName, DataModelDataType::Value inPropType)
 {
-    CUICDMPropertyHandle retval = m_Data->AddProperty(inInstance, inName, inPropType);
+    Qt3DSDMPropertyHandle retval = m_Data->AddProperty(inInstance, inName, inPropType);
     TDataModelInstancePtr theInstance =
         CSimpleDataCore::GetInstanceNF(inInstance, m_Data->m_Objects);
     CreateVecInsertTransaction<int>(__FILE__, __LINE__, m_Consumer, retval,
@@ -160,19 +160,19 @@ CUICDMPropertyHandle CDataCoreProducer::AddProperty(CUICDMInstanceHandle inInsta
     return retval;
 }
 
-void CDataCoreProducer::GetInstanceProperties(CUICDMInstanceHandle inInstance,
+void CDataCoreProducer::GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                               TPropertyHandleList &outProperties) const
 {
     m_Data->GetInstanceProperties(inInstance, outProperties);
 }
 
 const SUICDMPropertyDefinition &
-CDataCoreProducer::GetProperty(CUICDMPropertyHandle inProperty) const
+CDataCoreProducer::GetProperty(Qt3DSDMPropertyHandle inProperty) const
 {
     return m_Data->GetProperty(inProperty);
 }
 
-void CDataCoreProducer::RemoveProperty(CUICDMPropertyHandle inProperty)
+void CDataCoreProducer::RemoveProperty(Qt3DSDMPropertyHandle inProperty)
 {
     SUICDMPropertyDefinition theDef = GetProperty(inProperty);
     TDataModelInstancePtr theInstance =
@@ -201,7 +201,7 @@ inline void AddCopyInstancePropertyTransaction(int inProperty, const TIntList &i
                                                     std::placeholders::_1))
         == inOriginalList.end())
         CreateVecInsertTransaction<int>(__FILE__, __LINE__, inConsumer,
-                                        CUICDMPropertyHandle(inProperty), inInstance.m_Properties);
+                                        Qt3DSDMPropertyHandle(inProperty), inInstance.m_Properties);
 }
 
 inline void AddCopyInstanceValuePropertyTransaction(const TPropertyPair &inProperty,
@@ -251,8 +251,8 @@ struct InstancePropertyValuesTransaction : public ITransaction
     }
 };
 
-void CDataCoreProducer::CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
-                                               CUICDMInstanceHandle inDestInstance)
+void CDataCoreProducer::CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
+                                               Qt3DSDMInstanceHandle inDestInstance)
 {
     TDataModelInstancePtr theInstance =
         CSimpleDataCore::GetInstanceNF(inDestInstance, m_Data->m_Objects);
@@ -275,39 +275,39 @@ void CDataCoreProducer::CopyInstanceProperties(CUICDMInstanceHandle inSrcInstanc
     }
 }
 
-CUICDMPropertyHandle
-CDataCoreProducer::GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle
+CDataCoreProducer::GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                       const TCharStr &inStr) const
 {
     return m_Data->GetAggregateInstancePropertyByName(inInstance, inStr);
 }
 
-void CDataCoreProducer::GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+void CDataCoreProducer::GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                        TPropertyHandleList &outProperties) const
 {
     m_Data->GetAggregateInstanceProperties(inInstance, outProperties);
 }
 
-void CDataCoreProducer::GetSpecificInstancePropertyValues(CUICDMInstanceHandle inHandle,
+void CDataCoreProducer::GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inHandle,
                                                           TPropertyHandleValuePairList &outValues)
 {
     m_Data->GetSpecificInstancePropertyValues(inHandle, outValues);
 }
 
-bool CDataCoreProducer::HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty) const
+bool CDataCoreProducer::HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty) const
 {
     return m_Data->HasAggregateInstanceProperty(inInstance, inProperty);
 }
 
-void CDataCoreProducer::CheckValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+void CDataCoreProducer::CheckValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                    const SValue &inValue) const
 {
     return m_Data->CheckValue(inInstance, inProperty, inValue);
 }
 
-bool CDataCoreProducer::GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                                 CUICDMPropertyHandle inProperty,
+bool CDataCoreProducer::GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                                 Qt3DSDMPropertyHandle inProperty,
                                                  SValue &outValue) const
 {
     return m_Data->GetInstancePropertyValue(inHandle, inProperty, outValue);
@@ -321,8 +321,8 @@ inline void EraseProperty(TPropertyPairHash &inProperties, int inProperty)
                           std::placeholders::_1)));
 }
 
-void CDataCoreProducer::SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                                 CUICDMPropertyHandle inProperty,
+void CDataCoreProducer::SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                                 Qt3DSDMPropertyHandle inProperty,
                                                  const SValue &inValue)
 {
     // Two possible courses of actions.  The property exists, in which case
@@ -378,51 +378,51 @@ void CDataCoreProducer::SetConsumer(TTransactionConsumerPtr inConsumer)
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectInstancePropertyValue(
-    const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+    const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
         &inCallback)
 {
     return GetPropertyCoreProvider()->ConnectInstancePropertyValue(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectInstanceCreated(
-    const std::function<void(CUICDMInstanceHandle)> &inCallback)
+    const std::function<void(Qt3DSDMInstanceHandle)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectInstanceCreated(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectInstanceDeleted(
-    const std::function<void(CUICDMInstanceHandle)> &inCallback)
+    const std::function<void(Qt3DSDMInstanceHandle)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectInstanceDeleted(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectBeforeInstanceDeleted(
-    const std::function<void(CUICDMInstanceHandle)> &inCallback)
+    const std::function<void(Qt3DSDMInstanceHandle)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectBeforeInstanceDeleted(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectInstanceDerived(
-    const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback)
+    const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectInstanceDerived(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectInstanceParentRemoved(
-    const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback)
+    const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectInstanceParentRemoved(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectPropertyAdded(
-    const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, TCharPtr,
+    const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, TCharPtr,
                                DataModelDataType::Value)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectPropertyAdded(inCallback);
 }
 
 TSignalConnectionPtr CDataCoreProducer::ConnectPropertyRemoved(
-    const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, TCharPtr,
+    const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, TCharPtr,
                                DataModelDataType::Value)> &inCallback)
 {
     return GetDataCoreProvider()->ConnectPropertyRemoved(inCallback);
diff --git a/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.h b/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.h
index c37c8840..51e33431 100644
--- a/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.h
+++ b/src/Authoring/UICDM/Systems/Cores/DataCoreProducer.h
@@ -72,47 +72,47 @@ public:
 
     // IInstancePropertyCore
     //===============================================================
-    CUICDMPropertyHandle GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+    Qt3DSDMPropertyHandle GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                             const TCharStr &inStr) const override;
-    void GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+    void GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                 TPropertyHandleList &outProperties) const override;
-    void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inHandle,
+    void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inHandle,
                                                    TPropertyHandleValuePairList &outValues) override;
-    bool HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const override;
+    bool HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const override;
 
-    void CheckValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    void CheckValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                     const SValue &inValue) const override;
-    bool GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    bool GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    void SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
     //===============================================================
 
     // IDataCore
     //===============================================================
-    CUICDMInstanceHandle CreateInstance(CUICDMInstanceHandle hdl = CUICDMInstanceHandle()) override;
+    Qt3DSDMInstanceHandle CreateInstance(Qt3DSDMInstanceHandle hdl = Qt3DSDMInstanceHandle()) override;
     void GetInstances(TInstanceHandleList &outInstances) const override;
     void GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
-                                         CUICDMInstanceHandle inParent) const override;
-    void DeleteInstance(CUICDMInstanceHandle inHandle) override;
+                                         Qt3DSDMInstanceHandle inParent) const override;
+    void DeleteInstance(Qt3DSDMInstanceHandle inHandle) override;
 
-    void DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent) override;
-    void GetInstanceParents(CUICDMInstanceHandle inHandle,
+    void DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent) override;
+    void GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
                                     TInstanceHandleList &outParents) const override;
-    bool IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                         CUICDMInstanceHandle inParent) const override;
+    bool IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMInstanceHandle inParent) const override;
 
-    CUICDMPropertyHandle AddProperty(CUICDMInstanceHandle inInstance, TCharPtr inName,
+    Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                              DataModelDataType::Value inPropType) override;
-    void GetInstanceProperties(CUICDMInstanceHandle inInstance,
+    void GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                        TPropertyHandleList &outProperties) const override;
-    const SUICDMPropertyDefinition &GetProperty(CUICDMPropertyHandle inProperty) const override;
-    void RemoveProperty(CUICDMPropertyHandle inProperty) override;
-    void CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
-                                        CUICDMInstanceHandle inDestInstance) override;
+    const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
+    void RemoveProperty(Qt3DSDMPropertyHandle inProperty) override;
+    void CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
+                                        Qt3DSDMInstanceHandle inDestInstance) override;
 
-    void RemoveCachedValues(CUICDMInstanceHandle inInstance) override
+    void RemoveCachedValues(Qt3DSDMInstanceHandle inInstance) override
     {
         m_Data->RemoveCachedValues(inInstance);
     }
@@ -135,23 +135,23 @@ public:
     //	Signal provider implementation
     //===============================================================
     TSignalConnectionPtr ConnectInstancePropertyValue(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
             &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectInstanceCreated(const std::function<void(CUICDMInstanceHandle)> &inCallback) override;
+    ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) override;
+    ConnectInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectBeforeInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) override;
+    ConnectBeforeInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectInstanceDerived(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) override;
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectInstanceParentRemoved(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) override;
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectPropertyAdded(const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+    ConnectPropertyAdded(const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                     TCharPtr, DataModelDataType::Value)> &inCallback) override;
     virtual TSignalConnectionPtr
-    ConnectPropertyRemoved(const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+    ConnectPropertyRemoved(const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                       TCharPtr, DataModelDataType::Value)> &inCallback) override;
 
 private:
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.cpp
index 0952bb0e..2a264844 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.cpp
@@ -31,9 +31,9 @@
 
 namespace qt3dsdm {
 
-CUICDMActionHandle CSimpleActionCore::CreateAction(CUICDMInstanceHandle inInstance,
+CUICDMActionHandle CSimpleActionCore::CreateAction(Qt3DSDMInstanceHandle inInstance,
                                                    CUICDMSlideHandle inSlide,
-                                                   CUICDMInstanceHandle inOwner,
+                                                   Qt3DSDMInstanceHandle inOwner,
                                                    SLong4 inTriggerTargetObjects)
 {
     int nextId = GetNextId();
@@ -43,7 +43,7 @@ CUICDMActionHandle CSimpleActionCore::CreateAction(CUICDMInstanceHandle inInstan
     return retval;
 }
 
-void CSimpleActionCore::DeleteAction(CUICDMActionHandle inAction, CUICDMInstanceHandle &outInstance)
+void CSimpleActionCore::DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance)
 {
     SAction *theAction = GetActionNF(inAction, m_Objects);
     outInstance = theAction->m_ActionInfo.m_Instance;
@@ -59,7 +59,7 @@ const SActionInfo &CSimpleActionCore::GetActionInfo(CUICDMActionHandle inAction)
 }
 
 inline void AddIfActionMatches(const THandleObjectPair &inPair, CUICDMSlideHandle inSlide,
-                               CUICDMInstanceHandle inOwner, TActionHandleList &outActions)
+                               Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions)
 {
     if (inPair.second->GetType() == CHandleObject::EHandleObjectTypeAction) {
         const SAction *theAction = static_cast<SAction *>(inPair.second.get());
@@ -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, CUICDMInstanceHandle inOwner,
+void CSimpleActionCore::GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                    TActionHandleList &outActions) const
 {
     outActions.clear();
@@ -86,7 +86,7 @@ void CSimpleActionCore::GetActions(CUICDMSlideHandle inSlide, TActionHandleList
 }
 
 // Return all actions that belong to a certain instance
-void CSimpleActionCore::GetActions(CUICDMInstanceHandle inOwner,
+void CSimpleActionCore::GetActions(Qt3DSDMInstanceHandle inOwner,
                                    TActionHandleList &outActions) const
 {
     GetActions(0, inOwner, outActions);
@@ -103,12 +103,12 @@ void CSimpleActionCore::GetActions(TActionHandleList &outActions) const
 }
 
 // Return the instance that was allocated for this action.
-CUICDMInstanceHandle CSimpleActionCore::GetActionInstance(CUICDMActionHandle inAction) const
+Qt3DSDMInstanceHandle CSimpleActionCore::GetActionInstance(CUICDMActionHandle inAction) const
 {
     return GetActionNF(inAction, m_Objects)->m_ActionInfo.m_Instance;
 }
 
-inline bool ActionInstanceMatches(const THandleObjectPair &inPair, CUICDMInstanceHandle inInstance)
+inline bool ActionInstanceMatches(const THandleObjectPair &inPair, Qt3DSDMInstanceHandle inInstance)
 {
     if (inPair.second->GetType() == CHandleObject::EHandleObjectTypeAction) {
         const SAction *theAction = static_cast<SAction *>(inPair.second.get());
@@ -120,7 +120,7 @@ inline bool ActionInstanceMatches(const THandleObjectPair &inPair, CUICDMInstanc
 
 // Reverse lookup into the action system so you can match actions to instances.
 CUICDMActionHandle
-CSimpleActionCore::GetActionByInstance(CUICDMInstanceHandle inActionInstance) const
+CSimpleActionCore::GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const
 {
     THandleObjectMap::const_iterator theAction =
         find_if(m_Objects.begin(), m_Objects.end(),
@@ -213,9 +213,9 @@ void CSimpleActionCore::SetHandlerArgumentValue(CUICDMHandlerArgHandle inHandler
 
 // Helper functions
 CUICDMActionHandle CSimpleActionCore::CreateActionWithHandle(int inHandle,
-                                                             CUICDMInstanceHandle inInstance,
+                                                             Qt3DSDMInstanceHandle inInstance,
                                                              CUICDMSlideHandle inSlide,
-                                                             CUICDMInstanceHandle inOwner)
+                                                             Qt3DSDMInstanceHandle inOwner)
 {
     if (HandleValid(inHandle))
         throw HandleExists(L"");
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.h b/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.h
index 0ba5f553..8294be7f 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.h
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleActionCore.h
@@ -41,8 +41,8 @@ struct SAction : public CHandleObject
 
     SAction() {}
 
-    SAction(int inHandle, CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
-            CUICDMInstanceHandle inOwner)
+    SAction(int inHandle, Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+            Qt3DSDMInstanceHandle inOwner)
         : CHandleObject(inHandle)
         , m_ActionInfo(inInstance, inSlide, inOwner)
     {
@@ -82,20 +82,20 @@ public: // Use
     IStringTable &GetStringTable() const override { return *m_StringTable.get(); }
     TStringTablePtr GetStringTablePtr() const override { return m_StringTable; }
     // Action
-    CUICDMActionHandle CreateAction(CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
-                                    CUICDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
-    void DeleteAction(CUICDMActionHandle inAction, CUICDMInstanceHandle &outInstance) override;
+    CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+                                    Qt3DSDMInstanceHandle inOwner, SLong4 inTriggerTargetObjects) override;
+    void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) override;
     const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const override;
-    void GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                     TActionHandleList &outActions) const override;
     void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const override;
-    void GetActions(CUICDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
+    void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const override;
     void GetActions(TActionHandleList &outActions) const override;
 
     // Return the instance that was allocated for this action.
-    CUICDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
+    Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const override;
     // Reverse lookup into the action system so you can match actions to instances.
-    CUICDMActionHandle GetActionByInstance(CUICDMInstanceHandle inActionInstance) const override;
+    CUICDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const override;
 
     // Action Properties
     void SetTriggerObject(CUICDMActionHandle inAction, const SObjectRefType &inTriggerObject) override;
@@ -121,9 +121,9 @@ public: // Use
     bool HandleValid(int inHandle) const override { return CHandleBase::HandleValid(inHandle); }
 
     // Helper functions
-    CUICDMActionHandle CreateActionWithHandle(int inHandle, CUICDMInstanceHandle inInstance,
+    CUICDMActionHandle CreateActionWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance,
                                               CUICDMSlideHandle inSlide,
-                                              CUICDMInstanceHandle inOwner);
+                                              Qt3DSDMInstanceHandle inOwner);
     CUICDMHandlerArgHandle AddHandlerArgumentWithHandle(int inHandle, CUICDMActionHandle inAction,
                                                         const TCharStr &inName,
                                                         HandlerArgumentType::Value inArgType,
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
index 43e504e8..19e25879 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
@@ -51,8 +51,8 @@ using namespace boost;
 namespace qt3dsdm {
 
 CUICDMAnimationHandle
-CSimpleAnimationCore::CreateAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, size_t inIndex,
+CSimpleAnimationCore::CreateAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType, bool inFirstKeyframeDynamic)
 {
     if (GetAnimation(inSlide, inInstance, inProperty, inIndex).Valid())
@@ -86,8 +86,8 @@ void CSimpleAnimationCore::EnsureAnimationCache() const
 }
 
 CUICDMAnimationHandle CSimpleAnimationCore::GetAnimation(CUICDMSlideHandle inSlide,
-                                                         CUICDMInstanceHandle inInstance,
-                                                         CUICDMPropertyHandle inProperty,
+                                                         Qt3DSDMInstanceHandle inInstance,
+                                                         Qt3DSDMPropertyHandle inProperty,
                                                          size_t inIndex) const
 {
     EnsureAnimationCache();
@@ -154,7 +154,7 @@ void CSimpleAnimationCore::GetAnimations(TAnimationInfoList &outAnimations,
 }
 
 inline void AddSpecificAnimationsIf(const THandleObjectPair &inPair, CUICDMSlideHandle inSlide,
-                                    CUICDMInstanceHandle inInstance,
+                                    Qt3DSDMInstanceHandle inInstance,
                                     TAnimationHandleList &outAnimations)
 {
     if (inPair.second->GetType() == CHandleObject::EHandleObjectTypeSAnimationTrack) {
@@ -165,7 +165,7 @@ inline void AddSpecificAnimationsIf(const THandleObjectPair &inPair, CUICDMSlide
 }
 
 void CSimpleAnimationCore::GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide,
-                                                         CUICDMInstanceHandle inInstance,
+                                                         Qt3DSDMInstanceHandle inInstance,
                                                          TAnimationHandleList &outAnimations)
 {
     EnsureAnimationCache();
@@ -303,7 +303,7 @@ bool CSimpleAnimationCore::IsFirstKeyframe(CUICDMKeyframeHandle inKeyframe) cons
 }
 
 void CSimpleAnimationCore::OffsetAnimations(CUICDMSlideHandle /*inSlide*/,
-                                            CUICDMInstanceHandle /*inInstance*/, long /*inOffset*/)
+                                            Qt3DSDMInstanceHandle /*inInstance*/, long /*inOffset*/)
 {
     throw std::runtime_error("unimplemented");
 }
@@ -436,8 +436,8 @@ bool CSimpleAnimationCore::AnimationValid(CUICDMAnimationHandle inAnimation) con
 }
 
 CUICDMAnimationHandle CSimpleAnimationCore::CreateAnimationWithHandle(
-    int inHandle, CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-    CUICDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
+    int inHandle, CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+    Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
     bool inFirstKeyframeDynamic)
 {
     if (HandleValid(inHandle))
@@ -466,7 +466,7 @@ void CSimpleAnimationCore::AddAnimationToLookupCache(
     std::shared_ptr<SAnimationTrack> inAnimation) const
 {
     CUICDMSlideHandle theSlide = inAnimation->m_Slide;
-    CUICDMInstanceHandle theInstance = inAnimation->m_Instance;
+    Qt3DSDMInstanceHandle theInstance = inAnimation->m_Instance;
     pair<TStateInstanceAnimationMap::iterator, TStateInstanceAnimationMap::iterator> theRange =
         m_AnimationMatchesCache.equal_range(
             make_pair(theSlide.GetHandleValue(), theInstance.GetHandleValue()));
@@ -485,7 +485,7 @@ void CSimpleAnimationCore::RemoveAnimationFromLookupCache(
 {
     TStateInstanceAnimationMap &theMap(m_AnimationMatchesCache);
     CUICDMSlideHandle theSlide = inAnimation->m_Slide;
-    CUICDMInstanceHandle theInstance = inAnimation->m_Instance;
+    Qt3DSDMInstanceHandle theInstance = inAnimation->m_Instance;
     pair<TStateInstanceAnimationMap::iterator, TStateInstanceAnimationMap::iterator> theRange =
         theMap.equal_range(make_pair(theSlide.GetHandleValue(), theInstance.GetHandleValue()));
     for (TStateInstanceAnimationMap::iterator theIter = theRange.first; theIter != theRange.second;
@@ -518,8 +518,8 @@ void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &
 
 CUICDMAnimationHandle CopyAnimation(TAnimationCorePtr inAnimationCore,
                                     CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inNewSlide,
-                                    CUICDMInstanceHandle inNewInstance,
-                                    CUICDMPropertyHandle inNewProperty, size_t inNewIndex)
+                                    Qt3DSDMInstanceHandle inNewInstance,
+                                    Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex)
 {
     TKeyframeHandleList theKeyframes;
     inAnimationCore->GetKeyframes(inAnimation, theKeyframes);
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.h b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.h
index 0092dc30..dcc568cf 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.h
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.h
@@ -58,8 +58,8 @@ struct SAnimationTrack : public CHandleObject
     {
     }
 
-    SAnimationTrack(int inHandle, CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                    CUICDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
+    SAnimationTrack(int inHandle, CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                    Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
                     bool inFirstKeyframeDynamic, bool inArtistEdited)
         : CHandleObject(inHandle)
         , m_Slide(inSlide)
@@ -117,18 +117,18 @@ public: // Use
     TStringTablePtr GetStringTablePtr() const { return m_StringTable; }
 
     CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, size_t inIndex,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
                                           bool inFirstKeyframeDynamic) override;
     void DeleteAnimation(CUICDMAnimationHandle inAnimation) override;
-    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, size_t inIndex) const override;
+    CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle 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, CUICDMInstanceHandle inInstance,
+    void GetSpecificInstanceAnimations(CUICDMSlideHandle 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, CUICDMInstanceHandle inInstance,
+    void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                           long inOffset) override;
 
     void SetIsArtistEdited(CUICDMAnimationHandle inAnimation, bool inEdited = true) override;
@@ -162,8 +162,8 @@ public: // Use
 
     // Only implemented at the producer level, not at the simple core level.
     void CopyAnimations(CUICDMSlideHandle /*inSourceSlide*/,
-                        CUICDMInstanceHandle /*inSourceInstance*/,
-                        CUICDMSlideHandle /*inDestSlide*/, CUICDMInstanceHandle /*inDestInstance*/) override
+                        Qt3DSDMInstanceHandle /*inSourceInstance*/,
+                        CUICDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
     {
         throw AnimationNotFound(L"");
     }
@@ -178,8 +178,8 @@ public: // Use
     void EnsureAnimationCache() const;
 
     CUICDMAnimationHandle CreateAnimationWithHandle(int inHandle, CUICDMSlideHandle inSlide,
-                                                    CUICDMInstanceHandle inInstance,
-                                                    CUICDMPropertyHandle inProperty, size_t inIndex,
+                                                    Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                                     EAnimationType inAnimationType,
                                                     bool inFirstKeyframeDynamic);
 
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.cpp
index 359692d7..66fb567a 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.cpp
@@ -32,7 +32,7 @@
 namespace qt3dsdm {
 TUICDMDebugLogFunction g_UICDMDebugLogger = NULL;
 // Instances
-CUICDMInstanceHandle CSimpleDataCore::CreateInstance(CUICDMInstanceHandle hdl)
+Qt3DSDMInstanceHandle CSimpleDataCore::CreateInstance(Qt3DSDMInstanceHandle hdl)
 {
     int nextId = hdl;
     if (hdl.Valid() == false)
@@ -48,7 +48,7 @@ inline void RemoveParentFromClass(int inParent, int inChild, THandleObjectMap &i
     // Cascade the delete operation
 }
 
-void CSimpleDataCore::DeleteInstance(CUICDMInstanceHandle inHandle)
+void CSimpleDataCore::DeleteInstance(Qt3DSDMInstanceHandle inHandle)
 {
     // Ensure it exists in the first place.
     CSimpleDataCore::GetInstanceNF(inHandle, m_Objects); // Check for instance existance
@@ -69,13 +69,13 @@ void CSimpleDataCore::GetInstances(TInstanceHandleList &outInstances) const
     // the exact no of instances = m_Objects.size() - the no of properties as added by
     // CClientDataModelBridge::InitializeDataCore (as of now, we have 31 properties)
     outInstances.reserve(m_Objects.size());
-    do_all(m_Objects, std::bind(MaybeAddObject<CDataModelInstance, CUICDMInstanceHandle>,
+    do_all(m_Objects, std::bind(MaybeAddObject<CDataModelInstance, Qt3DSDMInstanceHandle>,
                                 std::placeholders::_1, std::ref(outInstances)));
 }
 
 // Get instances that are derived from a specific parent
 void CSimpleDataCore::GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
-                                              CUICDMInstanceHandle inParentHandle) const
+                                              Qt3DSDMInstanceHandle inParentHandle) const
 {
     do_all(m_Objects, std::bind(&CSimpleDataCore::AddInstanceIfDerivedFrom, this,
                                 std::placeholders::_1,
@@ -85,7 +85,7 @@ void CSimpleDataCore::GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
 // add instance that is derived from a specific parent
 void CSimpleDataCore::AddInstanceIfDerivedFrom(const std::pair<int, THandleObjectPtr> &inItem,
                                                TInstanceHandleList &outInstances,
-                                               CUICDMInstanceHandle inParentHandle) const
+                                               Qt3DSDMInstanceHandle inParentHandle) const
 {
     if (inItem.second->GetType() == CHandleObject::EHandleObjectTypeCDataModelInstance) {
         TDataModelInstancePtr theInstance = static_pointer_cast<CDataModelInstance>(inItem.second);
@@ -95,7 +95,7 @@ void CSimpleDataCore::AddInstanceIfDerivedFrom(const std::pair<int, THandleObjec
 }
 
 // Derivation
-void CSimpleDataCore::DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent)
+void CSimpleDataCore::DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent)
 {
     if (g_UICDMDebugLogger)
         g_UICDMDebugLogger("CSimpleDataCore::DeriveInstance Enter");
@@ -108,7 +108,7 @@ void CSimpleDataCore::DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInst
         g_UICDMDebugLogger("CSimpleDataCore::DeriveInstance Leave");
 }
 
-void CSimpleDataCore::GetInstanceParents(CUICDMInstanceHandle inHandle,
+void CSimpleDataCore::GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
                                          TInstanceHandleList &outParents) const
 {
     const TDataModelInstancePtr theInstance = GetInstanceNF(inHandle, m_Objects);
@@ -133,7 +133,7 @@ inline const wchar_t *SafeStrPtr(const wchar_t *inData)
 }
 
 // Properties
-CUICDMPropertyHandle CSimpleDataCore::AddProperty(CUICDMInstanceHandle inInstance, TCharPtr inName,
+Qt3DSDMPropertyHandle CSimpleDataCore::AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                                   DataModelDataType::Value inPropType)
 {
     UICDM_LOG_FUNCTION("CSimpleDataCore::AddProperty");
@@ -153,20 +153,20 @@ CUICDMPropertyHandle CSimpleDataCore::AddProperty(CUICDMInstanceHandle inInstanc
     return AddPropertyWithHandle(nextId, inInstance, inName, inPropType);
 }
 
-void CSimpleDataCore::GetInstanceProperties(CUICDMInstanceHandle inInstance,
+void CSimpleDataCore::GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                             TPropertyHandleList &outProperties) const
 {
     transformv_all(GetInstanceNF(inInstance, m_Objects)->m_Properties, outProperties);
 }
 
-const SUICDMPropertyDefinition &CSimpleDataCore::GetProperty(CUICDMPropertyHandle inProperty) const
+const SUICDMPropertyDefinition &CSimpleDataCore::GetProperty(Qt3DSDMPropertyHandle inProperty) const
 {
     const CDataModelPropertyDefinitionObject *theProp =
         GetPropertyDefinitionNF(inProperty, m_Objects);
     return theProp->m_Definition;
 }
 
-void CSimpleDataCore::RemoveProperty(CUICDMPropertyHandle inProperty)
+void CSimpleDataCore::RemoveProperty(Qt3DSDMPropertyHandle inProperty)
 {
     CDataModelPropertyDefinitionObject *theProp =
         CSimpleDataCore::GetPropertyDefinitionNF(inProperty, m_Objects);
@@ -177,13 +177,13 @@ void CSimpleDataCore::RemoveProperty(CUICDMPropertyHandle inProperty)
     CSimpleDataCore::EraseHandle(inProperty, m_Objects);
 }
 
-inline bool PropertyMatches(int inProperty, CUICDMPropertyHandle inTarget)
+inline bool PropertyMatches(int inProperty, Qt3DSDMPropertyHandle inTarget)
 {
     return inProperty == inTarget.GetHandleValue();
 }
 
-inline bool GetInstanceValue(CUICDMInstanceHandle inInstanceHandle,
-                             CUICDMPropertyHandle inPropertyHandle, CSimpleDataCore &inDataCore,
+inline bool GetInstanceValue(Qt3DSDMInstanceHandle inInstanceHandle,
+                             Qt3DSDMPropertyHandle inPropertyHandle, CSimpleDataCore &inDataCore,
                              SValue &outValue)
 {
     const TDataModelInstancePtr theInstance =
@@ -198,13 +198,13 @@ inline bool GetInstanceValue(CUICDMInstanceHandle inInstanceHandle,
     return false;
 }
 
-inline void CopyInstanceProperty(CUICDMPropertyHandle inSrcPropertyHandle,
-                                 CUICDMInstanceHandle inSrcInstanceHandle,
-                                 CUICDMInstanceHandle inInstanceHandle, CSimpleDataCore &inDataCore)
+inline void CopyInstanceProperty(Qt3DSDMPropertyHandle inSrcPropertyHandle,
+                                 Qt3DSDMInstanceHandle inSrcInstanceHandle,
+                                 Qt3DSDMInstanceHandle inInstanceHandle, CSimpleDataCore &inDataCore)
 {
     // create the property definition that matches the source
     const SUICDMPropertyDefinition &theProperty = inDataCore.GetProperty(inSrcPropertyHandle);
-    CUICDMPropertyHandle theNewProperty =
+    Qt3DSDMPropertyHandle theNewProperty =
         inDataCore.AddProperty(inInstanceHandle, theProperty.m_Name.wide_str(), theProperty.m_Type);
     // copy the value if one exists on the src.
     SValue theValue;
@@ -214,9 +214,9 @@ inline void CopyInstanceProperty(CUICDMPropertyHandle inSrcPropertyHandle,
 
 // logic : if destination property is one gained through derivation in inSrcInstanceHandle, copy the
 // value over.
-inline void CopyAggregatedPropertyValues(CUICDMPropertyHandle inDestPropertyHandle,
-                                         CUICDMInstanceHandle inSrcInstanceHandle,
-                                         CUICDMInstanceHandle inInstanceHandle,
+inline void CopyAggregatedPropertyValues(Qt3DSDMPropertyHandle inDestPropertyHandle,
+                                         Qt3DSDMInstanceHandle inSrcInstanceHandle,
+                                         Qt3DSDMInstanceHandle inInstanceHandle,
                                          const TPropertyHandleList &inSrcNonAggregateList,
                                          CSimpleDataCore &inDataCore)
 {
@@ -230,8 +230,8 @@ inline void CopyAggregatedPropertyValues(CUICDMPropertyHandle inDestPropertyHand
     }
 }
 
-void CSimpleDataCore::CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
-                                             CUICDMInstanceHandle inDestInstance)
+void CSimpleDataCore::CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
+                                             Qt3DSDMInstanceHandle inDestInstance)
 {
     TPropertyHandleList theList;
     GetInstanceProperties(inSrcInstance, theList);
@@ -245,7 +245,7 @@ void CSimpleDataCore::CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
                                   theList, std::ref(*this)));
 }
 
-void CSimpleDataCore::RemoveCachedValues(CUICDMInstanceHandle inInstance)
+void CSimpleDataCore::RemoveCachedValues(Qt3DSDMInstanceHandle inInstance)
 {
     const TDataModelInstancePtr theInstance = CSimpleDataCore::GetInstanceNF(inInstance, m_Objects);
     theInstance->RemoveCachedValues();
@@ -268,7 +268,7 @@ void GetAggregateProperties(const TDataModelInstancePtr inInstance, TIntList &in
 }
 
 template <typename TPredicate>
-inline std::tuple<bool, CUICDMInstanceHandle, CUICDMPropertyHandle>
+inline std::tuple<bool, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle>
 RecurseFindProperty(const TDataModelInstancePtr inInstance, TPredicate inPredicate)
 {
     TIntList::const_iterator theFind = eastl::find_if(inInstance->m_Properties.begin(),
@@ -279,7 +279,7 @@ RecurseFindProperty(const TDataModelInstancePtr inInstance, TPredicate inPredica
     for (CDataModelInstance::TInstancePairList::const_iterator theParent =
              inInstance->m_Parents.begin();
          theParent != inInstance->m_Parents.end(); ++theParent) {
-        std::tuple<bool, CUICDMInstanceHandle, CUICDMPropertyHandle> theValue =
+        std::tuple<bool, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle> theValue =
             RecurseFindProperty(theParent->second, inPredicate);
         if (get<0>(theValue))
             return theValue;
@@ -295,8 +295,8 @@ inline bool PropertyNameMatches(int inProperty, const THandleObjectMap &inObject
     return (theProp->m_Definition.m_Name == inStr);
 }
 
-CUICDMPropertyHandle
-CSimpleDataCore::GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle
+CSimpleDataCore::GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                     const TCharStr &inStr) const
 {
     const TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
@@ -308,7 +308,7 @@ CSimpleDataCore::GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInsta
 
 // A simplified RecurseFindProperty function
 bool RecurseFindPropertyMatches(const TDataModelInstancePtr inInstance,
-                                CUICDMPropertyHandle inProperty)
+                                Qt3DSDMPropertyHandle inProperty)
 {
     TIntList::const_iterator theFind =
         find(inInstance->m_Properties.begin(), inInstance->m_Properties.end(),
@@ -325,8 +325,8 @@ bool RecurseFindPropertyMatches(const TDataModelInstancePtr inInstance,
     return false;
 }
 
-bool CSimpleDataCore::HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty) const
+bool CSimpleDataCore::HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty) const
 {
     const TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
     if (theInstance->m_PropertyValues.find(inProperty.GetHandleValue())
@@ -336,7 +336,7 @@ bool CSimpleDataCore::HasAggregateInstanceProperty(CUICDMInstanceHandle inInstan
     return RecurseFindPropertyMatches(theInstance, inProperty);
 }
 
-void CSimpleDataCore::GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+void CSimpleDataCore::GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                      TPropertyHandleList &outProperties) const
 {
     TIntList inVisited;
@@ -344,7 +344,7 @@ void CSimpleDataCore::GetAggregateInstanceProperties(CUICDMInstanceHandle inInst
     GetAggregateProperties(theInstance, inVisited, outProperties);
 }
 
-void CSimpleDataCore::CheckValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+void CSimpleDataCore::CheckValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                  const SValue &inValue) const
 {
     CheckPropertyExistence(GetInstanceNF(inInstance, m_Objects), inProperty, m_Objects);
@@ -354,7 +354,7 @@ void CSimpleDataCore::CheckValue(CUICDMInstanceHandle inInstance, CUICDMProperty
 }
 
 bool CSimpleDataCore::GetInstancePropertyValueHelper(const TDataModelInstancePtr inInstance,
-                                                     CUICDMPropertyHandle inProperty,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      SValue &outValue) const
 {
     TPropertyPairHash::const_iterator theInstanceProp =
@@ -388,8 +388,8 @@ bool CSimpleDataCore::GetInstancePropertyValueHelper(const TDataModelInstancePtr
     return false;
 }
 
-bool CSimpleDataCore::GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                               CUICDMPropertyHandle inProperty,
+bool CSimpleDataCore::GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                SValue &outValue) const
 {
     if (IsInstance(inHandle) == false || IsProperty(inProperty) == false) {
@@ -400,8 +400,8 @@ bool CSimpleDataCore::GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
     return GetInstancePropertyValueHelper(theInstance, inProperty, outValue);
 }
 
-void CSimpleDataCore::SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                               CUICDMPropertyHandle inProperty,
+void CSimpleDataCore::SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue)
 {
     if (IsInstance(inHandle) == false || IsProperty(inProperty) == false) {
@@ -412,7 +412,7 @@ void CSimpleDataCore::SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
     UncheckedSetSpecificInstancePropertyValue(inHandle, inProperty, inValue, PropertyValueFlags());
 }
 
-void CSimpleDataCore::GetSpecificInstancePropertyValues(CUICDMInstanceHandle inHandle,
+void CSimpleDataCore::GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inHandle,
                                                         TPropertyHandleValuePairList &outValues)
 {
     if (IsInstance(inHandle) == false)
@@ -424,7 +424,7 @@ void CSimpleDataCore::GetSpecificInstancePropertyValues(CUICDMInstanceHandle inH
          theIter != theEnd; ++theIter) {
         const pair<int, TPropertyValuePair> &thePair(*theIter);
         if (thePair.second.first.IsSetViaAutoPropagation() == false) {
-            CUICDMPropertyHandle thePropertyHandle(thePair.first);
+            Qt3DSDMPropertyHandle thePropertyHandle(thePair.first);
             SValue theValue(thePair.second.second.GetValue());
             outValues.push_back(make_pair(thePair.first, theValue));
         }
@@ -440,7 +440,7 @@ bool CSimpleDataCore::IsProperty(int inHandle) const
     return HandleObjectValid<CDataModelPropertyDefinitionObject>(inHandle, m_Objects);
 }
 
-CUICDMInstanceHandle CSimpleDataCore::CreateInstanceWithHandle(int inHandle)
+Qt3DSDMInstanceHandle CSimpleDataCore::CreateInstanceWithHandle(int inHandle)
 {
     if (g_UICDMDebugLogger)
         g_UICDMDebugLogger("CSimpleDataCore::CreateInstance Enter");
@@ -464,8 +464,8 @@ CUICDMInstanceHandle CSimpleDataCore::CreateInstanceWithHandle(int inHandle)
     return inHandle;
 }
 
-CUICDMPropertyHandle CSimpleDataCore::AddPropertyWithHandle(int inHandle,
-                                                            CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle CSimpleDataCore::AddPropertyWithHandle(int inHandle,
+                                                            Qt3DSDMInstanceHandle inInstance,
                                                             TCharPtr inName,
                                                             DataModelDataType::Value inPropType)
 {
@@ -494,8 +494,8 @@ CUICDMPropertyHandle CSimpleDataCore::AddPropertyWithHandle(int inHandle,
     return inHandle;
 }
 
-bool CSimpleDataCore::GetSpecificInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                       CUICDMPropertyHandle inProperty,
+bool CSimpleDataCore::GetSpecificInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                       Qt3DSDMPropertyHandle inProperty,
                                                        SValue &outValue) const
 {
     const TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
@@ -508,15 +508,15 @@ bool CSimpleDataCore::GetSpecificInstancePropertyValue(CUICDMInstanceHandle inIn
     return false;
 }
 
-void CSimpleDataCore::GetSpecificInstancePropertyValues(CUICDMInstanceHandle inInstance,
+void CSimpleDataCore::GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inInstance,
                                                         TPropertyPairHash &outValues) const
 {
     const TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
     outValues = theInstance->m_PropertyValues;
 }
 
-void CSimpleDataCore::UncheckedSetSpecificInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                                CUICDMPropertyHandle inProperty,
+void CSimpleDataCore::UncheckedSetSpecificInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                                Qt3DSDMPropertyHandle inProperty,
                                                                 const SValue &inValue,
                                                                 PropertyValueFlags inIsUserSet)
 {
@@ -554,15 +554,15 @@ void CSimpleDataCore::CheckPropertyExistence(const TDataModelInstancePtr inInsta
 }
 
 bool CSimpleDataCore::IsInstanceOrDerivedFromHelper(const TDataModelInstancePtr inInstance,
-                                                    CUICDMInstanceHandle inParent) const
+                                                    Qt3DSDMInstanceHandle inParent) const
 {
     if (inInstance->m_Handle == inParent) // Am I this object?
         return true;
     return inInstance->IsDerivedFrom(inParent);
 }
 
-bool CSimpleDataCore::IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                              CUICDMInstanceHandle inParent) const
+bool CSimpleDataCore::IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMInstanceHandle inParent) const
 {
     if (IsInstance(inInstance) == false || IsInstance(inParent) == false)
         return false;
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.h b/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.h
index 10fcd16c..9ce75a01 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.h
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleDataCore.h
@@ -130,7 +130,7 @@ public:
 
     void ClearParentCache() const { m_CachedParents.clear(); }
 
-    bool IsDerivedFrom(CUICDMInstanceHandle inParent) const
+    bool IsDerivedFrom(Qt3DSDMInstanceHandle inParent) const
     {
         std::pair<TInstanceParentMap::iterator, bool> theQueryResult =
             m_CachedParents.insert(std::make_pair(inParent.GetHandleValue(), false));
@@ -210,54 +210,54 @@ public:
     }
 
     // IInstancePropertyCore
-    CUICDMPropertyHandle GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+    Qt3DSDMPropertyHandle GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                                     const TCharStr &inStr) const override;
-    void GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+    void GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                 TPropertyHandleList &outProperties) const override;
-    void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inHandle,
+    void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inHandle,
                                                    TPropertyHandleValuePairList &outValues) override;
-    bool HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const override;
-    void CheckValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    bool HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const override;
+    void CheckValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                             const SValue &inValue) const override;
-    bool GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    bool GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    void SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
     // IDataCore
     //===============================================================
-    CUICDMInstanceHandle CreateInstance(CUICDMInstanceHandle hdl = CUICDMInstanceHandle()) override;
-    void DeleteInstance(CUICDMInstanceHandle inHandle) override;
+    Qt3DSDMInstanceHandle CreateInstance(Qt3DSDMInstanceHandle hdl = Qt3DSDMInstanceHandle()) override;
+    void DeleteInstance(Qt3DSDMInstanceHandle inHandle) override;
     void GetInstances(TInstanceHandleList &outInstances) const override;
     void GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
-                                         CUICDMInstanceHandle inParentHandle) const override;
+                                         Qt3DSDMInstanceHandle inParentHandle) const override;
 
-    void DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent) override;
-    void GetInstanceParents(CUICDMInstanceHandle inHandle,
+    void DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent) override;
+    void GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
                                     TInstanceHandleList &outParents) const override;
     // Returns true if inParent == inInstance || inInstance is derived from inParent somehow.
     // Recursive.
-    bool IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                         CUICDMInstanceHandle inParent) const override;
+    bool IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMInstanceHandle inParent) const override;
 
-    CUICDMPropertyHandle AddProperty(CUICDMInstanceHandle inClass, TCharPtr inName,
+    Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inClass, TCharPtr inName,
                                              DataModelDataType::Value inPropType) override;
-    const SUICDMPropertyDefinition &GetProperty(CUICDMPropertyHandle inProperty) const override;
-    void GetInstanceProperties(CUICDMInstanceHandle inInstance,
+    const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
+    void GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                        TPropertyHandleList &outProperties) const override;
-    void RemoveProperty(CUICDMPropertyHandle inProperty) override;
-    void CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
-                                        CUICDMInstanceHandle inDestInstance) override;
-    void RemoveCachedValues(CUICDMInstanceHandle inInstance) override;
+    void RemoveProperty(Qt3DSDMPropertyHandle inProperty) override;
+    void CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
+                                        Qt3DSDMInstanceHandle inDestInstance) override;
+    void RemoveCachedValues(Qt3DSDMInstanceHandle inInstance) override;
 
     bool IsInstance(int inHandle) const override;
     bool IsProperty(int inHandle) const override;
     //===============================================================
 
-    bool GetSpecificInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const;
-    void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inInstance,
+    bool GetSpecificInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const;
+    void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inInstance,
                                            TPropertyPairHash &outValues) const;
 
     static CDataModelPropertyDefinitionObject *GetPropertyDefinitionNF(int inHandle,
@@ -303,7 +303,7 @@ public:
     // if inInstance doesn't exists in inObjects, it will push back NULL instead of throwing
     // exception
     static inline void UncheckAddInstancePair(CDataModelInstance::TInstancePairList &outInstances,
-                                              CUICDMInstanceHandle inInstance,
+                                              Qt3DSDMInstanceHandle inInstance,
                                               THandleObjectMap &inObjects)
     {
         outInstances.insert(
@@ -347,22 +347,22 @@ public:
 
 protected:
     bool IsInstanceOrDerivedFromHelper(const TDataModelInstancePtr inInstance,
-                                       CUICDMInstanceHandle inParent) const;
+                                       Qt3DSDMInstanceHandle inParent) const;
     void AddInstanceIfDerivedFrom(const std::pair<int, THandleObjectPtr> &inItem,
                                   TInstanceHandleList &outInstances,
-                                  CUICDMInstanceHandle inParentHandle) const;
+                                  Qt3DSDMInstanceHandle inParentHandle) const;
 
     bool GetInstancePropertyValueHelper(const TDataModelInstancePtr inInstance,
-                                        CUICDMPropertyHandle inProperty, SValue &outValue) const;
+                                        Qt3DSDMPropertyHandle inProperty, SValue &outValue) const;
 
     // Create an instance *at* this specific handle position
     // This is used for special cases of serialization
-    CUICDMInstanceHandle CreateInstanceWithHandle(int inHandle);
-    CUICDMPropertyHandle AddPropertyWithHandle(int inHandle, CUICDMInstanceHandle inClass,
+    Qt3DSDMInstanceHandle CreateInstanceWithHandle(int inHandle);
+    Qt3DSDMPropertyHandle AddPropertyWithHandle(int inHandle, Qt3DSDMInstanceHandle inClass,
                                                TCharPtr inName, DataModelDataType::Value inPropType);
 
-    void UncheckedSetSpecificInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty,
+    void UncheckedSetSpecificInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty,
                                                    const SValue &inValue,
                                                    PropertyValueFlags inIsUserSet);
 };
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.cpp
index b22eba5c..8a19b667 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.cpp
@@ -36,13 +36,13 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideHandle CSimpleSlideCore::CreateSlide(CUICDMInstanceHandle inInstance)
+CUICDMSlideHandle CSimpleSlideCore::CreateSlide(Qt3DSDMInstanceHandle inInstance)
 {
     int nextId = GetNextId();
     return CreateSlideWithHandle(nextId, inInstance);
 }
 
-CUICDMInstanceHandle CSimpleSlideCore::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle CSimpleSlideCore::GetSlideInstance(CUICDMSlideHandle 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(CUICDMInstanceHandle inInstance) const
+CUICDMSlideHandle CSimpleSlideCore::GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const
 {
     THandleObjectMap::const_iterator theSlide =
         find_if(m_Objects.begin(), m_Objects.end(),
@@ -156,8 +156,8 @@ int CSimpleSlideCore::GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandl
 }
 
 bool CSimpleSlideCore::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                CUICDMInstanceHandle inHandle,
-                                                CUICDMPropertyHandle inProperty,
+                                                Qt3DSDMInstanceHandle inHandle,
+                                                Qt3DSDMPropertyHandle inProperty,
                                                 SValue &outValue) const
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
@@ -172,7 +172,7 @@ bool CSimpleSlideCore::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
 }
 
 std::pair<SSlide *, SInternValue *> CSimpleSlideCore::ResolveSetInstancePropertyValue(
-    CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle, CUICDMPropertyHandle inProperty)
+    CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle, Qt3DSDMPropertyHandle inProperty)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, m_Objects);
     SInternValue *theValue = theSlide->GetInstancePropertyValue(inHandle, inProperty);
@@ -184,8 +184,8 @@ std::pair<SSlide *, SInternValue *> CSimpleSlideCore::ResolveSetInstanceProperty
 }
 
 void CSimpleSlideCore::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                CUICDMInstanceHandle inHandle,
-                                                CUICDMPropertyHandle inProperty,
+                                                Qt3DSDMInstanceHandle inHandle,
+                                                Qt3DSDMPropertyHandle inProperty,
                                                 const SValue &inValue)
 {
     std::pair<SSlide *, SInternValue *> theTarget(
@@ -198,8 +198,8 @@ void CSimpleSlideCore::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
 }
 
 void CSimpleSlideCore::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                     CUICDMInstanceHandle inHandle,
-                                                     CUICDMPropertyHandle inProperty,
+                                                     Qt3DSDMInstanceHandle inHandle,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      const SValue &inValue)
 {
     CSimpleSlideCore::ForceSetPropertyValue(GetStringTable(), m_Objects, inSlide, inHandle,
@@ -207,8 +207,8 @@ void CSimpleSlideCore::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
 }
 
 bool CSimpleSlideCore::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                        CUICDMInstanceHandle inInstance,
-                                                        CUICDMPropertyHandle inProperty,
+                                                        Qt3DSDMInstanceHandle inInstance,
+                                                        Qt3DSDMPropertyHandle inProperty,
                                                         SValue &outValue) const
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
@@ -221,7 +221,7 @@ bool CSimpleSlideCore::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlid
 }
 
 void CSimpleSlideCore::GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
-                                                         CUICDMInstanceHandle inInstance,
+                                                         Qt3DSDMInstanceHandle inInstance,
                                                          TPropertyHandleValuePairList &outValues)
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
@@ -235,15 +235,15 @@ void CSimpleSlideCore::GetSlidePropertyEntries(CUICDMSlideHandle inSlide,
     theSlide->ToSlideEntryList(outEntries);
 }
 
-bool CSimpleSlideCore::ContainsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                        CUICDMPropertyHandle inProperty) const
+bool CSimpleSlideCore::ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                        Qt3DSDMPropertyHandle inProperty) const
 {
     const SSlide *theSlide = GetSlideNF(inSlide, m_Objects);
     return theSlide->GetInstancePropertyValue(inHandle, inProperty) != NULL;
 }
 
 CUICDMSlideHandle CSimpleSlideCore::CreateSlideWithHandle(int inHandle,
-                                                          CUICDMInstanceHandle inInstance)
+                                                          Qt3DSDMInstanceHandle inInstance)
 {
     if (HandleValid(inHandle))
         throw HandleExists(L"");
@@ -265,16 +265,16 @@ bool CSimpleSlideCore::IsSlide(CUICDMSlideHandle inSlide) const
 
 void CSimpleSlideCore::ForceSetPropertyValue(IStringTable &inStringTable,
                                              THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
-                                             CUICDMInstanceHandle inHandle,
-                                             CUICDMPropertyHandle inProperty, const SValue &inValue)
+                                             Qt3DSDMInstanceHandle inHandle,
+                                             Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
 {
     CSimpleSlideCore::GetSlideNF(inSlide, inObjects)
         ->SetInstancePropertyValue(inHandle, inProperty, SInternValue(inValue, inStringTable));
 }
 
 void CSimpleSlideCore::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
-                                                   CUICDMInstanceHandle inHandle,
-                                                   CUICDMPropertyHandle inProperty,
+                                                   Qt3DSDMInstanceHandle inHandle,
+                                                   Qt3DSDMPropertyHandle inProperty,
                                                    const SValue &inValue)
 {
     ForceSetPropertyValue(GetStringTable(), m_Objects, inParent, inHandle, inProperty, inValue);
@@ -283,8 +283,8 @@ void CSimpleSlideCore::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
                        std::placeholders::_1, inHandle, inProperty, inValue));
 }
 
-inline void AddIntersectingEntry(TSlideEntryList &outEntries, CUICDMInstanceHandle inst,
-                                 CUICDMPropertyHandle prop, const SInternValue &inValue)
+inline void AddIntersectingEntry(TSlideEntryList &outEntries, Qt3DSDMInstanceHandle inst,
+                                 Qt3DSDMPropertyHandle prop, const SInternValue &inValue)
 {
     outEntries.push_back(TSlideEntry(inst, prop, inValue.GetValue()));
 }
@@ -315,8 +315,8 @@ void CSimpleSlideCore::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
 }
 
 void CSimpleSlideCore::ClearPropertyValue(THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty)
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty)
 {
     CSimpleSlideCore::GetSlideNF(inSlide, inObjects)
         ->RemoveInstancePropertyValue(inInstance, inProperty);
@@ -346,43 +346,43 @@ void CSimpleSlideCore::ForEachChild(CUICDMSlideHandle inParent,
            std::bind(LookupSlideAndDoSomething, std::placeholders::_1, m_Objects, inFunction));
 }
 
-bool InstanceMatches(CUICDMInstanceHandle inTarget, CUICDMInstanceHandle inHandle,
-                     CUICDMPropertyHandle)
+bool InstanceMatches(Qt3DSDMInstanceHandle inTarget, Qt3DSDMInstanceHandle inHandle,
+                     Qt3DSDMPropertyHandle)
 {
     return inTarget == inHandle;
 }
 
-bool PropertyMatches(CUICDMPropertyHandle inTarget, CUICDMInstanceHandle,
-                     CUICDMPropertyHandle inProp)
+bool PropertyMatches(Qt3DSDMPropertyHandle inTarget, Qt3DSDMInstanceHandle,
+                     Qt3DSDMPropertyHandle inProp)
 {
     return inTarget == inProp;
 }
 
 bool InstancePropertyMatchesVector(const TInstanceHandleList &inInstances,
                                    const TPropertyHandleList &inProperties,
-                                   CUICDMInstanceHandle slideInst, CUICDMPropertyHandle slideProp)
+                                   Qt3DSDMInstanceHandle slideInst, Qt3DSDMPropertyHandle slideProp)
 {
     return std::find(inInstances.begin(), inInstances.end(), slideInst) != inInstances.end()
         && std::find(inProperties.begin(), inProperties.end(), slideProp) != inProperties.end();
 }
 
-bool InstancePropertyMatches(const CUICDMInstanceHandle inInstance,
-                             const CUICDMPropertyHandle inProperty, CUICDMInstanceHandle slideInst,
-                             CUICDMPropertyHandle slideProp)
+bool InstancePropertyMatches(const Qt3DSDMInstanceHandle inInstance,
+                             const Qt3DSDMPropertyHandle inProperty, Qt3DSDMInstanceHandle slideInst,
+                             Qt3DSDMPropertyHandle slideProp)
 {
     return inInstance == slideInst && inProperty == slideProp;
 }
 
-void CSimpleSlideCore::DeleteAllInstanceEntries(CUICDMInstanceHandle inHandle)
+void CSimpleSlideCore::DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inHandle)
 {
-    std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle)> predicate(
+    std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> predicate(
         std::bind(InstanceMatches, inHandle, std::placeholders::_1, std::placeholders::_2));
     ForEachSlide(std::bind(&SSlide::ClearPropertiesIf, std::placeholders::_1, predicate));
 }
 
-void CSimpleSlideCore::DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle)
+void CSimpleSlideCore::DeleteAllPropertyEntries(Qt3DSDMPropertyHandle inHandle)
 {
-    std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle)> predicate(
+    std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> predicate(
         std::bind(PropertyMatches, inHandle, std::placeholders::_1, std::placeholders::_2));
     ForEachSlide(std::bind(&SSlide::ClearPropertiesIf, std::placeholders::_1, predicate));
 }
@@ -390,17 +390,17 @@ void CSimpleSlideCore::DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle)
 void CSimpleSlideCore::DeleteAllInstancePropertyEntries(const TInstanceHandleList &inInstances,
                                                         const TPropertyHandleList &inProperties)
 {
-    std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle)> predicate(
+    std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> predicate(
         std::bind(InstancePropertyMatchesVector, inInstances, inProperties,
                   std::placeholders::_1, std::placeholders::_2));
     ForEachSlide(std::bind(&SSlide::ClearPropertiesIf, std::placeholders::_1, predicate));
 }
 
 void CSimpleSlideCore::ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
-                                                   CUICDMInstanceHandle inHandle,
-                                                   CUICDMPropertyHandle inProperty)
+                                                   Qt3DSDMInstanceHandle inHandle,
+                                                   Qt3DSDMPropertyHandle inProperty)
 {
-    std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle)> predicate(
+    std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> predicate(
         std::bind(InstancePropertyMatches, inHandle, inProperty,
                   std::placeholders::_1, std::placeholders::_2));
     ForEachChild(inParent, std::bind(&SSlide::ClearPropertiesIf, std::placeholders::_1, predicate));
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.h b/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.h
index e2118cbf..0ff4cecc 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.h
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleSlideCore.h
@@ -83,7 +83,7 @@ struct SSlide : public CHandleObject
     float m_Time;
 
     // Returns true if it was inserted, false if the property value was set.
-    bool SetInstancePropertyValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    bool SetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                   const SInternValue &inValue)
     {
         TSlideInstancePropertyPair theKey(inInstance.GetHandleValue(), inProperty.GetHandleValue());
@@ -94,8 +94,8 @@ struct SSlide : public CHandleObject
         return insertResult.second;
     }
     // Returns true if the property was deleted
-    bool RemoveInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty)
+    bool RemoveInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty)
     {
         TSlideInstancePropertyPair theKey(inInstance.GetHandleValue(), inProperty.GetHandleValue());
         TSlideEntryHash::iterator find(m_Properties.find(theKey));
@@ -106,8 +106,8 @@ struct SSlide : public CHandleObject
         return false;
     }
     // Return a pointer to out property value.  This allows quicker checks for isset and such
-    SInternValue *GetInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                           CUICDMPropertyHandle inProperty) const
+    SInternValue *GetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMPropertyHandle inProperty) const
     {
         TSlideInstancePropertyPair theKey(inInstance.GetHandleValue(), inProperty.GetHandleValue());
         TSlideEntryHash::const_iterator find(m_Properties.find(theKey));
@@ -116,7 +116,7 @@ struct SSlide : public CHandleObject
         return NULL;
     }
 
-    void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inInstance,
+    void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outProperties) const
     {
         for (TSlideEntryHash::const_iterator theIter = m_Properties.begin(),
@@ -195,7 +195,7 @@ struct SSlide : public CHandleObject
 
     // result is the instance, property, myvalue, othervalue
     void IntersectProperties(const SSlide &inOther,
-                             std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+                             std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                   SInternValue, SInternValue)>
                                  inResult) const
     {
@@ -213,7 +213,7 @@ struct SSlide : public CHandleObject
     // This allows a third party to manipulate the property values during the process.
     void SetPropertyValuesIf(
         IStringTable &inStringTable,
-        std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle, SValue &)> inPredIntercept)
+        std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, SValue &)> inPredIntercept)
     {
         for (TSlideEntryHash::iterator theIter = m_Properties.begin(), theEnd = m_Properties.end();
              theIter != theEnd; ++theIter) {
@@ -224,7 +224,7 @@ struct SSlide : public CHandleObject
     }
 
     void
-    ClearPropertiesIf(std::function<bool(CUICDMInstanceHandle, CUICDMPropertyHandle)> inPredicate)
+    ClearPropertiesIf(std::function<bool(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> inPredicate)
     {
         bool foundOne;
         do {
@@ -258,9 +258,9 @@ public: // use
 
     TStringTablePtr GetStringTablePtr() const override { return m_StringTable; }
     IStringTable &GetStringTable() const override { return *m_StringTable.get(); }
-    CUICDMSlideHandle CreateSlide(CUICDMInstanceHandle inInstance) override;
-    CUICDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
-    CUICDMSlideHandle GetSlideByInstance(CUICDMInstanceHandle inInstance) const override;
+    CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
+    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
+    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
     void DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
     void GetSlides(TSlideHandleList &outSlides) const override;
 
@@ -272,50 +272,50 @@ public: // use
     void GetChildSlides(CUICDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
     int GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const override;
 
-    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                  CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                  CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                  Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    void SetInstancePropertyValue(CUICDMSlideHandle 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, CUICDMInstanceHandle inHandle,
-                                    CUICDMPropertyHandle inProperty);
-    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                       CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    ResolveSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                    Qt3DSDMPropertyHandle inProperty);
+    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                       Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
     bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
 
     void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
-                                           CUICDMInstanceHandle inInstance,
+                                           Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outValues) override;
 
     void GetSlidePropertyEntries(CUICDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
 
-    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, CUICDMInstanceHandle inHandle,
-                                     CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+                                     Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
     void GetIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
                                    TSlideEntryList &outEntries) const override;
     void PushIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
                                     CUICDMSlideHandle inDestination) override;
 
-    void ClearChildrenPropertyValues(CUICDMSlideHandle inParent, CUICDMInstanceHandle inHandle,
-                                     CUICDMPropertyHandle inProperty) override;
+    void ClearChildrenPropertyValues(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+                                     Qt3DSDMPropertyHandle inProperty) override;
 
-    void DeleteAllInstanceEntries(CUICDMInstanceHandle inHandle) override;
-    void DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle) override;
+    void DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inHandle) override;
+    void DeleteAllPropertyEntries(Qt3DSDMPropertyHandle inHandle) override;
     void DeleteAllInstancePropertyEntries(const TInstanceHandleList &inInstances,
                                           const TPropertyHandleList &inProperties) override;
 
-    bool ContainsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                          CUICDMPropertyHandle inProperty) const override;
+    bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                          Qt3DSDMPropertyHandle inProperty) const override;
     bool HandleValid(int inHandle) const override { return CHandleBase::HandleValid(inHandle); }
 
-    CUICDMSlideHandle CreateSlideWithHandle(int inHandle, CUICDMInstanceHandle inInstance);
+    CUICDMSlideHandle CreateSlideWithHandle(int inHandle, Qt3DSDMInstanceHandle inInstance);
     void GetSlideProperties(CUICDMSlideHandle inSlide, TSlideEntryList &outProperties) const;
 
     bool IsSlide(CUICDMSlideHandle inSlide) const override;
@@ -326,8 +326,8 @@ public: // use
 
     // Only implemented at the producer level, not at this lower level.
     void CopyProperties(CUICDMSlideHandle /*inSourceSlide*/,
-                        CUICDMInstanceHandle /*inSourceInstance*/,
-                        CUICDMSlideHandle /*inDestSlide*/, CUICDMInstanceHandle /*inDestInstance*/) override
+                        Qt3DSDMInstanceHandle /*inSourceInstance*/,
+                        CUICDMSlideHandle /*inDestSlide*/, Qt3DSDMInstanceHandle /*inDestInstance*/) override
     {
         throw SlideNotFound(L"");
     }
@@ -354,15 +354,15 @@ public: // use
     }
 
     static void ForceSetPropertyValue(IStringTable &inStringTable, THandleObjectMap &inObjects,
-                                      CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                      CUICDMPropertyHandle inProperty, const SValue &inValue);
+                                      CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                      Qt3DSDMPropertyHandle inProperty, const SValue &inValue);
 
     static void ClearPropertyValue(THandleObjectMap &inObjects, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty);
+                                   Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty);
 
     static inline bool SlideEntryInstanceMatches(const TSlideEntry &inEntry,
-                                                 CUICDMInstanceHandle inHandle)
+                                                 Qt3DSDMInstanceHandle inHandle)
     {
         using namespace std;
         if (inHandle.GetHandleValue() == get<0>(inEntry))
@@ -371,7 +371,7 @@ public: // use
     }
 
     static inline bool SlideEntryPropertyMatches(const TSlideEntry &inEntry,
-                                                 CUICDMPropertyHandle inProperty)
+                                                 Qt3DSDMPropertyHandle inProperty)
     {
         using namespace std;
         return inProperty.GetHandleValue() == get<1>(inEntry);
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.cpp
index f9825287..2e460574 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.cpp
@@ -83,7 +83,7 @@ void CSimpleSlideGraphCore::DeleteSlideGraph(CUICDMSlideGraphHandle inHandle)
 
 void CSimpleSlideGraphCore::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
                                               CUICDMSlideHandle inSlide,
-                                              CUICDMInstanceHandle inInstance)
+                                              Qt3DSDMInstanceHandle inInstance)
 {
     pair<TInstanceToGraphMap::iterator, bool> theResult =
         m_InstanceToGraph.insert(make_pair(inInstance, make_pair(inSlideGraph, inSlide)));
@@ -106,7 +106,7 @@ void CSimpleSlideGraphCore::GetAssociatedInstances(CUICDMSlideGraphHandle inSlid
                                theFind->second.end());
 }
 
-TGraphSlidePair CSimpleSlideGraphCore::GetAssociatedGraph(CUICDMInstanceHandle inInstance) const
+TGraphSlidePair CSimpleSlideGraphCore::GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const
 {
     TInstanceToGraphMap::const_iterator theResult = m_InstanceToGraph.find(inInstance);
     if (theResult != m_InstanceToGraph.end())
@@ -116,18 +116,18 @@ TGraphSlidePair CSimpleSlideGraphCore::GetAssociatedGraph(CUICDMInstanceHandle i
 
 struct SInstanceMatcher
 {
-    CUICDMInstanceHandle m_Instance;
-    SInstanceMatcher(CUICDMInstanceHandle inInst)
+    Qt3DSDMInstanceHandle m_Instance;
+    SInstanceMatcher(Qt3DSDMInstanceHandle inInst)
         : m_Instance(inInst)
     {
     }
-    bool operator()(const pair<CUICDMSlideHandle, CUICDMInstanceHandle> &inItem) const
+    bool operator()(const pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> &inItem) const
     {
         return m_Instance == inItem.second;
     }
 };
 
-void CSimpleSlideGraphCore::DissociateInstance(CUICDMInstanceHandle inInstance)
+void CSimpleSlideGraphCore::DissociateInstance(Qt3DSDMInstanceHandle inInstance)
 {
     TGraphSlidePair theAssociatedGraph(GetAssociatedGraph(inInstance));
 
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.h b/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.h
index d0cb0a7d..399183a3 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.h
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleSlideGraphCore.h
@@ -59,7 +59,7 @@ struct SSlideGraph : public CHandleObject
 class CSimpleSlideGraphCore : public CHandleBase, public ISlideGraphCore
 {
     TStringTablePtr m_StringTable;
-    typedef std::unordered_map<CUICDMInstanceHandle,
+    typedef std::unordered_map<Qt3DSDMInstanceHandle,
                                  pair<CUICDMSlideGraphHandle, CUICDMSlideHandle>, std::hash<int>>
         TInstanceToGraphMap;
     typedef std::unordered_map<CUICDMSlideGraphHandle, TSlideInstancePairList, std::hash<int>>
@@ -97,11 +97,11 @@ public:
      *	implicitly associated with any root-derived slides.
      */
     void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
-                           CUICDMInstanceHandle inInstance) override;
+                           Qt3DSDMInstanceHandle inInstance) override;
     void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                 TSlideInstancePairList &outAssociations) const override;
-    TGraphSlidePair GetAssociatedGraph(CUICDMInstanceHandle inInstance) const override;
-    void DissociateInstance(CUICDMInstanceHandle inInstance) override;
+    TGraphSlidePair GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const override;
+    void DissociateInstance(Qt3DSDMInstanceHandle inInstance) override;
 
     /**
      *	All graphs always have an active slide.  This is assumed to be the root right off the bat.
diff --git a/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.cpp b/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.cpp
index 71424b00..22c2a4d0 100644
--- a/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.cpp
@@ -39,7 +39,7 @@ using namespace std;
 
 namespace qt3dsdm {
 
-CUICDMSlideHandle CSlideCoreProducer::CreateSlide(CUICDMInstanceHandle inInstance)
+CUICDMSlideHandle CSlideCoreProducer::CreateSlide(Qt3DSDMInstanceHandle inInstance)
 {
     CUICDMSlideHandle retval = m_Data->CreateSlide(inInstance);
     CREATE_HANDLE_CREATE_TRANSACTION(m_Consumer, retval, m_Data->m_Objects);
@@ -47,12 +47,12 @@ CUICDMSlideHandle CSlideCoreProducer::CreateSlide(CUICDMInstanceHandle inInstanc
     return retval;
 }
 
-CUICDMInstanceHandle CSlideCoreProducer::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle CSlideCoreProducer::GetSlideInstance(CUICDMSlideHandle inSlide) const
 {
     return m_Data->GetSlideInstance(inSlide);
 }
 
-CUICDMSlideHandle CSlideCoreProducer::GetSlideByInstance(CUICDMInstanceHandle inSlide) const
+CUICDMSlideHandle CSlideCoreProducer::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
 {
     return m_Data->GetSlideByInstance(inSlide);
 }
@@ -164,8 +164,8 @@ int CSlideCoreProducer::GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHan
 }
 
 bool CSlideCoreProducer::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inHandle,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inHandle,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const
 {
     return m_Data->GetInstancePropertyValue(inSlide, inHandle, inProperty, outValue);
@@ -179,8 +179,8 @@ inline void EraseProperty(TSlideEntryList &inProperties, int inInstance, int inP
 }
 
 void CSlideCoreProducer::SetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inHandle,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inHandle,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue)
 {
     std::pair<SSlide *, SInternValue *> slideAndProp(
@@ -215,8 +215,8 @@ struct HashMapDataValueInsertTransaction
 };
 
 inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                                CUICDMInstanceHandle inHandle,
-                                                                CUICDMPropertyHandle inProperty,
+                                                                Qt3DSDMInstanceHandle inHandle,
+                                                                Qt3DSDMPropertyHandle inProperty,
                                                                 const SValue &inValue)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, m_Data->m_Objects);
@@ -263,8 +263,8 @@ inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(CUICDMSlideHandl
 }
 
 void CSlideCoreProducer::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                       CUICDMInstanceHandle inHandle,
-                                                       CUICDMPropertyHandle inProperty,
+                                                       Qt3DSDMInstanceHandle inHandle,
+                                                       Qt3DSDMPropertyHandle inProperty,
                                                        const SValue &inValue)
 {
     if (m_Consumer)
@@ -274,15 +274,15 @@ void CSlideCoreProducer::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide
 }
 
 bool CSlideCoreProducer::GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                          CUICDMInstanceHandle inInstance,
-                                                          CUICDMPropertyHandle inProperty,
+                                                          Qt3DSDMInstanceHandle inInstance,
+                                                          Qt3DSDMPropertyHandle inProperty,
                                                           SValue &outValue) const
 {
     return m_Data->GetSpecificInstancePropertyValue(inSlide, inInstance, inProperty, outValue);
 }
 
-bool CSlideCoreProducer::ContainsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty) const
+bool CSlideCoreProducer::ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty) const
 {
     return m_Data->ContainsProperty(inSlide, inHandle, inProperty);
 }
@@ -294,8 +294,8 @@ void CSlideCoreProducer::GetSlidePropertyEntries(CUICDMSlideHandle inSlide,
 }
 
 void CSlideCoreProducer::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
-                                                     CUICDMInstanceHandle inHandle,
-                                                     CUICDMPropertyHandle inProperty,
+                                                     Qt3DSDMInstanceHandle inHandle,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      const SValue &inValue)
 {
     SSlide *theParent = CSimpleSlideCore::GetSlideNF(inParent, m_Data->m_Objects);
@@ -308,8 +308,8 @@ void CSlideCoreProducer::PushPropertyValueToChildren(CUICDMSlideHandle inParent,
 inline void ClearValueWithTransactions(TTransactionConsumerPtr inConsumer,
                                        THandleObjectMap &inObjects,
                                        ISlideCoreSignalSender *inSignalSender, int inSlide,
-                                       CUICDMInstanceHandle inHandle,
-                                       CUICDMPropertyHandle inProperty)
+                                       Qt3DSDMInstanceHandle inHandle,
+                                       Qt3DSDMPropertyHandle inProperty)
 {
     SSlide *theSlide = CSimpleSlideCore::GetSlideNF(inSlide, inObjects);
     SInternValue *theCurrentValue(theSlide->GetInstancePropertyValue(inHandle, inProperty));
@@ -325,8 +325,8 @@ inline void ClearValueWithTransactions(TTransactionConsumerPtr inConsumer,
 }
 
 void CSlideCoreProducer::ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
-                                                     CUICDMInstanceHandle inHandle,
-                                                     CUICDMPropertyHandle inProperty)
+                                                     Qt3DSDMInstanceHandle inHandle,
+                                                     Qt3DSDMPropertyHandle inProperty)
 {
     SSlide *theParent = CSimpleSlideCore::GetSlideNF(inParent, m_Data->m_Objects);
     do_all(theParent->m_Children,
@@ -392,13 +392,13 @@ void DeleteAllSlideEntriesWithUndo(TTransactionConsumerPtr inConsumer, IStringTa
                         std::ref(inStringTable)));
 }
 
-void CSlideCoreProducer::DeleteAllInstanceEntries(CUICDMInstanceHandle inInstance)
+void CSlideCoreProducer::DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inInstance)
 {
     DeleteAllSlideEntriesWithUndo(
         m_Consumer, GetStringTable(), m_Data->m_Objects,
         std::bind(CSimpleSlideCore::SlideEntryInstanceMatches, std::placeholders::_1, inInstance));
 }
-void CSlideCoreProducer::DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle)
+void CSlideCoreProducer::DeleteAllPropertyEntries(Qt3DSDMPropertyHandle inHandle)
 {
     DeleteAllSlideEntriesWithUndo(
         m_Consumer, GetStringTable(), m_Data->m_Objects,
@@ -421,13 +421,13 @@ void CSlideCoreProducer::GetIntersectingProperties(CUICDMSlideHandle inSlide1,
     return m_Data->GetIntersectingProperties(inSlide1, inSlide2, outEntries);
 }
 
-bool InstancePropMatches(CUICDMInstanceHandle instance, CUICDMPropertyHandle prop,
+bool InstancePropMatches(Qt3DSDMInstanceHandle instance, Qt3DSDMPropertyHandle prop,
                          const TSlideEntry &entry)
 {
     return instance == get<0>(entry) && prop == get<1>(entry);
 }
 
-bool SendPropertyAddedIfNotInList(CUICDMInstanceHandle instance, CUICDMPropertyHandle prop,
+bool SendPropertyAddedIfNotInList(Qt3DSDMInstanceHandle instance, Qt3DSDMPropertyHandle prop,
                                   SValue & /*value*/, const TSlideEntryList &inList,
                                   CUICDMSlideHandle inSource, CUICDMSlideHandle inSlide,
                                   ISlideCoreSignalSender * /*inSignalSender*/)
@@ -467,9 +467,9 @@ void CSlideCoreProducer::PushIntersectingProperties(CUICDMSlideHandle inSlide1,
 }
 
 void CSlideCoreProducer::CopyProperties(CUICDMSlideHandle inSourceSlide,
-                                        CUICDMInstanceHandle inSourceInstance,
+                                        Qt3DSDMInstanceHandle inSourceInstance,
                                         CUICDMSlideHandle inDestSlide,
-                                        CUICDMInstanceHandle inDestInstance)
+                                        Qt3DSDMInstanceHandle inDestInstance)
 {
     SSlide *sourceSlide = CSimpleSlideCore::GetSlideNF(inSourceSlide, m_Data->m_Objects);
 
@@ -522,13 +522,13 @@ TSignalConnectionPtr CSlideCoreProducer::ConnectSlideDerived(
     return GetSignalProvider()->ConnectSlideDerived(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectInstancePropertyValueSet(
-    const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+    const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                const SValue &)> &inCallback)
 {
     return GetSignalProvider()->ConnectInstancePropertyValueSet(inCallback);
 }
 TSignalConnectionPtr CSlideCoreProducer::ConnectInstancePropertyValueRemoved(
-    const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+    const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                const SValue &)> &inCallback)
 {
     return GetSignalProvider()->ConnectInstancePropertyValueRemoved(inCallback);
diff --git a/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.h b/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.h
index ebd21cae..033340b0 100644
--- a/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.h
+++ b/src/Authoring/UICDM/Systems/Cores/SlideCoreProducer.h
@@ -97,9 +97,9 @@ public:
     TSimpleSlideCorePtr GetTransactionlessSlideCore() { return m_Data; }
     TSimpleSlideCorePtr GetTransactionlessSlideCore() const { return m_Data; }
 
-    CUICDMSlideHandle CreateSlide(CUICDMInstanceHandle inInstance) override;
-    CUICDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
-    CUICDMSlideHandle GetSlideByInstance(CUICDMInstanceHandle inSlide) const override;
+    CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) override;
+    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const override;
+    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const override;
     void DeleteSlide(CUICDMSlideHandle inSlide, TInstanceHandleList &outInstances) override;
     void GetSlides(TSlideHandleList &outSlides) const override;
 
@@ -111,31 +111,31 @@ public:
     void GetChildSlides(CUICDMSlideHandle inSlide, TSlideHandleList &outChildren) const override;
     int GetChildIndex(CUICDMSlideHandle inParent, CUICDMSlideHandle inChild) const override;
 
-    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                  CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                  CUICDMPropertyHandle inProperty, const SValue &inValue) override;
-    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                       CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    bool GetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                  Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    void SetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                  Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
+    void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                       Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
     bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
     void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
-                                           CUICDMInstanceHandle inInstance,
+                                           Qt3DSDMInstanceHandle inInstance,
                                            TPropertyHandleValuePairList &outValues) override
     {
         return m_Data->GetSpecificInstancePropertyValues(inSlide, inInstance, outValues);
     }
-    bool ContainsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                          CUICDMPropertyHandle inProperty) const override;
+    bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                          Qt3DSDMPropertyHandle inProperty) const override;
     void GetSlidePropertyEntries(CUICDMSlideHandle inSlide, TSlideEntryList &outEntries) const override;
 
-    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, CUICDMInstanceHandle inHandle,
-                                     CUICDMPropertyHandle inProperty, const SValue &inValue) override;
-    void ClearChildrenPropertyValues(CUICDMSlideHandle inParent, CUICDMInstanceHandle inHandle,
-                                     CUICDMPropertyHandle inProperty) override;
-    void DeleteAllInstanceEntries(CUICDMInstanceHandle inHandle) override;
-    void DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle) override;
+    void PushPropertyValueToChildren(CUICDMSlideHandle inParent, Qt3DSDMInstanceHandle inHandle,
+                                     Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
+    void ClearChildrenPropertyValues(CUICDMSlideHandle 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;
 
@@ -143,8 +143,8 @@ public:
                                    TSlideEntryList &outEntries) const override;
     void PushIntersectingProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide2,
                                     CUICDMSlideHandle inDestination) override;
-    void CopyProperties(CUICDMSlideHandle inSourceSlide, CUICDMInstanceHandle inSourceInstance,
-                        CUICDMSlideHandle inDestSlide, CUICDMInstanceHandle inDestInstance) override;
+    void CopyProperties(CUICDMSlideHandle inSourceSlide, Qt3DSDMInstanceHandle inSourceInstance,
+                        CUICDMSlideHandle inDestSlide, Qt3DSDMInstanceHandle inDestInstance) override;
 
     bool IsSlide(CUICDMSlideHandle inSlide) const override;
 
@@ -165,18 +165,18 @@ public:
     TSignalConnectionPtr ConnectSlideDerived(
         const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback) override;
     TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override;
     TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override;
     virtual TSignalConnectionPtr
     ConnectSlideTimeChanged(const std::function<void(CUICDMSlideHandle)> &inCallback) override;
 
 private:
     inline void DoForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                CUICDMInstanceHandle inHandle,
-                                                CUICDMPropertyHandle inProperty,
+                                                Qt3DSDMInstanceHandle inHandle,
+                                                Qt3DSDMPropertyHandle inProperty,
                                                 const SValue &inValue);
     void InitSignaller();
     ISlideCoreSignalProvider *GetSignalProvider();
diff --git a/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.cpp b/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.cpp
index 8e661a39..082f1070 100644
--- a/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.cpp
@@ -101,12 +101,12 @@ struct SInstanceAssociateTrans : public ITransaction
     std::shared_ptr<CSimpleSlideGraphCore> m_Graph;
     CUICDMSlideGraphHandle m_GraphHandle;
     CUICDMSlideHandle m_Slide;
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     bool m_InsertOnDo;
     SInstanceAssociateTrans(const char *inFile, int inLine,
                             std::shared_ptr<CSimpleSlideGraphCore> inGraph,
                             CUICDMSlideGraphHandle inGraphHandle, CUICDMSlideHandle inSlideHandle,
-                            CUICDMInstanceHandle inInstance, bool inInsertOnDo)
+                            Qt3DSDMInstanceHandle inInstance, bool inInsertOnDo)
         : ITransaction(inFile, inLine)
         , m_Graph(inGraph)
         , m_GraphHandle(inGraphHandle)
@@ -136,7 +136,7 @@ struct SInstanceAssociateTrans : public ITransaction
 
 void CSlideGraphCoreProducer::AssociateInstance(CUICDMSlideGraphHandle inSlideGraph,
                                                 CUICDMSlideHandle inSlide,
-                                                CUICDMInstanceHandle inInstance)
+                                                Qt3DSDMInstanceHandle inInstance)
 {
     m_Data->AssociateInstance(inSlideGraph, inSlide, inInstance);
     if (m_Consumer)
@@ -151,12 +151,12 @@ void CSlideGraphCoreProducer::GetAssociatedInstances(CUICDMSlideGraphHandle inSl
     m_Data->GetAssociatedInstances(inSlideGraph, outAssociations);
 }
 
-TGraphSlidePair CSlideGraphCoreProducer::GetAssociatedGraph(CUICDMInstanceHandle inInstance) const
+TGraphSlidePair CSlideGraphCoreProducer::GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const
 {
     return m_Data->GetAssociatedGraph(inInstance);
 }
 
-void CSlideGraphCoreProducer::DissociateInstance(CUICDMInstanceHandle inInstance)
+void CSlideGraphCoreProducer::DissociateInstance(Qt3DSDMInstanceHandle inInstance)
 {
     TGraphSlidePair theAssociatedGraph(m_Data->GetAssociatedGraph(inInstance));
 
@@ -211,13 +211,13 @@ TSignalConnectionPtr CSlideGraphCoreProducer::ConnectGraphDeleted(
     return GetSignalProvider()->ConnectGraphDeleted(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceAssociated(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
         &inCallback)
 {
     return GetSignalProvider()->ConnectInstanceAssociated(inCallback);
 }
 TSignalConnectionPtr CSlideGraphCoreProducer::ConnectInstanceDissociated(
-    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+    const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
         &inCallback)
 {
     return GetSignalProvider()->ConnectInstanceDissociated(inCallback);
diff --git a/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.h b/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.h
index 1b4dc457..b92e051a 100644
--- a/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.h
+++ b/src/Authoring/UICDM/Systems/Cores/SlideGraphCoreProducer.h
@@ -60,11 +60,11 @@ public:
     void DeleteSlideGraph(CUICDMSlideGraphHandle inHandle) override;
 
     void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
-                           CUICDMInstanceHandle inInstance) override;
+                           Qt3DSDMInstanceHandle inInstance) override;
     void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                 TSlideInstancePairList &outAssociations) const override;
-    TGraphSlidePair GetAssociatedGraph(CUICDMInstanceHandle inInstance) const override;
-    void DissociateInstance(CUICDMInstanceHandle inInstance) 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;
@@ -80,10 +80,10 @@ public:
     TSignalConnectionPtr ConnectGraphDeleted(
         const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override;
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override;
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override;
     TSignalConnectionPtr ConnectGraphActiveSlide(
         const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) override;
diff --git a/src/Authoring/UICDM/Systems/SignalsImpl.cpp b/src/Authoring/UICDM/Systems/SignalsImpl.cpp
index 05b74f47..5e9cb072 100644
--- a/src/Authoring/UICDM/Systems/SignalsImpl.cpp
+++ b/src/Authoring/UICDM/Systems/SignalsImpl.cpp
@@ -76,17 +76,17 @@ struct SBoostSignalConnection : public ISignalConnection
 class CPropertyCoreSignaller : public IInstancePropertyCoreSignalProvider,
                                public IInstancePropertyCoreSignalSender
 {
-    boost::signal<void(CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue)> m_PropertySignal;
+    boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)> m_PropertySignal;
 
 public:
     TSignalConnectionPtr ConnectInstancePropertyValue(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
             &inCallback) override
     {
         return CONNECT(m_PropertySignal.connect(inCallback));
     }
-    void SignalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                             CUICDMPropertyHandle inProperty, const SValue &inValue) override
+    void SignalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                             Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertySignal(inInstance, inProperty, inValue);
@@ -101,91 +101,91 @@ TSignalItemPtr CreatePropertyCoreSignaller()
 
 class CDataCoreSignaller : public IDataCoreSignalProvider, public IDataCoreSignalSender
 {
-    boost::signal<void(CUICDMInstanceHandle)> m_InstanceCreated;
-    boost::signal<void(CUICDMInstanceHandle)> m_BeforeInstanceDeleted;
-    boost::signal<void(CUICDMInstanceHandle)> m_InstanceDeleted;
-    boost::signal<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> m_InstanceDerived;
-    boost::signal<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> m_InstanceParentRemoved;
-    boost::signal<void(CUICDMInstanceHandle, CUICDMPropertyHandle, TCharPtr, DataModelDataType::Value)>
+    boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceCreated;
+    boost::signal<void(Qt3DSDMInstanceHandle)> m_BeforeInstanceDeleted;
+    boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceDeleted;
+    boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> m_InstanceDerived;
+    boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> m_InstanceParentRemoved;
+    boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, TCharPtr, DataModelDataType::Value)>
         m_PropertyAdded;
-    boost::signal<void(CUICDMInstanceHandle, CUICDMPropertyHandle, TCharPtr, DataModelDataType::Value)>
+    boost::signal<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, TCharPtr, DataModelDataType::Value)>
         m_PropertyRemoved;
 
 public:
     virtual TSignalConnectionPtr
-    ConnectInstanceCreated(const std::function<void(CUICDMInstanceHandle)> &inCallback) override
+    ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT(m_InstanceCreated.connect(inCallback));
     }
     virtual TSignalConnectionPtr
-    ConnectBeforeInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) override
+    ConnectBeforeInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT(m_BeforeInstanceDeleted.connect(inCallback));
     }
     virtual TSignalConnectionPtr
-    ConnectInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) override
+    ConnectInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT(m_InstanceDeleted.connect(inCallback));
     }
     TSignalConnectionPtr ConnectInstanceDerived(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT(m_InstanceDerived.connect(inCallback));
     }
     TSignalConnectionPtr ConnectInstanceParentRemoved(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT(m_InstanceParentRemoved.connect(inCallback));
     }
     virtual TSignalConnectionPtr
-    ConnectPropertyAdded(const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+    ConnectPropertyAdded(const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                     TCharPtr, DataModelDataType::Value)> &inCallback) override
     {
         return CONNECT(m_PropertyAdded.connect(inCallback));
     }
     virtual TSignalConnectionPtr
-    ConnectPropertyRemoved(const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+    ConnectPropertyRemoved(const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                       TCharPtr, DataModelDataType::Value)> &inCallback) override
     {
         return CONNECT(m_PropertyRemoved.connect(inCallback));
     }
 
-    void SignalInstanceCreated(CUICDMInstanceHandle inInstance) override
+    void SignalInstanceCreated(Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceCreated(inInstance);
     }
-    void SignalBeforeInstanceDeleted(CUICDMInstanceHandle inInstance) override
+    void SignalBeforeInstanceDeleted(Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_BeforeInstanceDeleted(inInstance);
     }
-    void SignalInstanceDeleted(CUICDMInstanceHandle inInstance) override
+    void SignalInstanceDeleted(Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDeleted(inInstance);
     }
-    void SignalInstanceDerived(CUICDMInstanceHandle inInstance,
-                                       CUICDMInstanceHandle inParent) override
+    void SignalInstanceDerived(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMInstanceHandle inParent) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDerived(inInstance, inParent);
     }
-    void SignalInstanceParentRemoved(CUICDMInstanceHandle inInstance,
-                                             CUICDMInstanceHandle inParent) override
+    void SignalInstanceParentRemoved(Qt3DSDMInstanceHandle inInstance,
+                                             Qt3DSDMInstanceHandle inParent) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceParentRemoved(inInstance, inParent);
     }
-    void SignalPropertyAdded(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty, TCharPtr inName,
+    void SignalPropertyAdded(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty, TCharPtr inName,
                                      DataModelDataType::Value inDataType) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyAdded(inInstance, inProperty, inName, inDataType);
     }
-    void SignalPropertyRemoved(CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, TCharPtr inName,
+    void SignalPropertyRemoved(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty, TCharPtr inName,
                                        DataModelDataType::Value inDataType) override
     {
         CHECK_SIGNALS_ENABLED();
@@ -204,12 +204,12 @@ class CSlideCoreSignaller : public ISlideCoreSignalProvider, public ISlideCoreSi
     boost::signal<void(CUICDMSlideHandle)> m_BeforeSlideDeleted;
     boost::signal<void(CUICDMSlideHandle)> m_SlideDeleted;
     boost::signal<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> m_SlideDerived;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
         m_InstancePropertyValueSet;
-    boost::signal<SValue(CUICDMSlideHandle, CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+    boost::signal<SValue(CUICDMSlideHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                   const SValue &)>
         m_InstancePropertyValueAdded;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
         m_InstancePropertyValueRemoved;
     boost::signal<void(CUICDMSlideHandle)> m_SlideTimeChanged;
 
@@ -235,19 +235,19 @@ public:
         return CONNECT_SIGNAL(m_SlideDerived);
     }
     TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueSet);
     }
     virtual TSignalConnectionPtr ConnectInstancePropertyValueAdded(
-        const std::function<SValue(CUICDMSlideHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                                     CUICDMPropertyHandle, const SValue &)> &inCallback)
+        const std::function<SValue(CUICDMSlideHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                                     Qt3DSDMPropertyHandle, const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueAdded);
     }
     TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstancePropertyValueRemoved);
@@ -279,15 +279,15 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_SlideDerived(inSlide, inParent, inIndex);
     }
-    void SendPropertyValueSet(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, const SValue &inValue) override
+    void SendPropertyValueSet(CUICDMSlideHandle 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,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, const SValue &inValue)
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
         // Signals that return values tend to assert if there aren't
         // any clients for those signals.  Thus we only call them if
@@ -299,8 +299,8 @@ public:
         return inValue;
     }
     void SendPropertyValueRemoved(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, const SValue &inValue) override
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override
     {
         m_InstancePropertyValueRemoved(inSlide, inInstance, inProperty, inValue);
     }
@@ -321,9 +321,9 @@ class CSlideGraphCoreSignaller : public ISlideGraphCoreSignalProvider,
 {
     boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphCreated;
     boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphDeleted;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
         m_InstanceAssociated;
-    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+    boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
         m_InstanceDissociated;
     boost::signal<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> m_GraphActiveSlide;
     boost::signal<void(CUICDMSlideGraphHandle, float)> m_GraphSeconds;
@@ -340,13 +340,13 @@ public:
         return CONNECT_SIGNAL(m_GraphDeleted);
     }
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceAssociated);
     }
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceDissociated);
@@ -373,13 +373,13 @@ public:
         m_GraphDeleted(inGraph, inSlide);
     }
     void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
-                                        CUICDMInstanceHandle inInstance) override
+                                        Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceAssociated(inGraph, inSlide, inInstance);
     }
     void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
-                                         CUICDMInstanceHandle inInstance) override
+                                         Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDissociated(inGraph, inSlide, inInstance);
@@ -405,12 +405,12 @@ TSignalItemPtr CreateSlideGraphCoreSignaller()
 class CAnimationCoreSignaller : public IAnimationCoreSignalProvider,
                                 public IAnimationCoreSignalSender
 {
-    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                CUICDMPropertyHandle, size_t, EAnimationType)>
+    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                Qt3DSDMPropertyHandle, size_t, EAnimationType)>
         m_AnimationCreated;
     boost::signal<void(CUICDMAnimationHandle)> m_BeforeAnimationDeleted;
-    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                CUICDMPropertyHandle, size_t, EAnimationType)>
+    boost::signal<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                Qt3DSDMPropertyHandle, size_t, EAnimationType)>
         m_AnimationDeleted;
     boost::signal<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)> m_KeyframeInserted;
     boost::signal<void(CUICDMKeyframeHandle)> m_BeforeKeyframeErased;
@@ -421,8 +421,8 @@ class CAnimationCoreSignaller : public IAnimationCoreSignalProvider,
 
 public:
     TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                                   Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationCreated);
     }
@@ -432,8 +432,8 @@ public:
         return CONNECT_SIGNAL(m_BeforeAnimationDeleted);
     }
     TSignalConnectionPtr ConnectAnimationDeleted(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                                   Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationDeleted);
     }
@@ -471,8 +471,8 @@ public:
     }
 
     void SendAnimationCreated(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, size_t inIndex,
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) override
     {
         CHECK_SIGNALS_ENABLED();
@@ -484,8 +484,8 @@ public:
         m_BeforeAnimationDeleted(inAnimation);
     }
     void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, size_t inIndex,
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) override
     {
         CHECK_SIGNALS_ENABLED();
@@ -639,31 +639,31 @@ TSignalItemPtr CreateActionCoreSignaller()
 
 class CActionSystemSignaller : public IActionSystemSignalProvider, public IActionSystemSignalSender
 {
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)> m_ActionCreated;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)> m_ActionDeleted;
+    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionCreated;
+    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)> m_ActionDeleted;
 
 public:
     TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionCreated);
     }
     TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionDeleted);
     }
 
     void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) override
+                                   Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionCreated(inAction, inSlide, inOwner);
     }
     void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) override
+                                   Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionDeleted(inAction, inSlide, inOwner);
@@ -683,15 +683,15 @@ class CSlideSystemSignaller : public ISlideSystemSignalProvider, public ISlideSy
     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, CUICDMInstanceHandle)> m_InstanceAssociated;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle)> m_InstanceDissociated;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)> m_PropertyLinked;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)> m_PropertyUnlinked;
+    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, CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue)>
+    boost::signal<SValue(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
         m_ValueCreated;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue)>
+    boost::signal<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue)>
         m_ValueDestroyed;
 
 public:
@@ -726,23 +726,23 @@ public:
         return CONNECT_SIGNAL(m_ComponentSeconds);
     }
     TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceAssociated);
     }
     TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceDissociated);
     }
     TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyLinked);
     }
     TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyUnlinked);
@@ -754,13 +754,13 @@ public:
         return CONNECT_SIGNAL(m_ActiveSlide);
     }
     virtual TSignalConnectionPtr ConnectPropertyValueCreated(
-        const std::function<SValue(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<SValue(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                      const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_ValueCreated);
     }
     virtual TSignalConnectionPtr ConnectPropertyValueDestroyed(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback)
     {
         return CONNECT_SIGNAL(m_ValueDestroyed);
@@ -798,25 +798,25 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_ComponentSeconds(inMaster, inSeconds);
     }
-    void SendInstanceAssociated(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance) override
+    void SendInstanceAssociated(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceAssociated(inMaster, inInstance);
     }
     void SendInstanceDissociated(CUICDMSlideHandle inMaster,
-                                         CUICDMInstanceHandle inInstance) override
+                                         Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDissociated(inMaster, inInstance);
     }
-    void SendPropertyLinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) override
+    void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyLinked(inMaster, inInstance, inProperty);
     }
-    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) override
+    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyUnlinked(inMaster, inInstance, inProperty);
@@ -829,8 +829,8 @@ public:
     }
 
     virtual SValue SendPropertyValueCreated(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance,
-                                            CUICDMPropertyHandle inProperty, const SValue &inValue)
+                                            Qt3DSDMInstanceHandle inInstance,
+                                            Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
         size_t theNumSlots(m_ValueCreated.num_slots());
         if (theNumSlots)
@@ -838,8 +838,8 @@ public:
         return inValue;
     }
     virtual void SendPropertyValueDestroyed(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance,
-                                            CUICDMPropertyHandle inProperty, const SValue &inValue)
+                                            Qt3DSDMInstanceHandle inInstance,
+                                            Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
     {
         CHECK_SIGNALS_ENABLED();
         m_ValueDestroyed(inSlide, inInstance, inProperty, inValue);
@@ -854,43 +854,43 @@ TSignalItemPtr CreateSlideSystemSignaller()
 class CCustomPropCoreSignaller : public ICustomPropCoreSignalProvider,
                                  public ICustomPropCoreSignalSender
 {
-    boost::signal<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> m_CustomPropertyCreated;
-    boost::signal<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> m_CustomPropertyDeleted;
-    boost::signal<void(CUICDMPropertyHandle)> m_CustomPropertyModified;
-    boost::signal<void(CUICDMEventHandle, CUICDMInstanceHandle)> m_CustomEventCreated;
-    boost::signal<void(CUICDMEventHandle, CUICDMInstanceHandle)> m_CustomEventDeleted;
+    boost::signal<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> m_CustomPropertyCreated;
+    boost::signal<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> m_CustomPropertyDeleted;
+    boost::signal<void(Qt3DSDMPropertyHandle)> m_CustomPropertyModified;
+    boost::signal<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> m_CustomEventCreated;
+    boost::signal<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> m_CustomEventDeleted;
     boost::signal<void(CUICDMEventHandle)> m_CustomEventModified;
-    boost::signal<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> m_CustomHandlerCreated;
-    boost::signal<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> m_CustomHandlerDeleted;
+    boost::signal<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> m_CustomHandlerCreated;
+    boost::signal<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> m_CustomHandlerDeleted;
     boost::signal<void(CUICDMHandlerHandle)> m_CustomHandlerModified;
     boost::signal<void(CUICDMHandlerParamHandle, CUICDMHandlerHandle)> m_CustomHandlerParamCreated;
     boost::signal<void(CUICDMHandlerParamHandle, CUICDMHandlerHandle)> m_CustomHandlerParamDeleted;
     boost::signal<void(CUICDMHandlerParamHandle)> m_CustomHandlerParamModified;
-    boost::signal<void(CUICDMInstanceHandle, const TCharStr &)> m_CustomReferencesModified;
+    boost::signal<void(Qt3DSDMInstanceHandle, const TCharStr &)> m_CustomReferencesModified;
 
 public:
     TSignalConnectionPtr ConnectCustomPropertyCreated(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyCreated);
     }
     TSignalConnectionPtr ConnectCustomPropertyDeleted(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyDeleted);
     }
     virtual TSignalConnectionPtr
-    ConnectCustomPropertyModified(const std::function<void(CUICDMPropertyHandle)> &inCallback) override
+    ConnectCustomPropertyModified(const std::function<void(Qt3DSDMPropertyHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyModified);
     }
     TSignalConnectionPtr ConnectCustomEventCreated(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomEventCreated);
     }
     TSignalConnectionPtr ConnectCustomEventDeleted(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomEventDeleted);
     }
@@ -900,12 +900,12 @@ public:
         return CONNECT_SIGNAL(m_CustomEventModified);
     }
     TSignalConnectionPtr ConnectCustomHandlerCreated(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomHandlerCreated);
     }
     TSignalConnectionPtr ConnectCustomHandlerDeleted(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomHandlerDeleted);
     }
@@ -930,34 +930,34 @@ public:
         return CONNECT_SIGNAL(m_CustomHandlerParamModified);
     }
     TSignalConnectionPtr ConnectCustomReferencesModified(
-        const std::function<void(CUICDMInstanceHandle, const TCharStr &)> &inCallback) override
+        const std::function<void(Qt3DSDMInstanceHandle, const TCharStr &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomReferencesModified);
     }
 
-    void SendCustomPropertyCreated(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) override
+    void SendCustomPropertyCreated(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyCreated(inProp, inOwner);
     }
-    void SendCustomPropertyDeleted(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) override
+    void SendCustomPropertyDeleted(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyDeleted(inProp, inOwner);
     }
-    void SendCustomPropertyModified(CUICDMPropertyHandle inProp) override
+    void SendCustomPropertyModified(Qt3DSDMPropertyHandle inProp) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyModified(inProp);
     }
-    void SendCustomEventCreated(CUICDMEventHandle inEvent, CUICDMInstanceHandle inOwner) override
+    void SendCustomEventCreated(CUICDMEventHandle inEvent, Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomEventCreated(inEvent, inOwner);
     }
-    void SendCustomEventDeleted(CUICDMEventHandle inEvent, CUICDMInstanceHandle inOwner) override
+    void SendCustomEventDeleted(CUICDMEventHandle inEvent, Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomEventDeleted(inEvent, inOwner);
@@ -968,13 +968,13 @@ public:
         m_CustomEventModified(inEvent);
     }
     void SendCustomHandlerCreated(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) override
+                                          Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerCreated(inHandler, inOwner);
     }
     void SendCustomHandlerDeleted(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) override
+                                          Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerDeleted(inHandler, inOwner);
@@ -1001,7 +1001,7 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerParamModified(inParameter);
     }
-    void SendCustomReferencesModified(CUICDMInstanceHandle inOwner,
+    void SendCustomReferencesModified(Qt3DSDMInstanceHandle inOwner,
                                               const TCharStr &inString) override
     {
         CHECK_SIGNALS_ENABLED();
@@ -1027,40 +1027,40 @@ class CStudioFullSystemSignaller : public IStudioFullSystemSignalProvider,
     boost::signal<void(CUICDMSlideHandle, int, int)> m_SlideRearranged;
     boost::signal<void(CUICDMSlideHandle)> m_ComponentSeconds;
     boost::signal<void(CUICDMSlideHandle)> m_BeginComponentSeconds;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)> m_PropertyLinked;
-    boost::signal<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)> m_PropertyUnlinked;
+    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(CUICDMInstanceHandle)> m_InstanceCreated;
-    boost::signal<void(CUICDMInstanceHandle)> m_InstanceDeleted;
-    boost::signal<void(CUICDMAnimationHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+    boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceCreated;
+    boost::signal<void(Qt3DSDMInstanceHandle)> m_InstanceDeleted;
+    boost::signal<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
         m_AnimationCreated;
-    boost::signal<void(CUICDMAnimationHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+    boost::signal<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
         m_AnimationDeleted;
     boost::signal<void(CUICDMAnimationHandle, CUICDMKeyframeHandle)> m_KeyframeInserted;
     boost::signal<void(CUICDMAnimationHandle, CUICDMKeyframeHandle)> m_KeyframeErased;
     boost::signal<void(CUICDMKeyframeHandle)> m_KeyframeUpdated;
     boost::signal<void(CUICDMAnimationHandle, bool)> m_ConnectFirstKeyframeDynamicSet;
-    boost::signal<void(CUICDMInstanceHandle, CUICDMPropertyHandle)> m_InstancePropertyValue;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)> m_ActionCreated;
-    boost::signal<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)> m_ActionDeleted;
+    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)> m_TriggerObjectSet;
     boost::signal<void(CUICDMActionHandle)> m_TargetObjectSet;
     boost::signal<void(CUICDMActionHandle)> m_EventHandleSet;
     boost::signal<void(CUICDMActionHandle)> m_HandlerHandleSet;
     boost::signal<void(CUICDMHandlerArgHandle)> m_HandlerArgumentValueSet;
-    boost::signal<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> m_CustomPropertyCreated;
-    boost::signal<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> m_CustomPropertyDeleted;
-    boost::signal<void(CUICDMPropertyHandle)> m_CustomPropertyModified;
-    boost::signal<void(CUICDMEventHandle, CUICDMInstanceHandle)> m_CustomEventCreated;
-    boost::signal<void(CUICDMEventHandle, CUICDMInstanceHandle)> m_CustomEventDeleted;
+    boost::signal<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> m_CustomPropertyCreated;
+    boost::signal<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> m_CustomPropertyDeleted;
+    boost::signal<void(Qt3DSDMPropertyHandle)> m_CustomPropertyModified;
+    boost::signal<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> m_CustomEventCreated;
+    boost::signal<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> m_CustomEventDeleted;
     boost::signal<void(CUICDMEventHandle)> m_CustomEventModified;
-    boost::signal<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> m_CustomHandlerCreated;
-    boost::signal<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> m_CustomHandlerDeleted;
+    boost::signal<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> m_CustomHandlerCreated;
+    boost::signal<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> m_CustomHandlerDeleted;
     boost::signal<void(CUICDMHandlerHandle)> m_CustomHandlerModified;
     boost::signal<void(CUICDMHandlerParamHandle, CUICDMHandlerHandle)> m_CustomHandlerParamCreated;
     boost::signal<void(CUICDMHandlerParamHandle, CUICDMHandlerHandle)> m_CustomHandlerParamDeleted;
     boost::signal<void(CUICDMHandlerParamHandle)> m_CustomHandlerParamModified;
-    boost::signal<void(CUICDMInstanceHandle, const TCharStr &)> m_CustomReferencesModified;
+    boost::signal<void(Qt3DSDMInstanceHandle, const TCharStr &)> m_CustomReferencesModified;
 
     ISlideSystemSignalProvider *m_SlideSystemSignalProvider;
 
@@ -1115,13 +1115,13 @@ public:
         return CONNECT_SIGNAL(m_ComponentSeconds);
     }
     TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyLinked);
     }
     TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_PropertyUnlinked);
@@ -1133,25 +1133,25 @@ public:
     }
 
     virtual TSignalConnectionPtr
-    ConnectInstanceCreated(const std::function<void(CUICDMInstanceHandle)> &inCallback) override
+    ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceCreated);
     }
     virtual TSignalConnectionPtr
-    ConnectInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) override
+    ConnectInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstanceDeleted);
     }
 
     virtual TSignalConnectionPtr
-    ConnectAnimationCreated(const std::function<void(CUICDMAnimationHandle, CUICDMInstanceHandle,
-                                                       CUICDMPropertyHandle)> &inCallback) override
+    ConnectAnimationCreated(const std::function<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle,
+                                                       Qt3DSDMPropertyHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationCreated);
     }
     virtual TSignalConnectionPtr
-    ConnectAnimationDeleted(const std::function<void(CUICDMAnimationHandle, CUICDMInstanceHandle,
-                                                       CUICDMPropertyHandle)> &inCallback) override
+    ConnectAnimationDeleted(const std::function<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle,
+                                                       Qt3DSDMPropertyHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_AnimationDeleted);
     }
@@ -1171,7 +1171,7 @@ public:
         return CONNECT_SIGNAL(m_KeyframeUpdated);
     }
     TSignalConnectionPtr ConnectInstancePropertyValue(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_InstancePropertyValue);
     }
@@ -1182,13 +1182,13 @@ public:
     }
 
     TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionCreated);
     }
     TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) override
     {
         return CONNECT_SIGNAL(m_ActionDeleted);
@@ -1220,27 +1220,27 @@ public:
     }
 
     TSignalConnectionPtr ConnectCustomPropertyCreated(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyCreated);
     }
     TSignalConnectionPtr ConnectCustomPropertyDeleted(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyDeleted);
     }
     virtual TSignalConnectionPtr
-    ConnectCustomPropertyModified(const std::function<void(CUICDMPropertyHandle)> &inCallback) override
+    ConnectCustomPropertyModified(const std::function<void(Qt3DSDMPropertyHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomPropertyModified);
     }
     TSignalConnectionPtr ConnectCustomEventCreated(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomEventCreated);
     }
     TSignalConnectionPtr ConnectCustomEventDeleted(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomEventDeleted);
     }
@@ -1250,12 +1250,12 @@ public:
         return CONNECT_SIGNAL(m_CustomEventModified);
     }
     TSignalConnectionPtr ConnectCustomHandlerCreated(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomHandlerCreated);
     }
     TSignalConnectionPtr ConnectCustomHandlerDeleted(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) override
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomHandlerDeleted);
     }
@@ -1280,7 +1280,7 @@ public:
         return CONNECT_SIGNAL(m_CustomHandlerParamModified);
     }
     TSignalConnectionPtr ConnectCustomReferencesModified(
-        const std::function<void(CUICDMInstanceHandle, const TCharStr &)> &inCallback) override
+        const std::function<void(Qt3DSDMInstanceHandle, const TCharStr &)> &inCallback) override
     {
         return CONNECT_SIGNAL(m_CustomReferencesModified);
     }
@@ -1332,14 +1332,14 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_ComponentSeconds(inMaster);
     }
-    void SendPropertyLinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) override
+    void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyLinked(inMaster, inInstance, inProperty);
     }
-    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) override
+    void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_PropertyUnlinked(inMaster, inInstance, inProperty);
@@ -1350,27 +1350,27 @@ public:
         m_ActiveSlide(inMaster, inIndex, inSlide);
     }
 
-    void SendInstanceCreated(CUICDMInstanceHandle inInstance) override
+    void SendInstanceCreated(Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceCreated(inInstance);
     }
-    void SendInstanceDeleted(CUICDMInstanceHandle inInstance) override
+    void SendInstanceDeleted(Qt3DSDMInstanceHandle inInstance) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstanceDeleted(inInstance);
     }
 
     void SendAnimationCreated(CUICDMAnimationHandle inAnimation,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) override
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_AnimationCreated(inAnimation, inInstance, inProperty);
     }
     void SendAnimationDeleted(CUICDMAnimationHandle inAnimation,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) override
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_AnimationDeleted(inAnimation, inInstance, inProperty);
@@ -1399,21 +1399,21 @@ public:
         m_ConnectFirstKeyframeDynamicSet(inAnimation, inDynamic);
     }
 
-    void SendInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                           CUICDMPropertyHandle inProperty) override
+    void SendInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMPropertyHandle inProperty) override
     {
         CHECK_SIGNALS_ENABLED();
         m_InstancePropertyValue(inInstance, inProperty);
     }
 
     void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) override
+                                   Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionCreated(inAction, inSlide, inOwner);
     }
     void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) override
+                                   Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_ActionDeleted(inAction, inSlide, inOwner);
@@ -1444,29 +1444,29 @@ public:
         m_HandlerArgumentValueSet(inHandlerArgument);
     }
 
-    void SendCustomPropertyCreated(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) override
+    void SendCustomPropertyCreated(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyCreated(inProp, inOwner);
     }
-    void SendCustomPropertyDeleted(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) override
+    void SendCustomPropertyDeleted(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyDeleted(inProp, inOwner);
     }
-    void SendCustomPropertyModified(CUICDMPropertyHandle inProp) override
+    void SendCustomPropertyModified(Qt3DSDMPropertyHandle inProp) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomPropertyModified(inProp);
     }
-    void SendCustomEventCreated(CUICDMEventHandle inEvent, CUICDMInstanceHandle inOwner) override
+    void SendCustomEventCreated(CUICDMEventHandle inEvent, Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomEventCreated(inEvent, inOwner);
     }
-    void SendCustomEventDeleted(CUICDMEventHandle inEvent, CUICDMInstanceHandle inOwner) override
+    void SendCustomEventDeleted(CUICDMEventHandle inEvent, Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomEventDeleted(inEvent, inOwner);
@@ -1477,13 +1477,13 @@ public:
         m_CustomEventModified(inEvent);
     }
     void SendCustomHandlerCreated(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) override
+                                          Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerCreated(inHandler, inOwner);
     }
     void SendCustomHandlerDeleted(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) override
+                                          Qt3DSDMInstanceHandle inOwner) override
     {
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerDeleted(inHandler, inOwner);
@@ -1510,7 +1510,7 @@ public:
         CHECK_SIGNALS_ENABLED();
         m_CustomHandlerParamModified(inParameter);
     }
-    void SendCustomReferencesModified(CUICDMInstanceHandle inOwner,
+    void SendCustomReferencesModified(Qt3DSDMInstanceHandle inOwner,
                                               const TCharStr &inString) override
     {
         CHECK_SIGNALS_ENABLED();
diff --git a/src/Authoring/UICDM/Systems/SlideSystem.cpp b/src/Authoring/UICDM/Systems/SlideSystem.cpp
index be2d4243..30193bec 100644
--- a/src/Authoring/UICDM/Systems/SlideSystem.cpp
+++ b/src/Authoring/UICDM/Systems/SlideSystem.cpp
@@ -39,8 +39,8 @@ namespace qt3dsdm {
 
 SSlideSystem::SSlideSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
                            TSlideGraphCorePtr inSlideGraphCore, TAnimationCorePtr inAnimationCore,
-                           CUICDMInstanceHandle inSlideInstance,
-                           CUICDMPropertyHandle inComponentGuidProperty)
+                           Qt3DSDMInstanceHandle inSlideInstance,
+                           Qt3DSDMPropertyHandle inComponentGuidProperty)
     : m_DataCore(inDataCore)
     , m_SlideCore(inSlideCore)
     , m_SlideGraphCore(inSlideGraphCore)
@@ -57,7 +57,7 @@ void SSlideSystem::SetPropertySystem(TPropertySystemPtr inPropertySystem)
 
 CUICDMSlideHandle SSlideSystem::CreateMasterSlide()
 {
-    CUICDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theSlideInstance, m_SlideInstance);
     CUICDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
     m_SlideGraphCore->CreateSlideGraph(retval);
@@ -66,7 +66,7 @@ CUICDMSlideHandle SSlideSystem::CreateMasterSlide()
 }
 
 inline bool PropertyHandlePairEquals(const TPropertyHandlePropertyInfoPair &inPair,
-                                     CUICDMPropertyHandle inProperty)
+                                     Qt3DSDMPropertyHandle inProperty)
 {
     return (inProperty == inPair.first);
 }
@@ -82,7 +82,7 @@ void AddReferencedInstance(const TSlideEntry &inEntry,
                                       std::placeholders::_1, get<1>(inEntry)));
     if (theFind != inInfoPairList.end()) {
         TPropertyInstanceInfoPtr theInfo(theFind->second);
-        CUICDMInstanceHandle theReferenced(theInfo->GetInstanceForProperty(get<2>(inEntry)));
+        Qt3DSDMInstanceHandle theReferenced(theInfo->GetInstanceForProperty(get<2>(inEntry)));
         if (theReferenced.Valid()
             && !exists(outInstances, std::bind(equal_to<int>(), theReferenced,
                                                std::placeholders::_1))) {
@@ -151,7 +151,7 @@ CUICDMSlideHandle SSlideSystem::CreateSlide(CUICDMSlideHandle inMaster, int inIn
 CUICDMSlideHandle SSlideSystem::DuplicateSlide(CUICDMSlideHandle inSourceSlide, int inIndex)
 {
     CUICDMSlideHandle theMaster = GetMasterSlide(inSourceSlide);
-    CUICDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
+    Qt3DSDMInstanceHandle theSlideInstance = m_DataCore->CreateInstance();
     m_DataCore->DeriveInstance(theSlideInstance, m_SlideInstance);
     CUICDMSlideHandle retval = m_SlideCore->CreateSlide(theSlideInstance);
 
@@ -215,10 +215,10 @@ bool SSlideSystem::IsMasterSlide(CUICDMSlideHandle inSlide) const
 
 inline bool GraphGuidMatches(CUICDMSlideGraphHandle inGraph, TSlideGraphCorePtr inSlideGraph,
                              TSlideCorePtr inSlideCore, TDataCorePtr inDataCore,
-                             CUICDMPropertyHandle inProperty, SValue inValue)
+                             Qt3DSDMPropertyHandle inProperty, SValue inValue)
 {
     CUICDMSlideHandle theMaster = inSlideGraph->GetGraphRoot(inGraph);
-    CUICDMInstanceHandle theInstance = inSlideCore->GetSlideInstance(theMaster);
+    Qt3DSDMInstanceHandle theInstance = inSlideCore->GetSlideInstance(theMaster);
     SValue theValue;
     if (inDataCore->GetInstancePropertyValue(theInstance, inProperty, theValue)
         && Equals(inValue, theValue.toOldSkool()))
@@ -247,7 +247,7 @@ void InsertIfReferencedProperty(const TSlideEntry &inEntry,
         find_if<TPropertyHandlePropertyInfoPairList::const_iterator>(
             inRefProperties, std::bind(PropertyHandlePairEquals, std::placeholders::_1, get<1>(inEntry)));
     if (theFind != inRefProperties.end()) {
-        CUICDMInstanceHandle theInstance(theFind->second->GetInstanceForProperty(get<2>(inEntry)));
+        Qt3DSDMInstanceHandle theInstance(theFind->second->GetInstanceForProperty(get<2>(inEntry)));
         if (theInstance.Valid())
             inInstances.push_back(theInstance);
     }
@@ -257,7 +257,7 @@ void SSlideSystem::InsertEntryAndPropertyInstance(const TSlideEntry &inEntry,
                                                   TInstanceHandleList &inInstances,
                                                   CUICDMSlideHandle inSlide)
 {
-    CUICDMInstanceHandle theEntryInstance = get<0>(inEntry);
+    Qt3DSDMInstanceHandle theEntryInstance = get<0>(inEntry);
     if (find(inInstances.begin(), inInstances.end(), theEntryInstance) == inInstances.end()) {
         TGraphSlidePair thePair = m_SlideGraphCore->GetAssociatedGraph(theEntryInstance);
         if (thePair.second == inSlide) // if this instance belongs to this slide
@@ -275,7 +275,7 @@ void SSlideSystem::InsertEntryAndPropertyInstance(const TSlideEntry &inEntry,
                            theEntryInstance, theIter->first,
                            theValue)) // this function may throw error if the property doesn't exist
                 {
-                    CUICDMInstanceHandle theInstance(
+                    Qt3DSDMInstanceHandle theInstance(
                         theIter->second->GetInstanceForProperty(theValue.toOldSkool()));
                     if (theInstance.Valid())
                         inInstances.push_back(theInstance);
@@ -445,7 +445,7 @@ long SSlideSystem::GetComponentSecondsLong(CUICDMSlideHandle inSlide) const
     return static_cast<long>((seconds * 1000) + .5f);
 }
 
-long SSlideSystem::GetComponentSecondsLong(CUICDMInstanceHandle inInstance) const
+long SSlideSystem::GetComponentSecondsLong(Qt3DSDMInstanceHandle inInstance) const
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetAssociatedGraph(inInstance).first;
     float seconds = m_SlideCore->GetSlideTime(m_SlideGraphCore->GetGraphActiveSlide(theGraph));
@@ -453,7 +453,7 @@ long SSlideSystem::GetComponentSecondsLong(CUICDMInstanceHandle inInstance) cons
 }
 
 SInstanceSlideInformation
-SSlideSystem::GetInstanceSlideInformation(CUICDMInstanceHandle inInstance) const
+SSlideSystem::GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     CUICDMSlideHandle theAssociatedSlide(theGraphSlidePair.second);
@@ -472,14 +472,14 @@ SSlideSystem::GetInstanceSlideInformation(CUICDMInstanceHandle inInstance) const
  * Use the instance for storing information such as name, or the GUID of the object
  * this slide links to.
  */
-CUICDMInstanceHandle SSlideSystem::GetSlideInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle SSlideSystem::GetSlideInstance(CUICDMSlideHandle inSlide) const
 {
     return m_SlideCore->GetSlideInstance(inSlide);
 }
 /**
  *	Reverse lookup into the slide system so you can match slides to instances.
  */
-CUICDMSlideHandle SSlideSystem::GetSlideByInstance(CUICDMInstanceHandle inSlide) const
+CUICDMSlideHandle SSlideSystem::GetSlideByInstance(Qt3DSDMInstanceHandle inSlide) const
 {
     return m_SlideCore->GetSlideByInstance(inSlide);
 }
@@ -488,14 +488,14 @@ CUICDMSlideHandle SSlideSystem::GetSlideByInstance(CUICDMInstanceHandle inSlide)
  *	Slide may be either a master slide
  */
 void SSlideSystem::AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
-                                              CUICDMInstanceHandle inInstance)
+                                              Qt3DSDMInstanceHandle inInstance)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetSlideGraph(GetMasterSlide(inSlide));
     m_SlideGraphCore->AssociateInstance(theGraph, inSlide, inInstance);
     GetSignalSender()->SendInstanceAssociated(inSlide, inInstance);
 }
 
-CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(CUICDMInstanceHandle inInstance) const
+CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const
 {
     return m_SlideGraphCore->GetAssociatedGraph(inInstance).second;
 }
@@ -531,20 +531,20 @@ void SSlideSystem::GetAssociatedInstances(CUICDMSlideHandle inSlide,
     }
 }
 
-void DeleteInstanceIfExistsAsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, TSlideCorePtr inSlideCore,
+void DeleteInstanceIfExistsAsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, TSlideCorePtr inSlideCore,
                                       TPropertyInstanceInfoPtr inPropertyInfoPtr,
                                       TDataCorePtr inDataCore)
 {
     SValue theValue;
     if (inSlideCore->GetSpecificInstancePropertyValue(inSlide, inInstance, inProperty, theValue)) {
-        CUICDMInstanceHandle theInstance(inPropertyInfoPtr->GetInstanceForProperty(theValue));
+        Qt3DSDMInstanceHandle theInstance(inPropertyInfoPtr->GetInstanceForProperty(theValue));
         if (theInstance.Valid())
             inDataCore->DeleteInstance(theInstance);
     }
 }
 
-void SSlideSystem::LinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+void SSlideSystem::LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetAssociatedGraph(inInstance).first;
     CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
@@ -563,7 +563,7 @@ void SSlideSystem::LinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyH
 }
 
 void ClearPropertyValueIfLinked(CUICDMSlideHandle inMaster, const TSlideHandleList &inChildren,
-                                CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+                                Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                 TSlideCorePtr inSlideCore)
 {
     if (inChildren.empty())
@@ -576,16 +576,16 @@ void ClearPropertyValueIfLinked(CUICDMSlideHandle inMaster, const TSlideHandleLi
 }
 
 void SetReferencedEntryValue(CUICDMSlideHandle inMaster, CUICDMSlideHandle inDestSlide,
-                             TPropertyInstanceInfoPtr inInfo, CUICDMInstanceHandle inInstance,
-                             CUICDMPropertyHandle inProperty,
-                             CUICDMInstanceHandle inReferencedInstance, TSlideCorePtr inSlideCore)
+                             TPropertyInstanceInfoPtr inInfo, Qt3DSDMInstanceHandle inInstance,
+                             Qt3DSDMPropertyHandle inProperty,
+                             Qt3DSDMInstanceHandle inReferencedInstance, TSlideCorePtr inSlideCore)
 {
     SValue theNewValue(
         inInfo->CreateInstanceForProperty(inMaster, inDestSlide, inReferencedInstance));
     inSlideCore->ForceSetInstancePropertyValue(inDestSlide, inInstance, inProperty, theNewValue);
 }
 
-void SSlideSystem::UnlinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+void SSlideSystem::UnlinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     CUICDMSlideGraphHandle theGraph = m_SlideGraphCore->GetAssociatedGraph(inInstance).first;
     CUICDMSlideHandle theSlide = m_SlideGraphCore->GetGraphRoot(theGraph);
@@ -601,7 +601,7 @@ void SSlideSystem::UnlinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropert
     TSlideHandleList theChildren;
     m_SlideCore->GetChildSlides(theSlide, theChildren);
 
-    CUICDMInstanceHandle theReferenced;
+    Qt3DSDMInstanceHandle theReferenced;
     TPropertyHandlePropertyInfoPairList::const_iterator theFind =
         find_if<TPropertyHandlePropertyInfoPairList::const_iterator>(
             m_PropertyInfoPairList, std::bind(PropertyHandlePairEquals,
@@ -635,8 +635,8 @@ void SSlideSystem::UnlinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropert
     GetSignalSender()->SendPropertyUnlinked(theSlide, inInstance, inProperty);
 }
 
-bool SSlideSystem::IsPropertyLinked(CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) const
+bool SSlideSystem::IsPropertyLinked(Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     CUICDMSlideGraphHandle theGraph = theGraphSlidePair.first;
@@ -659,8 +659,8 @@ bool SSlideSystem::IsPropertyLinked(CUICDMInstanceHandle inInstance,
     return !containsProperty;
 }
 
-bool SSlideSystem::CanPropertyBeLinked(CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty) const
+bool SSlideSystem::CanPropertyBeLinked(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     if (theGraphSlidePair.first.Valid()
@@ -669,8 +669,8 @@ bool SSlideSystem::CanPropertyBeLinked(CUICDMInstanceHandle inInstance,
     return false;
 }
 
-bool SSlideSystem::GetSlidePropertyValue(size_t inSlide, CUICDMInstanceHandle inInstance,
-                                         CUICDMPropertyHandle inProperty, SValue &outValue)
+bool SSlideSystem::GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMPropertyHandle inProperty, SValue &outValue)
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     CUICDMSlideGraphHandle theGraph = theGraphSlidePair.first;
@@ -718,8 +718,8 @@ void SSlideSystem::SetActiveSlide(CUICDMSlideHandle inSlide)
     SetActiveSlide(theMaster, theIndex);
 }
 
-CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty) const
+CUICDMSlideHandle SSlideSystem::GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
     CUICDMSlideGraphHandle theGraph = theGraphSlidePair.first;
@@ -765,7 +765,7 @@ CUICDMSlideHandle SSlideSystem::GetActiveSlide(CUICDMSlideHandle inMaster) const
     return m_SlideGraphCore->GetGraphActiveSlide(theGraph);
 }
 
-CUICDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const
+Qt3DSDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const
 {
     TIntIntMap::const_iterator theIter = m_SlideSelectedInstances.find(inSlide);
     if (theIter != m_SlideSelectedInstances.end() && m_DataCore->IsInstance(theIter->second))
@@ -774,12 +774,12 @@ CUICDMInstanceHandle SSlideSystem::GetSlideSelectedInstance(CUICDMSlideHandle in
 }
 
 void SSlideSystem::SetSlideSelectedInstance(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance)
+                                            Qt3DSDMInstanceHandle inInstance)
 {
     m_SlideSelectedInstances[inSlide] = inInstance;
 }
 
-void SSlideSystem::RegisterPropertyInstance(CUICDMPropertyHandle inPropertyHandle,
+void SSlideSystem::RegisterPropertyInstance(Qt3DSDMPropertyHandle inPropertyHandle,
                                             TPropertyInstanceInfoPtr inPropertyInfo)
 {
     m_PropertyInfoPairList.push_back(make_pair(inPropertyHandle, inPropertyInfo));
@@ -795,8 +795,8 @@ ISlideSystemSignalSender *SSlideSystem::GetSignalSender()
     return dynamic_cast<ISlideSystemSignalSender *>(m_Signaller.get());
 }
 
-qt3dsdm::CUICDMSlideHandle SSlideSystem::GetApplicableSlide(CUICDMInstanceHandle inHandle,
-                                                          CUICDMPropertyHandle inProperty)
+qt3dsdm::CUICDMSlideHandle SSlideSystem::GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+                                                          Qt3DSDMPropertyHandle inProperty)
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inHandle);
     if (!theGraphSlidePair.first.Valid())
@@ -814,14 +814,14 @@ qt3dsdm::CUICDMSlideHandle SSlideSystem::GetApplicableSlide(CUICDMInstanceHandle
 }
 
 bool SSlideSystem::GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance,
-                                            CUICDMPropertyHandle inProperty, SValue &outValue) const
+                                            Qt3DSDMInstanceHandle inInstance,
+                                            Qt3DSDMPropertyHandle inProperty, SValue &outValue) const
 {
     return m_SlideCore->GetInstancePropertyValue(inSlide, inInstance, inProperty, outValue);
 }
 
-bool SSlideSystem::GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty,
+bool SSlideSystem::GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      SValue &outValue) const
 {
     TGraphSlidePair theGraphSlidePair = m_SlideGraphCore->GetAssociatedGraph(inInstance);
@@ -845,8 +845,8 @@ bool SSlideSystem::GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInst
 }
 
 void SSlideSystem::ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                 CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty,
+                                                 Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty,
                                                  const SValue &inValue)
 {
     m_SlideCore->ForceSetInstancePropertyValue(inSlide, inInstance, inProperty, inValue);
diff --git a/src/Authoring/UICDM/Systems/SlideSystem.h b/src/Authoring/UICDM/Systems/SlideSystem.h
index f3a0dd43..735647b2 100644
--- a/src/Authoring/UICDM/Systems/SlideSystem.h
+++ b/src/Authoring/UICDM/Systems/SlideSystem.h
@@ -45,7 +45,7 @@
 
 namespace qt3dsdm {
 
-typedef std::pair<CUICDMPropertyHandle, TPropertyInstanceInfoPtr> TPropertyHandlePropertyInfoPair;
+typedef std::pair<Qt3DSDMPropertyHandle, TPropertyInstanceInfoPtr> TPropertyHandlePropertyInfoPair;
 typedef std::vector<TPropertyHandlePropertyInfoPair> TPropertyHandlePropertyInfoPairList;
 /**
  *	Provides more thorough checking and will return an appropriate
@@ -61,8 +61,8 @@ struct SSlideSystem : public ISlideSystem
     TSlideCorePtr m_SlideCore;
     TSlideGraphCorePtr m_SlideGraphCore;
     TAnimationCorePtr m_AnimationCore;
-    CUICDMInstanceHandle m_SlideInstance;
-    CUICDMPropertyHandle m_ComponentGuid;
+    Qt3DSDMInstanceHandle m_SlideInstance;
+    Qt3DSDMPropertyHandle m_ComponentGuid;
     std::shared_ptr<ISignalItem> m_Signaller;
     TPropertyHandlePropertyInfoPairList m_PropertyInfoPairList;
     typedef std::unordered_map<int, int> TIntIntMap;
@@ -70,8 +70,8 @@ struct SSlideSystem : public ISlideSystem
 
     SSlideSystem(TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
                  TSlideGraphCorePtr inSlideGraphCore, TAnimationCorePtr inAnimationCore,
-                 CUICDMInstanceHandle inSlideInstance,
-                 CUICDMPropertyHandle inComponentGuidProperty);
+                 Qt3DSDMInstanceHandle inSlideInstance,
+                 Qt3DSDMPropertyHandle inComponentGuidProperty);
 
     void SetPropertySystem(TPropertySystemPtr inPropertySystem);
 
@@ -96,18 +96,18 @@ struct SSlideSystem : public ISlideSystem
     // For any given instance, find the current seconds via backtracking to the graph, finding the
     // active
     // slide, and return.
-    long GetComponentSecondsLong(CUICDMInstanceHandle inInstance) const override;
+    long GetComponentSecondsLong(Qt3DSDMInstanceHandle inInstance) const override;
     virtual SInstanceSlideInformation
-    GetInstanceSlideInformation(CUICDMInstanceHandle inInstance) const override;
+    GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance) const override;
     /**
      * Use the instance for storing information such as name, or the GUID of the object
      * this slide links to.
      */
-    CUICDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inInstance) const override;
+    Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inInstance) const override;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    CUICDMSlideHandle GetSlideByInstance(CUICDMInstanceHandle inInstance) const override;
+    CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const override;
 
     /**
      *	Slide may be either a master slide or a normal slide.  This will associate this instance
@@ -115,50 +115,50 @@ struct SSlideSystem : public ISlideSystem
      *	will now run through the slide set before hitting the main data core database.
      */
     void AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance) override;
-    CUICDMSlideHandle GetAssociatedSlide(CUICDMInstanceHandle inInstance) const override;
+                                            Qt3DSDMInstanceHandle inInstance) override;
+    CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const override;
     void GetAssociatedInstances(
         CUICDMSlideHandle inMaster,
-        std::vector<std::pair<CUICDMSlideHandle, CUICDMInstanceHandle>> &outAssociations) const override;
+        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const override;
     void GetAssociatedInstances(CUICDMSlideHandle inSlide,
                                         TInstanceHandleList &outAssociations) const override;
-    void LinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override;
-    void UnlinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override;
-    bool IsPropertyLinked(CUICDMInstanceHandle inInstance,
-                                  CUICDMPropertyHandle inProperty) const override;
-    bool CanPropertyBeLinked(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty) const override;
-    bool GetSlidePropertyValue(size_t inSlide, CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, SValue &outValue) override;
+    void LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
+    void UnlinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
+    bool IsPropertyLinked(Qt3DSDMInstanceHandle inInstance,
+                                  Qt3DSDMPropertyHandle inProperty) const override;
+    bool CanPropertyBeLinked(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty) const override;
+    bool GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty, SValue &outValue) override;
     void GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide,
                                       TInstancePropertyPairList &outProperties) const override;
 
     void SetActiveSlide(CUICDMSlideHandle inSlide) override;
-    CUICDMSlideHandle GetAssociatedSlide(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty) const override;
+    CUICDMSlideHandle 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;
-    CUICDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const override;
-    void SetSlideSelectedInstance(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance) override;
+    Qt3DSDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const override;
+    void SetSlideSelectedInstance(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance) override;
 
-    CUICDMSlideHandle GetApplicableSlide(CUICDMInstanceHandle inHandle,
-                                                 CUICDMPropertyHandle inProperty) override;
+    CUICDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+                                                 Qt3DSDMPropertyHandle inProperty) override;
 
     bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    bool GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty,
                                                    SValue &outValue) const override;
     void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inInstance,
-                                               CUICDMPropertyHandle inProperty,
+                                               Qt3DSDMInstanceHandle inInstance,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) override;
 
-    void RegisterPropertyInstance(CUICDMPropertyHandle inPropertyHandle,
+    void RegisterPropertyInstance(Qt3DSDMPropertyHandle inPropertyHandle,
                                           TPropertyInstanceInfoPtr inPropertyInfo) override;
 
     virtual ISlideSystemSignalProvider *GetSignalProvider();
diff --git a/src/Authoring/UICDM/Systems/StudioAnimationSystem.cpp b/src/Authoring/UICDM/Systems/StudioAnimationSystem.cpp
index 36fc89c9..0af5314c 100644
--- a/src/Authoring/UICDM/Systems/StudioAnimationSystem.cpp
+++ b/src/Authoring/UICDM/Systems/StudioAnimationSystem.cpp
@@ -79,7 +79,7 @@ void CStudioAnimationSystem::ClearTemporaryAnimationValues(CUICDMAnimationHandle
 }
 
 inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle inSlide,
-                                 CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+                                 Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
 {
     if (inInfo.m_Slide == inSlide && inInfo.m_Instance == inInstance
         && inInfo.m_Property == inProperty)
@@ -87,7 +87,7 @@ inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle
     return false;
 }
 inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle inSlide,
-                                 CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+                                 Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                  size_t inIndex)
 {
     if (IsAnimationInfoEqual(inInfo, inSlide, inInstance, inProperty) && inInfo.m_Index == inIndex)
@@ -96,8 +96,8 @@ inline bool IsAnimationInfoEqual(const SAnimationInfo &inInfo, CUICDMSlideHandle
 }
 
 inline bool ApplyIfAnimationMatches(TAnimationFloatPair inAnimationFloatPair,
-                                    CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty,
+                                    CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty,
                                     TAnimationCorePtr inAnimationCore, SValue &outValue)
 {
     SAnimationInfo theInfo = inAnimationCore->GetAnimationInfo(inAnimationFloatPair.first);
@@ -109,8 +109,8 @@ inline bool ApplyIfAnimationMatches(TAnimationFloatPair inAnimationFloatPair,
 }
 
 void CStudioAnimationSystem::OverrideChannelIfAnimated(CUICDMSlideHandle inSlide,
-                                                       CUICDMInstanceHandle inInstance,
-                                                       CUICDMPropertyHandle inProperty,
+                                                       Qt3DSDMInstanceHandle inInstance,
+                                                       Qt3DSDMPropertyHandle inProperty,
                                                        size_t inIndex, float inSeconds,
                                                        bool &ioAnimated, SValue &outValue) const
 {
@@ -125,8 +125,8 @@ void CStudioAnimationSystem::OverrideChannelIfAnimated(CUICDMSlideHandle inSlide
 
 // Value must be *primed* first.
 bool CStudioAnimationSystem::GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                              CUICDMInstanceHandle inInstance,
-                                                              CUICDMPropertyHandle inProperty,
+                                                              Qt3DSDMInstanceHandle inInstance,
+                                                              Qt3DSDMPropertyHandle inProperty,
                                                               SValue &outValue) const
 {
     bool retval = false;
@@ -210,8 +210,8 @@ CUICDMKeyframeHandle CreateKeyframe(CUICDMAnimationHandle inAnimation, const SVa
                                   inSeconds, inAnimationCore, inEaseIn, inEaseOut);
 }
 
-void MaybeAddAnimation(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                       CUICDMPropertyHandle inProperty, CUICDMAnimationHandle inAnimation,
+void MaybeAddAnimation(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                       Qt3DSDMPropertyHandle inProperty, CUICDMAnimationHandle inAnimation,
                        TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
 {
     SAnimationInfo theInfo(inAnimationCore->GetAnimationInfo(inAnimation));
@@ -225,8 +225,8 @@ bool SortAnimationHandlesByIndex(CUICDMAnimationHandle lhs, CUICDMAnimationHandl
     return inCore->GetAnimationInfo(lhs).m_Index < inCore->GetAnimationInfo(rhs).m_Index;
 }
 
-void GetPresentAnimations(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                          CUICDMPropertyHandle inProperty,
+void GetPresentAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                          Qt3DSDMPropertyHandle inProperty,
                           const TAnimationFloatPairList &inAnimationPairs,
                           TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
 {
@@ -250,8 +250,8 @@ void GetPresentAnimations(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInst
                         std::placeholders::_1, std::placeholders::_2, inAnimationCore));
 }
 
-void CreateAnimationAndAdd(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                           CUICDMPropertyHandle inProperty, size_t inIndex,
+void CreateAnimationAndAdd(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                           Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                            TAnimationCorePtr inAnimationCore, TAnimationHandleList &outAnimations)
 {
     outAnimations.push_back(inAnimationCore->CreateAnimation(
@@ -277,8 +277,8 @@ bool AnimationExistsInPresentAnimations(const TAnimationFloatPair &inAnimation,
                             std::placeholders::_1));
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                        CUICDMPropertyHandle inProperty, const SValue &inValue, float inTimeInSecs,
+void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                        Qt3DSDMPropertyHandle inProperty, const SValue &inValue, float inTimeInSecs,
                         bool inDoDiffValue, TAnimationCorePtr inAnimationCore,
                         TAnimationFloatPairList &inAnimationFloatPairs, float inEaseIn,
                         float inEaseOut)
@@ -306,8 +306,8 @@ void DoKeyframeProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstan
     }
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                        CUICDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
+void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                        Qt3DSDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
                         TAnimationCorePtr inAnimationCore, TSlideGraphCorePtr inSlideGraphCore,
                         TSlideCorePtr inSlideCore, TAnimationFloatPairList &inAnimationFloatPairs,
                         float inEaseIn, float inEaseOut)
@@ -319,8 +319,8 @@ void DoKeyframeProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstan
                        inAnimationCore, inAnimationFloatPairs, inEaseIn, inEaseOut);
 }
 
-void DoKeyframeProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                        CUICDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
+void DoKeyframeProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                        Qt3DSDMPropertyHandle inProperty, const SValue &inValue, bool inDoDiffValue,
                         TAnimationCorePtr inAnimationCore, TSlideGraphCorePtr inSlideGraphCore,
                         TSlideCorePtr inSlideCore, TAnimationFloatPairList &inAnimationFloatPairs,
                         bool inSmoothInterpolation)
@@ -351,8 +351,8 @@ void InsertUniqueAnimationFloatPair(CUICDMAnimationHandle inAnimation,
 }
 
 bool CStudioAnimationSystem::SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                              CUICDMInstanceHandle inInstance,
-                                                              CUICDMPropertyHandle inProperty,
+                                                              Qt3DSDMInstanceHandle inInstance,
+                                                              Qt3DSDMPropertyHandle inProperty,
                                                               const SValue &inValue)
 {
     tuple<bool, size_t> arity = GetVariantAnimatableAndArity(inValue);
@@ -398,7 +398,7 @@ bool CStudioAnimationSystem::GetAutoKeyframe() const
 }
 
 CUICDMSlideHandle CStudioAnimationSystem::GetApplicableGraphAndSlide(
-    CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty, const SValue &inValue)
+    Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty, const SValue &inValue)
 {
     CUICDMSlideHandle theApplicableSlide;
     tuple<bool, size_t> arity = GetVariantAnimatableAndArity(inValue);
@@ -429,8 +429,8 @@ void InsertUniqueAnimationKeyframesPair(TAnimationKeyframesPairList &ioList, SAn
     }
 }
 
-void CStudioAnimationSystem::Animate(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty)
+void CStudioAnimationSystem::Animate(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty)
 {
     SValue theValue;
     m_PropertySystem->GetInstancePropertyValue(inInstance, inProperty, theValue);
@@ -474,8 +474,8 @@ void CStudioAnimationSystem::Animate(CUICDMInstanceHandle inInstance,
     }
 }
 
-void CStudioAnimationSystem::Deanimate(CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty)
+void CStudioAnimationSystem::Deanimate(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty)
 {
     DataModelDataType::Value theDataType = m_PropertySystem->GetDataType(inProperty);
     std::tuple<bool, size_t> theArity = GetDatatypeAnimatableAndArity(theDataType);
@@ -500,8 +500,8 @@ void CStudioAnimationSystem::Deanimate(CUICDMInstanceHandle inInstance,
     }
 }
 
-void CStudioAnimationSystem::KeyframeProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty, bool inDoDiffValue)
+void CStudioAnimationSystem::KeyframeProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty, bool inDoDiffValue)
 {
     SValue theValue;
     m_PropertySystem->GetInstancePropertyValue(inInstance, inProperty, theValue);
@@ -512,8 +512,8 @@ void CStudioAnimationSystem::KeyframeProperty(CUICDMInstanceHandle inInstance,
                            inDoDiffValue, m_AnimationCore, m_SlideGraphCore, m_SlideCore,
                            m_AnimationFloatPairs, m_SmoothInterpolation);
 }
-void CStudioAnimationSystem::SetOrCreateKeyframe(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty,
+void CStudioAnimationSystem::SetOrCreateKeyframe(Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty,
                                                  float inTimeInSeconds,
                                                  SGetOrSetKeyframeInfo *inKeyframeInfo,
                                                  size_t inNumInfos)
@@ -557,7 +557,7 @@ inline bool FindMatchingAnimation(CUICDMAnimationHandle inAnimation,
 }
 
 CUICDMAnimationHandle CStudioAnimationSystem::GetControllingAnimation(
-    CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty, size_t inIndex) const
+    Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty, size_t inIndex) const
 {
     CUICDMSlideHandle theApplicableSlide =
         m_SlideSystem->GetApplicableSlide(inInstance, inProperty);
@@ -572,8 +572,8 @@ CUICDMAnimationHandle CStudioAnimationSystem::GetControllingAnimation(
     return m_AnimationCore->GetAnimation(theApplicableSlide, inInstance, inProperty, inIndex);
 }
 
-bool CStudioAnimationSystem::IsPropertyAnimatable(CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty) const
+bool CStudioAnimationSystem::IsPropertyAnimatable(Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty) const
 {
     DataModelDataType::Value theDataType = m_PropertySystem->GetDataType(inProperty);
     std::tuple<bool, size_t> theArity = GetDatatypeAnimatableAndArity(theDataType);
@@ -582,8 +582,8 @@ bool CStudioAnimationSystem::IsPropertyAnimatable(CUICDMInstanceHandle inInstanc
     return false;
 }
 
-bool CStudioAnimationSystem::IsPropertyAnimated(CUICDMInstanceHandle inInstance,
-                                                CUICDMPropertyHandle inProperty) const
+bool CStudioAnimationSystem::IsPropertyAnimated(Qt3DSDMInstanceHandle inInstance,
+                                                Qt3DSDMPropertyHandle inProperty) const
 {
     DataModelDataType::Value theDataType = m_PropertySystem->GetDataType(inProperty);
     std::tuple<bool, size_t> theArity = GetDatatypeAnimatableAndArity(theDataType);
diff --git a/src/Authoring/UICDM/Systems/StudioAnimationSystem.h b/src/Authoring/UICDM/Systems/StudioAnimationSystem.h
index e3d934b8..efbd5737 100644
--- a/src/Authoring/UICDM/Systems/StudioAnimationSystem.h
+++ b/src/Authoring/UICDM/Systems/StudioAnimationSystem.h
@@ -87,29 +87,29 @@ public:
     //====================================================================
     void SetAutoKeyframe(bool inAutoKeyframe) override;
     bool GetAutoKeyframe() const override;
-    void Animate(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override;
-    void Deanimate(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override;
-    void KeyframeProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    void Animate(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
+    void Deanimate(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override;
+    void KeyframeProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                   bool inDoDiffValue) override;
-    void SetOrCreateKeyframe(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty, float inTimeInSeconds,
+    void SetOrCreateKeyframe(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty, float inTimeInSeconds,
                                      SGetOrSetKeyframeInfo *inKeyframeInfo, size_t inNumInfos) override;
-    CUICDMAnimationHandle GetControllingAnimation(CUICDMInstanceHandle inInstance,
-                                                          CUICDMPropertyHandle inProperty,
+    CUICDMAnimationHandle GetControllingAnimation(Qt3DSDMInstanceHandle inInstance,
+                                                          Qt3DSDMPropertyHandle inProperty,
                                                           size_t inIndex) const override;
-    bool IsPropertyAnimatable(CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) const override;
-    bool IsPropertyAnimated(CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) const override;
+    bool IsPropertyAnimatable(Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) const override;
+    bool IsPropertyAnimated(Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) const override;
     void SetInterpolation(bool inSmooth) override { m_SmoothInterpolation = inSmooth; }
 
     bool GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const override;
     bool SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue) override;
     //====================================================================
 
@@ -118,12 +118,12 @@ public:
 private:
     void OnAnimationDeleted(CUICDMAnimationHandle inAnimation);
 
-    CUICDMSlideHandle GetApplicableGraphAndSlide(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty,
+    CUICDMSlideHandle GetApplicableGraphAndSlide(Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty,
                                                  const SValue &inValue);
 
-    void OverrideChannelIfAnimated(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty, size_t inIndex, float inSeconds,
+    void OverrideChannelIfAnimated(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty, size_t inIndex, float inSeconds,
                                    bool &ioAnimated, SValue &outValue) const;
 };
 }
diff --git a/src/Authoring/UICDM/Systems/StudioCoreSystem.cpp b/src/Authoring/UICDM/Systems/StudioCoreSystem.cpp
index b345e04f..13123faa 100644
--- a/src/Authoring/UICDM/Systems/StudioCoreSystem.cpp
+++ b/src/Authoring/UICDM/Systems/StudioCoreSystem.cpp
@@ -43,14 +43,14 @@ namespace qt3dsdm {
 
 inline bool AnimationInstanceMatches(CUICDMAnimationHandle inAnimation,
                                      TAnimationCorePtr inAnimationCore,
-                                     CUICDMInstanceHandle inInstance)
+                                     Qt3DSDMInstanceHandle inInstance)
 {
     return inInstance == inAnimationCore->GetAnimationInfo(inAnimation).m_Instance;
 }
 
 inline bool AnimationPropertyMatches(CUICDMAnimationHandle inAnimation,
                                      TAnimationCorePtr inAnimationCore,
-                                     CUICDMPropertyHandle inProperty)
+                                     Qt3DSDMPropertyHandle inProperty)
 {
     return inProperty == inAnimationCore->GetAnimationInfo(inAnimation).m_Property;
 }
@@ -64,8 +64,8 @@ inline bool AnimationSlideMatches(CUICDMAnimationHandle inAnimation,
 inline bool AnimationSlideInstancePropertyMatch(CUICDMAnimationHandle inAnimation,
                                                 TAnimationCorePtr inAnimationCore,
                                                 CUICDMSlideHandle inSlide,
-                                                CUICDMInstanceHandle inInstance,
-                                                CUICDMPropertyHandle inProperty)
+                                                Qt3DSDMInstanceHandle inInstance,
+                                                Qt3DSDMPropertyHandle inProperty)
 {
     SAnimationInfo theInfo = inAnimationCore->GetAnimationInfo(inAnimation);
     return theInfo.m_Slide == inSlide && theInfo.m_Instance == inInstance
@@ -103,13 +103,13 @@ void EraseActions(TDataCorePtr inDataCore, TActionCorePtr inActionCore,
 {
     for (TActionHandleList::const_iterator theActionIter = inActions.begin();
          theActionIter != inActions.end(); ++theActionIter) {
-        CUICDMInstanceHandle theActionInstance;
+        Qt3DSDMInstanceHandle theActionInstance;
         inActionCore->DeleteAction(*theActionIter, theActionInstance);
         inDataCore->DeleteInstance(theActionInstance);
     }
 }
 
-void CascadeInstanceDelete(CUICDMInstanceHandle inInstance, TDataCorePtr inDataCore,
+void CascadeInstanceDelete(Qt3DSDMInstanceHandle inInstance, TDataCorePtr inDataCore,
                            TSlideCorePtr inSlideCore, TSlideGraphCorePtr inSlideGraphCore,
                            TAnimationCorePtr inAnimationCore, TActionCorePtr inActionCore)
 {
@@ -126,7 +126,7 @@ void CascadeInstanceDelete(CUICDMInstanceHandle inInstance, TDataCorePtr inDataC
     EraseActions(inDataCore, inActionCore, theActions);
 }
 
-void CascadePropertyRemove(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+void CascadePropertyRemove(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                            TSlideCorePtr inSlideCore, TSlideGraphCorePtr inSlideGraphCore,
                            TAnimationCorePtr inAnimationCore)
 {
@@ -202,8 +202,8 @@ void CascadeSlideDelete(CUICDMSlideHandle inSlide, TDataCorePtr inDataCore,
     EraseActions(inDataCore, inActionCore, theActions);
 }
 
-void CascadeSlidePropertyRemove(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                CUICDMPropertyHandle inProperty, TAnimationCorePtr inAnimationCore)
+void CascadeSlidePropertyRemove(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                                Qt3DSDMPropertyHandle inProperty, TAnimationCorePtr inAnimationCore)
 {
     EraseAnimationsThatMatch(inAnimationCore,
                              std::bind(AnimationSlideInstancePropertyMatch,
@@ -211,7 +211,7 @@ void CascadeSlidePropertyRemove(CUICDMSlideHandle inSlide, CUICDMInstanceHandle
                                        inSlide, inInstance, inProperty));
 }
 
-void CascadeInstanceParentRemoved(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent,
+void CascadeInstanceParentRemoved(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent,
                                   TDataCorePtr inDataCore, TSlideCorePtr inSlideCore,
                                   TAnimationCorePtr inAnimationCore)
 {
@@ -219,11 +219,11 @@ void CascadeInstanceParentRemoved(CUICDMInstanceHandle inInstance, CUICDMInstanc
     inDataCore->GetInstanceProperties(inParent, theProperties);
     TInstanceHandleList allInstances;
     inDataCore->GetInstances(allInstances);
-    function<bool(CUICDMInstanceHandle)> InstanceOrDerived(
+    function<bool(Qt3DSDMInstanceHandle)> InstanceOrDerived(
         std::bind(&IDataCore::IsInstanceOrDerivedFrom, inDataCore,
                   std::placeholders::_1, inInstance));
-    function<bool(CUICDMInstanceHandle)> DerivedComplement(
-        std::bind(complement<function<bool(CUICDMInstanceHandle)>, CUICDMInstanceHandle>,
+    function<bool(Qt3DSDMInstanceHandle)> DerivedComplement(
+        std::bind(complement<function<bool(Qt3DSDMInstanceHandle)>, Qt3DSDMInstanceHandle>,
                     InstanceOrDerived, std::placeholders::_1));
     TInstanceHandleList::iterator all_derived =
         remove_if(allInstances.begin(), allInstances.end(), DerivedComplement);
@@ -364,8 +364,8 @@ std::shared_ptr<IActionCore> CStudioCoreSystem::GetTransactionlessActionCore()
     return dynamic_cast<CActionCoreProducer *>(m_ActionCore.get())->GetTransactionlessActionCore();
 }
 
-inline bool InstanceSpecificNameMatches(CUICDMInstanceHandle inInstance,
-                                        CUICDMPropertyHandle inProperty, const TCharStr &inName,
+inline bool InstanceSpecificNameMatches(Qt3DSDMInstanceHandle inInstance,
+                                        Qt3DSDMPropertyHandle inProperty, const TCharStr &inName,
                                         const CSimpleDataCore &inData)
 {
     TPropertyHandleList theProperties;
@@ -378,7 +378,7 @@ inline bool InstanceSpecificNameMatches(CUICDMInstanceHandle inInstance,
     return false;
 }
 
-CUICDMInstanceHandle CStudioCoreSystem::FindInstanceByName(CUICDMPropertyHandle inNameProperty,
+Qt3DSDMInstanceHandle CStudioCoreSystem::FindInstanceByName(Qt3DSDMPropertyHandle inNameProperty,
                                                            const TCharStr &inName) const
 {
     TInstanceHandleList theInstances;
diff --git a/src/Authoring/UICDM/Systems/StudioCoreSystem.h b/src/Authoring/UICDM/Systems/StudioCoreSystem.h
index d0e8702d..ee22271c 100644
--- a/src/Authoring/UICDM/Systems/StudioCoreSystem.h
+++ b/src/Authoring/UICDM/Systems/StudioCoreSystem.h
@@ -82,7 +82,7 @@ public:
     std::shared_ptr<IActionCore> GetTransactionlessActionCore();
     std::shared_ptr<ICustomPropCore> GetTransactionlessCustomPropCore();
 
-    CUICDMInstanceHandle FindInstanceByName(CUICDMPropertyHandle inNameProperty,
+    Qt3DSDMInstanceHandle FindInstanceByName(Qt3DSDMPropertyHandle inNameProperty,
                                             const TCharStr &inName) const;
 
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
diff --git a/src/Authoring/UICDM/Systems/StudioFullSystem.cpp b/src/Authoring/UICDM/Systems/StudioFullSystem.cpp
index 81167dd9..7222fa9f 100644
--- a/src/Authoring/UICDM/Systems/StudioFullSystem.cpp
+++ b/src/Authoring/UICDM/Systems/StudioFullSystem.cpp
@@ -86,8 +86,8 @@ void NotifySlideRearranged(TTransactionConsumerPtr &inConsumer,
 }
 
 void SendInstancePropertyValueChanged(TDataCorePtr inCore, IStudioFullSystemSignalSender *inSender,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty)
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty)
 {
     // Ignore when the instance is not an instance (undoing an add operation may create this, as
     // transactions are run first and notifications second).
@@ -97,7 +97,7 @@ void SendInstancePropertyValueChanged(TDataCorePtr inCore, IStudioFullSystemSign
 
 void NotifyInstancePropertyChanged(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
                                    IStudioFullSystemSignalSender *inSender,
-                                   CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+                                   Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                    bool inIsAggregate)
 {
     if (inConsumer) {
@@ -146,7 +146,7 @@ void NotifyComponentSeconds(TTransactionConsumerPtr &inConsumer,
 
 void NotifyPropertyLinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
                           IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
-                          CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+                          Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                           bool inAggregate)
 {
     if (inAggregate == false) {
@@ -161,7 +161,7 @@ void NotifyPropertyLinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCo
 
 void NotifyPropertyUnlinked(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
                             IStudioFullSystemSignalSender *inSender, CUICDMSlideHandle inMaster,
-                            CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+                            Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                             bool inAggregate)
 {
     if (inAggregate == false) {
@@ -190,8 +190,8 @@ void NotifyActiveSlide(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
 
 void NotifyAnimationCreated(TTransactionConsumerPtr &inConsumer,
                             IStudioFullSystemSignalSender *inSender,
-                            CUICDMAnimationHandle inAnimation, CUICDMInstanceHandle inInstance,
-                            CUICDMPropertyHandle inProperty, bool inIsAggregate)
+                            CUICDMAnimationHandle inAnimation, Qt3DSDMInstanceHandle inInstance,
+                            Qt3DSDMPropertyHandle inProperty, bool inIsAggregate)
 {
     if (!inIsAggregate) {
         NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendAnimationCreated,
@@ -203,8 +203,8 @@ void NotifyAnimationCreated(TTransactionConsumerPtr &inConsumer,
 
 void NotifyAnimationDeleted(TTransactionConsumerPtr &inConsumer, TDataCorePtr inCore,
                             IStudioFullSystemSignalSender *inSender,
-                            CUICDMAnimationHandle inAnimation, CUICDMInstanceHandle inInstance,
-                            CUICDMPropertyHandle inProperty)
+                            CUICDMAnimationHandle inAnimation, Qt3DSDMInstanceHandle inInstance,
+                            Qt3DSDMPropertyHandle inProperty)
 {
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendAnimationDeleted, inSender,
                                     inAnimation, inInstance, inProperty),
@@ -281,7 +281,7 @@ inline ISlideCoreSignalProvider *GetSlideSignaller(TSlideCorePtr inSlideCore)
 }
 
 void NotifyInstanceCreated(TTransactionConsumerPtr &inConsumer,
-                           IStudioFullSystemSignalSender *inSender, CUICDMInstanceHandle instance)
+                           IStudioFullSystemSignalSender *inSender, Qt3DSDMInstanceHandle instance)
 {
     NotifyConsumer(inConsumer,
                    bind(&IStudioFullSystemSignalSender::SendInstanceCreated, inSender, instance),
@@ -289,7 +289,7 @@ void NotifyInstanceCreated(TTransactionConsumerPtr &inConsumer,
 }
 
 void NotifyInstanceDeleted(TTransactionConsumerPtr &inConsumer,
-                           IStudioFullSystemSignalSender *inSender, CUICDMInstanceHandle instance)
+                           IStudioFullSystemSignalSender *inSender, Qt3DSDMInstanceHandle instance)
 {
     NotifyConsumer(inConsumer,
                    bind(&IStudioFullSystemSignalSender::SendInstanceDeleted, inSender, instance),
@@ -298,7 +298,7 @@ void NotifyInstanceDeleted(TTransactionConsumerPtr &inConsumer,
 
 void NotifyActionCreated(TTransactionConsumerPtr &inConsumer,
                          IStudioFullSystemSignalSender *inSender, CUICDMActionHandle inAction,
-                         CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance)
+                         CUICDMSlideHandle 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, CUICDMInstanceHandle inInstance)
+                           CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance)
 {
     NotifyConsumer(inConsumer, bind(&IStudioFullSystemSignalSender::SendActionDeleted, inSender,
                                     inAction, inSlide, inInstance),
@@ -390,10 +390,10 @@ void NotifyAllKeyframesErased(TTransactionConsumerPtr &inConsumer,
 }
 
 CStudioFullSystem::CStudioFullSystem(std::shared_ptr<CStudioCoreSystem> inCoreSystem,
-                                     CUICDMInstanceHandle inSlideInstance,
-                                     CUICDMPropertyHandle inComponentGuidProperty,
-                                     CUICDMInstanceHandle inActionInstance,
-                                     CUICDMPropertyHandle inActionEyeball)
+                                     Qt3DSDMInstanceHandle inSlideInstance,
+                                     Qt3DSDMPropertyHandle inComponentGuidProperty,
+                                     Qt3DSDMInstanceHandle inActionInstance,
+                                     Qt3DSDMPropertyHandle inActionEyeball)
     : m_CoreSystem(inCoreSystem)
     , m_SlideSystem(new SSlideSystem(m_CoreSystem->GetDataCore(), m_CoreSystem->GetSlideCore(),
                                      m_CoreSystem->GetSlideGraphCore(),
@@ -610,8 +610,8 @@ std::shared_ptr<CStudioCoreSystem> CStudioFullSystem::GetCoreSystem()
     return m_CoreSystem;
 }
 
-bool CStudioFullSystem::GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                          CUICDMPropertyHandle inProperty,
+bool CStudioFullSystem::GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                          Qt3DSDMPropertyHandle inProperty,
                                                           SValue &outValue) const
 {
     SValue theTemp;
@@ -622,7 +622,7 @@ bool CStudioFullSystem::GetCanonicalInstancePropertyValue(CUICDMInstanceHandle i
     return retval;
 }
 
-CUICDMInstanceHandle CStudioFullSystem::FindInstanceByName(CUICDMPropertyHandle inNameProperty,
+Qt3DSDMInstanceHandle CStudioFullSystem::FindInstanceByName(Qt3DSDMPropertyHandle inNameProperty,
                                                            const TCharStr &inName) const
 {
     return m_CoreSystem->FindInstanceByName(inNameProperty, inName);
diff --git a/src/Authoring/UICDM/Systems/StudioFullSystem.h b/src/Authoring/UICDM/Systems/StudioFullSystem.h
index 4312e6d9..67fe0f86 100644
--- a/src/Authoring/UICDM/Systems/StudioFullSystem.h
+++ b/src/Authoring/UICDM/Systems/StudioFullSystem.h
@@ -58,7 +58,7 @@ public:
      *	for other serialized instances.  There is another implicit assumption that the system
      *	can name any instances used a base.
      */
-    virtual bool GetInstanceName(CUICDMInstanceHandle inInstance, TCharStr &outName) = 0;
+    virtual bool GetInstanceName(Qt3DSDMInstanceHandle inInstance, TCharStr &outName) = 0;
 };
 
 typedef std::shared_ptr<IStudioFullSystemSerializeHelper> TStudioFullSystemSerializeHelperPtr;
@@ -74,19 +74,19 @@ public:
      *	Return an instance by name.  Whatever method was used above to name instances
      *	should be used to find a given instance by name.
      */
-    virtual CUICDMInstanceHandle FindInstanceByName(const TCharStr &inName) = 0;
+    virtual Qt3DSDMInstanceHandle FindInstanceByName(const TCharStr &inName) = 0;
     /**
      *	Translate a given guid.  For pass 1, you should only translate ids and just return identity
      *	for anything that isn't an id.
      */
-    virtual void TranslateGuidPass1(CUICDMPropertyHandle inProperty, SLong4 inValue) = 0;
+    virtual void TranslateGuidPass1(Qt3DSDMPropertyHandle inProperty, SLong4 inValue) = 0;
     /**
      *	Now translate guids that are used as data variables.  These are links to other objects and
      *the GUID
      *	information should come from what was created in pass 1.
      */
-    virtual SLong4 TranslateGuidPass2(CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, SLong4 inValue) = 0;
+    virtual SLong4 TranslateGuidPass2(Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, SLong4 inValue) = 0;
 };
 
 typedef std::shared_ptr<IStudioFullSystemDeserializeHelper> TStudioFullSystemDeserializeHelperPtr;
@@ -112,9 +112,9 @@ class CStudioFullSystem : public ITransactionProducer
 
 public:
     CStudioFullSystem(std::shared_ptr<CStudioCoreSystem> inCoreSystem,
-                      CUICDMInstanceHandle inSlideInstance,
-                      CUICDMPropertyHandle inComponentGuidProperty,
-                      CUICDMInstanceHandle inActionInstance, CUICDMPropertyHandle inActionEyeball);
+                      Qt3DSDMInstanceHandle inSlideInstance,
+                      Qt3DSDMPropertyHandle inComponentGuidProperty,
+                      Qt3DSDMInstanceHandle inActionInstance, Qt3DSDMPropertyHandle inActionEyeball);
     virtual ~CStudioFullSystem();
 
     void BeginAggregateOperation() { m_AggregateOperation = true; }
@@ -142,9 +142,9 @@ public:
 
     // Ignoring animation and the currently active slide, get the canonical instance property value
     // for this instance.
-    bool GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                           CUICDMPropertyHandle inProperty, SValue &outValue) const;
-    CUICDMInstanceHandle FindInstanceByName(CUICDMPropertyHandle inNameProperty,
+    bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMPropertyHandle inProperty, SValue &outValue) const;
+    Qt3DSDMInstanceHandle FindInstanceByName(Qt3DSDMPropertyHandle inNameProperty,
                                             const TCharStr &inName) const;
 
     void SetConsumer(TTransactionConsumerPtr inConsumer) override;
diff --git a/src/Authoring/UICDM/Systems/StudioPropertySystem.cpp b/src/Authoring/UICDM/Systems/StudioPropertySystem.cpp
index 1f4c8107..25486898 100644
--- a/src/Authoring/UICDM/Systems/StudioPropertySystem.cpp
+++ b/src/Authoring/UICDM/Systems/StudioPropertySystem.cpp
@@ -48,22 +48,22 @@ CStudioPropertySystem::CStudioPropertySystem(std::shared_ptr<IMetaData> inMetaDa
     m_ImmediateModePropertyCoreSignaller = CreatePropertyCoreSignaller();
 }
 
-DataModelDataType::Value CStudioPropertySystem::GetDataType(CUICDMPropertyHandle inProperty) const
+DataModelDataType::Value CStudioPropertySystem::GetDataType(Qt3DSDMPropertyHandle inProperty) const
 {
     if (m_DataCore->IsProperty(inProperty))
         return m_DataCore->GetProperty(inProperty).m_Type;
     return DataModelDataType::None;
 }
 
-TCharStr CStudioPropertySystem::GetName(CUICDMPropertyHandle inProperty) const
+TCharStr CStudioPropertySystem::GetName(Qt3DSDMPropertyHandle inProperty) const
 {
     if (m_DataCore->IsProperty(inProperty))
         return m_DataCore->GetProperty(inProperty).m_Name;
     return TCharStr();
 }
 
-TCharStr CStudioPropertySystem::GetFormalName(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const
+TCharStr CStudioPropertySystem::GetFormalName(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const
 {
     if (inInstance.Valid() && inProperty.Valid())
         return m_MetaData->GetFormalName(inInstance, inProperty);
@@ -71,41 +71,41 @@ TCharStr CStudioPropertySystem::GetFormalName(CUICDMInstanceHandle inInstance,
 }
 
 AdditionalMetaDataType::Value
-CStudioPropertySystem::GetAdditionalMetaDataType(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty) const
+CStudioPropertySystem::GetAdditionalMetaDataType(Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty) const
 {
     return m_MetaData->GetAdditionalMetaDataType(inInstance, inProperty);
 }
 
 TMetaDataData
-CStudioPropertySystem::GetAdditionalMetaDataData(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty) const
+CStudioPropertySystem::GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty) const
 {
     return m_MetaData->GetAdditionalMetaDataData(inInstance, inProperty);
 }
 
-CUICDMInstanceHandle CStudioPropertySystem::GetPropertyOwner(CUICDMPropertyHandle inProperty) const
+Qt3DSDMInstanceHandle CStudioPropertySystem::GetPropertyOwner(Qt3DSDMPropertyHandle inProperty) const
 {
 
     qt3dsdm::SUICDMPropertyDefinition thePropDef = m_DataCore->GetProperty(inProperty);
     return thePropDef.m_Instance;
 }
 
-CUICDMPropertyHandle
-CStudioPropertySystem::GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle
+CStudioPropertySystem::GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                           const TCharStr &inStr) const
 {
     return m_DataCore->GetAggregateInstancePropertyByName(inInstance, inStr);
 }
 
-void CStudioPropertySystem::GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+void CStudioPropertySystem::GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                            TPropertyHandleList &outProperties) const
 {
     m_DataCore->GetAggregateInstanceProperties(inInstance, outProperties);
 }
 
-bool CStudioPropertySystem::HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                                         CUICDMPropertyHandle inProperty) const
+bool CStudioPropertySystem::HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                                         Qt3DSDMPropertyHandle inProperty) const
 {
     return m_DataCore->HasAggregateInstanceProperty(inInstance, inProperty);
 }
@@ -116,8 +116,8 @@ bool ApplyValueAndReturnTrue(const SValue &inValue, SValue &outValue)
     return true;
 }
 
-bool CStudioPropertySystem::GetInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty,
+bool CStudioPropertySystem::GetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      SValue &outValue) const
 {
     if (!m_DataCore->IsInstance(inInstance))
@@ -140,8 +140,8 @@ bool CStudioPropertySystem::GetInstancePropertyValue(CUICDMInstanceHandle inInst
     return m_DataCore->GetInstancePropertyValue(inInstance, inProperty, outValue);
 }
 
-void CStudioPropertySystem::SetInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                     CUICDMPropertyHandle inProperty,
+void CStudioPropertySystem::SetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                     Qt3DSDMPropertyHandle inProperty,
                                                      const SValue &inValue)
 {
     m_DataCore->CheckValue(inInstance, inProperty, inValue);
@@ -160,7 +160,7 @@ void CStudioPropertySystem::SetInstancePropertyValue(CUICDMInstanceHandle inInst
     }
 }
 
-CUICDMInstanceHandle CStudioPropertySystem::CreateInstance()
+Qt3DSDMInstanceHandle CStudioPropertySystem::CreateInstance()
 {
     return m_DataCore->CreateInstance();
 }
@@ -170,24 +170,24 @@ void CStudioPropertySystem::GetInstances(TInstanceHandleList &outInstances) cons
     m_DataCore->GetInstances(outInstances);
 }
 
-void CStudioPropertySystem::DeleteInstance(CUICDMInstanceHandle inHandle)
+void CStudioPropertySystem::DeleteInstance(Qt3DSDMInstanceHandle inHandle)
 {
     m_DataCore->DeleteInstance(inHandle);
 }
 
-void CStudioPropertySystem::DeriveInstance(CUICDMInstanceHandle inInstance,
-                                           CUICDMInstanceHandle inParent)
+void CStudioPropertySystem::DeriveInstance(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMInstanceHandle inParent)
 {
     m_DataCore->DeriveInstance(inInstance, inParent);
 }
 
-bool CStudioPropertySystem::IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                                    CUICDMInstanceHandle inParent) const
+bool CStudioPropertySystem::IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMInstanceHandle inParent) const
 {
     return m_DataCore->IsInstanceOrDerivedFrom(inInstance, inParent);
 }
 
-CUICDMPropertyHandle CStudioPropertySystem::AddProperty(CUICDMInstanceHandle inInstance,
+Qt3DSDMPropertyHandle CStudioPropertySystem::AddProperty(Qt3DSDMInstanceHandle inInstance,
                                                         TCharPtr inName,
                                                         DataModelDataType::Value inPropType)
 {
@@ -199,8 +199,8 @@ bool CStudioPropertySystem::HandleValid(int inHandle) const
     return m_DataCore->HandleValid(inHandle);
 }
 
-bool CStudioPropertySystem::GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                              CUICDMPropertyHandle inProperty,
+bool CStudioPropertySystem::GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                              Qt3DSDMPropertyHandle inProperty,
                                                               SValue &outValue) const
 {
     SValue theTempValue;
diff --git a/src/Authoring/UICDM/Systems/StudioPropertySystem.h b/src/Authoring/UICDM/Systems/StudioPropertySystem.h
index a9098567..c6ef23af 100644
--- a/src/Authoring/UICDM/Systems/StudioPropertySystem.h
+++ b/src/Authoring/UICDM/Systems/StudioPropertySystem.h
@@ -37,7 +37,7 @@
 
 namespace qt3dsdm {
 
-typedef std::tuple<CUICDMInstanceHandle, CUICDMPropertyHandle, SValue> TTemporaryPropertyValue;
+typedef std::tuple<Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, SValue> TTemporaryPropertyValue;
 typedef std::vector<TTemporaryPropertyValue> TTemporaryPropertyValueList;
 
 /**
@@ -77,50 +77,50 @@ public:
         return dynamic_cast<IInstancePropertyCoreSignalSender *>(m_PropertyCoreSignaller.get());
     }
 
-    DataModelDataType::Value GetDataType(CUICDMPropertyHandle inProperty) const override;
-    TCharStr GetName(CUICDMPropertyHandle inProperty) const override;
-    TCharStr GetFormalName(CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty) const override;
+    DataModelDataType::Value GetDataType(Qt3DSDMPropertyHandle inProperty) const override;
+    TCharStr GetName(Qt3DSDMPropertyHandle inProperty) const override;
+    TCharStr GetFormalName(Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty) const override;
     virtual AdditionalMetaDataType::Value
-    GetAdditionalMetaDataType(CUICDMInstanceHandle inInstance,
-                              CUICDMPropertyHandle inProperty) const override;
-    TMetaDataData GetAdditionalMetaDataData(CUICDMInstanceHandle inInstance,
-                                                    CUICDMPropertyHandle inProperty) const override;
-    CUICDMInstanceHandle GetPropertyOwner(CUICDMPropertyHandle inProperty) const override;
+    GetAdditionalMetaDataType(Qt3DSDMInstanceHandle inInstance,
+                              Qt3DSDMPropertyHandle inProperty) const override;
+    TMetaDataData GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMPropertyHandle inProperty) const override;
+    Qt3DSDMInstanceHandle GetPropertyOwner(Qt3DSDMPropertyHandle inProperty) const override;
 
-    CUICDMPropertyHandle GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+    Qt3DSDMPropertyHandle GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                                                     const TCharStr &inStr) const override;
-    void GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+    void GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                 TPropertyHandleList &outProperties) const override;
-    bool HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const override;
+    bool HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const override;
 
-    bool GetInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, SValue &outValue) const override;
-    void SetInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, const SValue &inValue) override;
+    bool GetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, SValue &outValue) const override;
+    void SetInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, const SValue &inValue) override;
 
-    CUICDMInstanceHandle CreateInstance() override;
+    Qt3DSDMInstanceHandle CreateInstance() override;
     void GetInstances(TInstanceHandleList &outInstances) const override;
-    void DeleteInstance(CUICDMInstanceHandle inHandle) override;
+    void DeleteInstance(Qt3DSDMInstanceHandle inHandle) override;
 
-    void DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent) override;
-    bool IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                         CUICDMInstanceHandle inParent) const override;
+    void DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent) override;
+    bool IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMInstanceHandle inParent) const override;
 
-    CUICDMPropertyHandle AddProperty(CUICDMInstanceHandle inInstance, TCharPtr inName,
+    Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                              DataModelDataType::Value inPropType) override;
     bool HandleValid(int inHandle) const override;
 
     // Get the instance property value from the slide that owns the instance or the data core if the
     // slide doesn't have the value
-    bool GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                           CUICDMPropertyHandle inProperty, SValue &outValue) const;
+    bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMPropertyHandle inProperty, SValue &outValue) const;
 
 private:
     static bool DerivedGuidMatches(qt3dsdm::IDataCore &inDataCore,
-                                   qt3dsdm::CUICDMInstanceHandle inInstance,
-                                   qt3dsdm::CUICDMPropertyHandle inProperty, qt3dsdm::SLong4 inGuid);
+                                   qt3dsdm::Qt3DSDMInstanceHandle inInstance,
+                                   qt3dsdm::Qt3DSDMPropertyHandle inProperty, qt3dsdm::SLong4 inGuid);
     CStudioPropertySystem(const CStudioPropertySystem&) = delete;
     CStudioPropertySystem& operator=(const CStudioPropertySystem&) = delete;
 };
diff --git a/src/Authoring/UICDM/Systems/UICDMActionCore.h b/src/Authoring/UICDM/Systems/UICDMActionCore.h
index 8b0592f4..674e6722 100644
--- a/src/Authoring/UICDM/Systems/UICDMActionCore.h
+++ b/src/Authoring/UICDM/Systems/UICDMActionCore.h
@@ -51,21 +51,21 @@ public:
     virtual TStringTablePtr GetStringTablePtr() const = 0;
     virtual IStringTable &GetStringTable() const = 0;
     // Action
-    virtual CUICDMActionHandle CreateAction(CUICDMInstanceHandle inInstance,
-                                            CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    virtual CUICDMActionHandle CreateAction(Qt3DSDMInstanceHandle inInstance,
+                                            CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                                             SLong4 inTriggerTargetObjects) = 0;
-    virtual void DeleteAction(CUICDMActionHandle inAction, CUICDMInstanceHandle &outInstance) = 0;
+    virtual void DeleteAction(CUICDMActionHandle inAction, Qt3DSDMInstanceHandle &outInstance) = 0;
     virtual const SActionInfo &GetActionInfo(CUICDMActionHandle inAction) const = 0;
-    virtual void GetActions(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    virtual void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const = 0;
     virtual void GetActions(CUICDMSlideHandle inSlide, TActionHandleList &outActions) const = 0;
-    virtual void GetActions(CUICDMInstanceHandle inOwner, TActionHandleList &outActions) const = 0;
+    virtual void GetActions(Qt3DSDMInstanceHandle inOwner, TActionHandleList &outActions) const = 0;
     virtual void GetActions(TActionHandleList &outActions) const = 0;
 
     // Return the instance that was allocated for this action.
-    virtual CUICDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const = 0;
+    virtual Qt3DSDMInstanceHandle GetActionInstance(CUICDMActionHandle inAction) const = 0;
     // Reverse lookup into the action system so you can match actions to instances.
-    virtual CUICDMActionHandle GetActionByInstance(CUICDMInstanceHandle inActionInstance) const = 0;
+    virtual CUICDMActionHandle GetActionByInstance(Qt3DSDMInstanceHandle inActionInstance) const = 0;
 
     // Action Properties
     virtual void SetTriggerObject(CUICDMActionHandle inAction,
diff --git a/src/Authoring/UICDM/Systems/UICDMActionInfo.h b/src/Authoring/UICDM/Systems/UICDMActionInfo.h
index 3671fcbb..09b787f0 100644
--- a/src/Authoring/UICDM/Systems/UICDMActionInfo.h
+++ b/src/Authoring/UICDM/Systems/UICDMActionInfo.h
@@ -37,12 +37,12 @@ namespace qt3dsdm {
 using std::wstring;
 struct SActionInfo
 {
-    CUICDMInstanceHandle m_Instance; // InstanceHandle corresponding to this action (to store other
+    Qt3DSDMInstanceHandle m_Instance; // InstanceHandle corresponding to this action (to store other
                                      // properties not listed here)
 
     // Where the action is added to
     CUICDMSlideHandle m_Slide; // the slide that the action is added to
-    CUICDMInstanceHandle
+    Qt3DSDMInstanceHandle
         m_Owner; // the object that the action is added to (the owner of the action)
 
     // Trigger object
@@ -59,8 +59,8 @@ struct SActionInfo
 
     SActionInfo() {}
 
-    SActionInfo(CUICDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
-                CUICDMInstanceHandle inOwner)
+    SActionInfo(Qt3DSDMInstanceHandle inInstance, CUICDMSlideHandle inSlide,
+                Qt3DSDMInstanceHandle inOwner)
         : m_Instance(inInstance)
         , m_Slide(inSlide)
         , m_Owner(inOwner)
diff --git a/src/Authoring/UICDM/Systems/UICDMActionSystem.h b/src/Authoring/UICDM/Systems/UICDMActionSystem.h
index 0c02a7a3..90739e53 100644
--- a/src/Authoring/UICDM/Systems/UICDMActionSystem.h
+++ b/src/Authoring/UICDM/Systems/UICDMActionSystem.h
@@ -47,12 +47,12 @@ public:
 
     // CreateAction will create Action's InstanceHandle and Action's ActionHandle and do some
     // necessary setup
-    virtual CUICDMActionHandle CreateAction(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inOwner,
+    virtual CUICDMActionHandle CreateAction(CUICDMSlideHandle 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, CUICDMInstanceHandle inOwner,
+    virtual void GetActions(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inOwner,
                             TActionHandleList &outActions) const = 0;
 
     // Get/set action eyeball property value
diff --git a/src/Authoring/UICDM/Systems/UICDMAnimation.h b/src/Authoring/UICDM/Systems/UICDMAnimation.h
index dc6cfc6d..06da0c73 100644
--- a/src/Authoring/UICDM/Systems/UICDMAnimation.h
+++ b/src/Authoring/UICDM/Systems/UICDMAnimation.h
@@ -186,8 +186,8 @@ typedef std::vector<TKeyframe> TKeyframeList;
 struct SAnimationInfo
 {
     CUICDMSlideHandle m_Slide;
-    CUICDMInstanceHandle m_Instance;
-    CUICDMPropertyHandle m_Property;
+    Qt3DSDMInstanceHandle m_Instance;
+    Qt3DSDMPropertyHandle m_Property;
     size_t m_Index;
     EAnimationType m_AnimationType;
     // Use the existing value for the value of the first keyframe.
@@ -205,8 +205,8 @@ struct SAnimationInfo
 
     {
     }
-    SAnimationInfo(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                   CUICDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
+    SAnimationInfo(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
+                   Qt3DSDMPropertyHandle inProperty, size_t inIndex, EAnimationType inAnimationType,
                    bool inDynamicFirstKeyframe, bool inArtistEdited)
         : m_Slide(inSlide)
         , m_Instance(inInstance)
@@ -231,14 +231,14 @@ class IAnimationCore
 public:
     virtual ~IAnimationCore() {}
     virtual CUICDMAnimationHandle CreateAnimation(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty, size_t inIndex,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                                   EAnimationType inAnimationType,
                                                   bool inFirstKeyframeDynamic) = 0;
     virtual void DeleteAnimation(CUICDMAnimationHandle inAnimation) = 0;
     virtual CUICDMAnimationHandle GetAnimation(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inInstance,
-                                               CUICDMPropertyHandle inProperty,
+                                               Qt3DSDMInstanceHandle inInstance,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                size_t inIndex) const = 0;
     virtual SAnimationInfo GetAnimationInfo(CUICDMAnimationHandle inAnimation) const = 0;
     virtual void GetAnimations(TAnimationHandleList &outAnimations) const = 0;
@@ -247,7 +247,7 @@ public:
                                CUICDMSlideHandle inSlide = CUICDMSlideHandle()) const = 0;
 
     virtual void GetSpecificInstanceAnimations(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inInstance,
+                                               Qt3DSDMInstanceHandle inInstance,
                                                TAnimationHandleList &outAnimations) = 0;
 
     virtual void SetFirstKeyframeDynamic(CUICDMAnimationHandle inAnimation, bool inValue) = 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, CUICDMInstanceHandle inInstance,
+    virtual void OffsetAnimations(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inInstance,
                                   long inOffset) = 0;
 
     // Direct mutators of the artist edited feature of animations
@@ -283,9 +283,9 @@ public:
     virtual bool AnimationValid(CUICDMAnimationHandle inAnimation) const = 0;
 
     virtual void CopyAnimations(CUICDMSlideHandle inSourceSlide,
-                                CUICDMInstanceHandle inSourceInstance,
+                                Qt3DSDMInstanceHandle inSourceInstance,
                                 CUICDMSlideHandle inDestSlide,
-                                CUICDMInstanceHandle inDestInstance) = 0;
+                                Qt3DSDMInstanceHandle inDestInstance) = 0;
 };
 
 typedef std::shared_ptr<IAnimationCore> TAnimationCorePtr;
@@ -335,32 +335,32 @@ public:
      *keyframes previously,
      *	this function will also set the keyframes accordingly.
      */
-    virtual void Animate(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) = 0;
+    virtual void Animate(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) = 0;
     /**
      *	Delete animation on the property on this instance
      */
-    virtual void Deanimate(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) = 0;
+    virtual void Deanimate(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) = 0;
     /**
      *	Set a keyframe on this property.  Uses the current time of the slide graph.
      *	If the keyframe is within a given time distance of another, this function will simply change
      *	the keyframed value of the other property to match the current value of this property.
      */
-    virtual void KeyframeProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    virtual void KeyframeProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                                   bool inDoDiffValue) = 0;
     /**
      *	Set the value of a existing a keyframe or create a new one, on this property, at the given
      *time.
      *  If ease in or ease out are unset then the keyframe gets the default ease in or out.
      */
-    virtual void SetOrCreateKeyframe(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty, float inTimeInSeconds,
+    virtual void SetOrCreateKeyframe(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty, float inTimeInSeconds,
                                      SGetOrSetKeyframeInfo *inKeyframeInfo, size_t inNumInfos) = 0;
     /**
      *	Return the animation that is currently controlling this property.  This function will return
      *	an invalid handle value if there is currently no animation controlling this property.
      */
-    virtual CUICDMAnimationHandle GetControllingAnimation(CUICDMInstanceHandle inInstance,
-                                                          CUICDMPropertyHandle inProperty,
+    virtual CUICDMAnimationHandle GetControllingAnimation(Qt3DSDMInstanceHandle inInstance,
+                                                          Qt3DSDMPropertyHandle inProperty,
                                                           size_t inIndex) const = 0;
 
     /**
@@ -369,16 +369,16 @@ public:
      *	by setting auto keyframe to on and setting a property value through the
      *IInstancePropertyCore system.
      */
-    virtual bool IsPropertyAnimatable(CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) const = 0;
+    virtual bool IsPropertyAnimatable(Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) const = 0;
 
     /**
      *	Return true if the given property is animated. Currently, either 0 or ALL channels are
      *animated. Hence, checking for index = 0 suffices.
      *	And if that changes, this function can be updated accordingly.
      */
-    virtual bool IsPropertyAnimated(CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) const = 0;
+    virtual bool IsPropertyAnimated(Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) const = 0;
 
     /**
      *	Specify if new keyframes should be created with smooth ( ie Ease In/Out values = 100 ) or
@@ -391,8 +391,8 @@ public:
      *property is animated.
      */
     virtual bool GetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const = 0;
     /**
      *	Set an instance property value.  Will return true in the cases where
@@ -400,8 +400,8 @@ public:
      *value.
      */
     virtual bool SetAnimatedInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   const SValue &inValue) = 0;
 };
 
@@ -439,8 +439,8 @@ inline SEaseInEaseOutKeyframe CreateEaseInEaseOutKeyframe(float inSeconds, float
 }
 
 inline SAnimationInfo CreateAnimationInfo(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty, size_t inIndex,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                           EAnimationType inAnimationType,
                                           bool inFirstKeyframeDynamic, bool inArtistEdited)
 {
@@ -742,8 +742,8 @@ void CopyKeyframes(const IAnimationCore &inSourceAnimationCore, IAnimationCore &
 
 CUICDMAnimationHandle CopyAnimation(TAnimationCorePtr inSourceAnimationCore,
                                     CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inNewSlide,
-                                    CUICDMInstanceHandle inNewInstance,
-                                    CUICDMPropertyHandle inNewProperty, size_t inNewIndex);
+                                    Qt3DSDMInstanceHandle inNewInstance,
+                                    Qt3DSDMPropertyHandle inNewProperty, size_t inNewIndex);
 
 struct SEaseInGetter
 {
diff --git a/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.cpp b/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.cpp
index e713a74c..ac30d728 100644
--- a/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.cpp
+++ b/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.cpp
@@ -433,7 +433,7 @@ ComposerPropertyNames::Enum ComposerPropertyNames::Convert(const char8_t *inType
 
 #define HANDLE_COMPOSER_OBJECT_TYPE(name, propmacro)                                               \
     SComposerTypePropertyDefinition<ComposerObjectTypes::name>::SComposerTypePropertyDefinition(   \
-        IDataCore &inCore, CUICDMInstanceHandle inInstance)                                        \
+        IDataCore &inCore, Qt3DSDMInstanceHandle inInstance)                                        \
         : reserved(false) propmacro                                                  \
     { \
         Q_UNUSED(inCore);\
@@ -446,23 +446,23 @@ ITERATE_COMPOSER_OBJECT_TYPES
 #undef HANDLE_COMPOSER_PROPERTY_DUPLICATE
 
 void ComposerTypeDefinitionsHelper::SetInstanceAsCanonical(IMetaData &inMetaData,
-                                                           CUICDMInstanceHandle inInstance,
+                                                           Qt3DSDMInstanceHandle inInstance,
                                                            ComposerObjectTypes::Enum inObjectType)
 {
     inMetaData.SetInstanceAsCanonical(inInstance, ComposerObjectTypes::Convert(inObjectType));
 }
 
 void ComposerTypeDefinitionsHelper::SetInstancePropertyValue(IDataCore &inDataCore,
-                                                             CUICDMInstanceHandle inInstance,
-                                                             CUICDMPropertyHandle inProperty,
+                                                             Qt3DSDMInstanceHandle inInstance,
+                                                             Qt3DSDMPropertyHandle inProperty,
                                                              const wchar_t *inPropValue)
 {
     inDataCore.SetInstancePropertyValue(inInstance, inProperty, make_shared<CDataStr>(inPropValue));
 }
 
 void ComposerTypeDefinitionsHelper::DeriveInstance(IDataCore &inDataCore,
-                                                   CUICDMInstanceHandle inInstance,
-                                                   CUICDMInstanceHandle inParent)
+                                                   Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMInstanceHandle inParent)
 {
     inDataCore.DeriveInstance(inInstance, inParent);
 }
@@ -507,7 +507,7 @@ SComposerObjectDefinitions::SComposerObjectDefinitions(
 {
 }
 
-bool SComposerObjectDefinitions::IsA(CUICDMInstanceHandle inInstance,
+bool SComposerObjectDefinitions::IsA(Qt3DSDMInstanceHandle inInstance,
                                      ComposerObjectTypes::Enum inType)
 {
     if (m_DataCore.IsInstance(inInstance) == false)
@@ -527,12 +527,12 @@ bool SComposerObjectDefinitions::IsA(CUICDMInstanceHandle inInstance,
 // Could easily return None, meaning we can't identify the object type.
 // Checks the type of the first derivation parent, so this won't ever return
 // SlideOwner, for instance.
-ComposerObjectTypes::Enum SComposerObjectDefinitions::GetType(CUICDMInstanceHandle inInstance)
+ComposerObjectTypes::Enum SComposerObjectDefinitions::GetType(Qt3DSDMInstanceHandle inInstance)
 {
     if (m_DataCore.IsInstance(inInstance) == false)
         return ComposerObjectTypes::Unknown;
 
-    CUICDMInstanceHandle theTargetInstance = inInstance;
+    Qt3DSDMInstanceHandle theTargetInstance = inInstance;
     TInstanceHandleList theHandleList;
     m_DataCore.GetInstanceParents(inInstance, theHandleList);
     if (theHandleList.empty() == false)
@@ -547,7 +547,7 @@ ComposerObjectTypes::Enum SComposerObjectDefinitions::GetType(CUICDMInstanceHand
     return ComposerObjectTypes::Unknown;
 }
 
-CUICDMInstanceHandle
+Qt3DSDMInstanceHandle
 SComposerObjectDefinitions::GetInstanceForType(ComposerObjectTypes::Enum inType)
 {
     switch (inType) {
diff --git a/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.h b/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.h
index 5c6b050e..555a0b06 100644
--- a/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.h
+++ b/src/Authoring/UICDM/Systems/UICDMComposerTypeDefinitions.h
@@ -381,8 +381,8 @@ template <ComposerPropertyNames::Enum TPropName, typename TDataType>
 struct SComposerPropertyDefinition
 {
     qt3ds::foundation::Option<TDataType> m_DefaultValue;
-    CUICDMPropertyHandle m_Property;
-    SComposerPropertyDefinition(IDataCore &inDataCore, CUICDMInstanceHandle inInstance,
+    Qt3DSDMPropertyHandle m_Property;
+    SComposerPropertyDefinition(IDataCore &inDataCore, Qt3DSDMInstanceHandle inInstance,
                                 const TDataType &inDefault)
         : m_DefaultValue(inDefault)
     {
@@ -392,13 +392,13 @@ struct SComposerPropertyDefinition
         if (m_DefaultValue.hasValue())
             inDataCore.SetInstancePropertyValue(inInstance, m_Property, m_DefaultValue.getValue());
     }
-    SComposerPropertyDefinition(IDataCore &inDataCore, CUICDMInstanceHandle inInstance)
+    SComposerPropertyDefinition(IDataCore &inDataCore, Qt3DSDMInstanceHandle inInstance)
     {
         UICDM_LOG_FUNCTION("SComposerPropertyDefinition-2");
         m_Property = inDataCore.AddProperty(inInstance, ComposerPropertyNames::Convert(TPropName),
                                             TypeToDataType<TDataType>());
     }
-    operator CUICDMPropertyHandle() const { return m_Property; }
+    operator Qt3DSDMPropertyHandle() const { return m_Property; }
 };
 
 // Define all the objects with their properties
@@ -423,7 +423,7 @@ struct SComposerTypePropertyDefinition
     {                                                                                              \
         bool reserved;                                                               \
         propmacro SComposerTypePropertyDefinition(IDataCore &inCore,                               \
-                                                  CUICDMInstanceHandle inInstance);                \
+                                                  Qt3DSDMInstanceHandle inInstance);                \
     };
 
 ITERATE_COMPOSER_OBJECT_TYPES
@@ -436,21 +436,21 @@ ITERATE_COMPOSER_OBJECT_TYPES
 struct ComposerTypeDefinitionsHelper
 {
     // Functions here so we don't have to include UICDMDataCore.h or UICDMMetaData.h
-    static void SetInstanceAsCanonical(IMetaData &inMetaData, CUICDMInstanceHandle inInstance,
+    static void SetInstanceAsCanonical(IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance,
                                        ComposerObjectTypes::Enum inObjectType);
-    static void SetInstancePropertyValue(IDataCore &inDataCore, CUICDMInstanceHandle inInstance,
-                                         CUICDMPropertyHandle inProperty,
+    static void SetInstancePropertyValue(IDataCore &inDataCore, Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMPropertyHandle inProperty,
                                          const wchar_t *inPropValue);
-    static void DeriveInstance(IDataCore &inDataCore, CUICDMInstanceHandle inInstance,
-                               CUICDMInstanceHandle inParent);
+    static void DeriveInstance(IDataCore &inDataCore, Qt3DSDMInstanceHandle inInstance,
+                               Qt3DSDMInstanceHandle inParent);
 };
 
 template <ComposerObjectTypes::Enum TEnumType>
 struct SComposerBaseObjectDefinition : public SComposerTypePropertyDefinition<TEnumType>
 {
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     SComposerBaseObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                                  CUICDMInstanceHandle inInstance)
+                                  Qt3DSDMInstanceHandle inInstance)
         : SComposerTypePropertyDefinition<TEnumType>(inCore, inInstance)
         , m_Instance(inInstance)
     {
@@ -484,7 +484,7 @@ template <ComposerObjectTypes::Enum TEnumType>
 struct SComposerObjectDefinition : public SComposerBaseObjectDefinition<TEnumType>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance)
+                              Qt3DSDMInstanceHandle inInstance)
         : SComposerBaseObjectDefinition<TEnumType>(inCore, inMetaData, inInstance)
     {
     }
@@ -496,7 +496,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Slide>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Slide>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Named> &inNamed)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Slide>(inCore, inMetaData, inInstance)
@@ -512,7 +512,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Action>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Action>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Action>(inCore, inMetaData, inInstance)
     {
@@ -526,7 +526,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Asset>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Asset>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Guided> &inGuided,
                               SComposerObjectDefinition<ComposerObjectTypes::Named> &inNamed)
@@ -543,7 +543,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Scene>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Scene>
 {
     SComposerObjectDefinition(
-        IDataCore &inCore, IMetaData &inMetaData, CUICDMInstanceHandle inInstance,
+        IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance,
         SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
         SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset,
         SComposerObjectDefinition<ComposerObjectTypes::SlideOwner> &inSlideOwner)
@@ -560,7 +560,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Image>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Image>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Image>(inCore, inMetaData, inInstance)
@@ -576,7 +576,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Lightmaps>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Lightmaps>(inCore, inMetaData,
@@ -593,7 +593,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::MaterialBase>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> &inBase)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::MaterialBase>(inCore, inMetaData,
@@ -610,7 +610,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Material>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Material>(inCore, inMetaData,
@@ -627,7 +627,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::CustomMaterial>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::CustomMaterial>(inCore, inMetaData,
@@ -644,7 +644,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::ReferencedMaterial>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::ReferencedMaterial>(inCore, inMetaData,
@@ -661,7 +661,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Behavior>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Behavior>(inCore, inMetaData,
@@ -678,7 +678,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Effect>
 
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Effect>(inCore, inMetaData, inInstance)
@@ -693,7 +693,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Node>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Node>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Node>(inCore, inMetaData, inInstance)
@@ -708,7 +708,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Layer>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Layer>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Layer>(inCore, inMetaData, inInstance)
@@ -723,7 +723,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Model>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Model>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Model>(inCore, inMetaData, inInstance)
@@ -738,7 +738,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Group>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Group>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Group>(inCore, inMetaData, inInstance)
@@ -753,7 +753,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Light>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Light>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Light>(inCore, inMetaData, inInstance)
@@ -768,7 +768,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Camera>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Camera>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Camera>(inCore, inMetaData, inInstance)
@@ -783,7 +783,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Text>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Text>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Text>(inCore, inMetaData, inInstance)
@@ -798,7 +798,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Component>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Component>
 {
     SComposerObjectDefinition(
-        IDataCore &inCore, IMetaData &inMetaData, CUICDMInstanceHandle inInstance,
+        IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance,
         SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
         SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode,
         SComposerObjectDefinition<ComposerObjectTypes::SlideOwner> &inSlideOwner)
@@ -816,7 +816,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::RenderPlugin>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::RenderPlugin>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::RenderPlugin>(inCore, inMetaData,
@@ -832,7 +832,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Alias>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Alias>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Alias>(inCore, inMetaData, inInstance)
@@ -847,7 +847,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Path>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::Path>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Node> &inNode)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::Path>(inCore, inMetaData, inInstance)
@@ -862,7 +862,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::PathAnchorPoint>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::PathAnchorPoint>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::PathAnchorPoint>(inCore, inMetaData,
@@ -878,7 +878,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::SubPath>
     : public SComposerBaseObjectDefinition<ComposerObjectTypes::SubPath>
 {
     SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData,
-                              CUICDMInstanceHandle inInstance,
+                              Qt3DSDMInstanceHandle inInstance,
                               SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped,
                               SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset)
         : SComposerBaseObjectDefinition<ComposerObjectTypes::SubPath>(inCore, inMetaData,
@@ -907,13 +907,13 @@ public:
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // RTTI API
-    bool IsA(CUICDMInstanceHandle inInstance, ComposerObjectTypes::Enum inType);
+    bool IsA(Qt3DSDMInstanceHandle inInstance, ComposerObjectTypes::Enum inType);
     // Could easily return None, meaning we can't identify the object type.
     // Checks the type of the first derivation parent, so this won't ever return
     // SlideOwner, for instance.
-    ComposerObjectTypes::Enum GetType(CUICDMInstanceHandle inInstance);
+    ComposerObjectTypes::Enum GetType(Qt3DSDMInstanceHandle inInstance);
 
-    CUICDMInstanceHandle GetInstanceForType(ComposerObjectTypes::Enum inType);
+    Qt3DSDMInstanceHandle GetInstanceForType(ComposerObjectTypes::Enum inType);
     SComposerObjectDefinitions() = default;
     ~SComposerObjectDefinitions() = default;
 private:
diff --git a/src/Authoring/UICDM/Systems/UICDMDataCore.h b/src/Authoring/UICDM/Systems/UICDMDataCore.h
index d6a36a1c..f9622144 100644
--- a/src/Authoring/UICDM/Systems/UICDMDataCore.h
+++ b/src/Authoring/UICDM/Systems/UICDMDataCore.h
@@ -37,7 +37,7 @@
 
 namespace qt3dsdm {
 
-typedef std::pair<CUICDMPropertyHandle, SValue> TPropertyHandleValuePair;
+typedef std::pair<Qt3DSDMPropertyHandle, SValue> TPropertyHandleValuePair;
 typedef std::vector<TPropertyHandleValuePair> TPropertyHandleValuePairList;
 
 class IInstancePropertyCore
@@ -48,29 +48,29 @@ public:
     /**
      *	Find a given instance property by name. May return an invalid handle.
      */
-    virtual CUICDMPropertyHandle
-    GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+    virtual Qt3DSDMPropertyHandle
+    GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                        const TCharStr &inStr) const = 0;
     /**
      *	Get the entire list of instance properties;
      */
-    virtual void GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+    virtual void GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                 TPropertyHandleList &outProperties) const = 0;
     // Get the properties that are stored only on this instance, not on any parents.
-    virtual void GetSpecificInstancePropertyValues(CUICDMInstanceHandle inHandle,
+    virtual void GetSpecificInstancePropertyValues(Qt3DSDMInstanceHandle inHandle,
                                                    TPropertyHandleValuePairList &outValues) = 0;
     /**
      *	Return true if this property is on this instance or one of its parents.
      */
-    virtual bool HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const = 0;
+    virtual bool HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const = 0;
 
     /**
      *	Does this value match the approperty property type.
      *	error - PropertyNotFound
      *	error - ValueTypeError
      */
-    virtual void CheckValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty,
+    virtual void CheckValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty,
                             const SValue &inValue) const = 0;
     /**
      *	Get this property from this instance.   This includes looking up the default value.  If the
@@ -79,8 +79,8 @@ public:
      *	error - InstanceNotFound
      *	error - PropertyNotFound if this property doesn't exist on this instance or doesn't exist.
      */
-    virtual bool GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty,
+    virtual bool GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
     /**
      *	Set this property on this instance.
@@ -88,8 +88,8 @@ public:
      *	error - PropertyNotFound if this property doesn't exist on this instance or doesn't exist.
      *	error - ValueTypeError if this value is of the wrong type
      */
-    virtual void SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty,
+    virtual void SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           const SValue &inValue) = 0;
 };
 
@@ -125,13 +125,13 @@ public:
      *	May use a target id to specify what the ideal id is; id must not exist.
      *	- error DuplicateInstanceName
      */
-    virtual CUICDMInstanceHandle
-    CreateInstance(CUICDMInstanceHandle inTargetId = CUICDMInstanceHandle()) = 0;
+    virtual Qt3DSDMInstanceHandle
+    CreateInstance(Qt3DSDMInstanceHandle inTargetId = Qt3DSDMInstanceHandle()) = 0;
     /**
      *	Delete an instance.
      *	error - InstanceNotFound
      */
-    virtual void DeleteInstance(CUICDMInstanceHandle inHandle) = 0;
+    virtual void DeleteInstance(Qt3DSDMInstanceHandle inHandle) = 0;
     /**
      *	Return all the instances in the system.
      */
@@ -140,7 +140,7 @@ public:
      *	Return all the instances in the system that is derived from parent.
      */
     virtual void GetInstancesDerivedFrom(TInstanceHandleList &outInstances,
-                                         CUICDMInstanceHandle inParentHandle) const = 0;
+                                         Qt3DSDMInstanceHandle inParentHandle) const = 0;
 
     //===============================================================
     //	Instance Derivation
@@ -150,19 +150,19 @@ public:
      *	the aggregate properties of a given instance.
      *	error - InstanceNotFound if either instance or parent aren't found
      */
-    virtual void DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent) = 0;
+    virtual void DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent) = 0;
     /**
      *	Return a count of the parent's of a given instance.
      *	error - InstanceNotFound
      */
-    virtual void GetInstanceParents(CUICDMInstanceHandle inHandle,
+    virtual void GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
                                     TInstanceHandleList &outParents) const = 0;
 
     /**
      *	Returns true if the instance is derived from the parent somehow.
      */
-    virtual bool IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                         CUICDMInstanceHandle inParent) const = 0;
+    virtual bool IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMInstanceHandle inParent) const = 0;
     //===============================================================
 
     //===============================================================
@@ -177,30 +177,30 @@ public:
      *	error - ValueTypeError if the default value exists and is if a different type than
      *inPropType
      */
-    virtual CUICDMPropertyHandle AddProperty(CUICDMInstanceHandle inInstance, TCharPtr inName,
+    virtual Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                              DataModelDataType::Value inPropType) = 0;
     /**
      *	Return the property definition that corresponds to a given property value.
      */
-    virtual const SUICDMPropertyDefinition &GetProperty(CUICDMPropertyHandle inProperty) const = 0;
+    virtual const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const = 0;
     /**
      *	Return the properties specific to this instance, not including properties
      *	gained by derivation
      */
-    virtual void GetInstanceProperties(CUICDMInstanceHandle inInstance,
+    virtual void GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                        TPropertyHandleList &outProperties) const = 0;
     /**
      *	Remove a property from an instance.  Instances will no long have this property accessible
      *nor will
      *	child instances.
      */
-    virtual void RemoveProperty(CUICDMPropertyHandle inProperty) = 0;
+    virtual void RemoveProperty(Qt3DSDMPropertyHandle inProperty) = 0;
     /**
      *	Copy properties (definitions & values) specific to one instance, not including properties
      *	gained by derivation, to another instance.
      */
-    virtual void CopyInstanceProperties(CUICDMInstanceHandle inSrcInstance,
-                                        CUICDMInstanceHandle inDestInstance) = 0;
+    virtual void CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
+                                        Qt3DSDMInstanceHandle inDestInstance) = 0;
     /**
      *	Removed cached intermediate values from the instance.  UICDM pull properties from the
      *inheritance hierarchy chain
@@ -211,7 +211,7 @@ public:
      *	save/load the file).
      */
     //===============================================================
-    virtual void RemoveCachedValues(CUICDMInstanceHandle inInstance) = 0;
+    virtual void RemoveCachedValues(Qt3DSDMInstanceHandle inInstance) = 0;
 
     //===============================================================
     //	Handle validation
@@ -233,49 +233,49 @@ class IPropertySystem : public IHandleBase
 public:
     virtual ~IPropertySystem() {}
 
-    virtual CUICDMInstanceHandle CreateInstance() = 0;
-    virtual void DeleteInstance(CUICDMInstanceHandle inHandle) = 0;
-    virtual void DeriveInstance(CUICDMInstanceHandle inInstance, CUICDMInstanceHandle inParent) = 0;
+    virtual Qt3DSDMInstanceHandle CreateInstance() = 0;
+    virtual void DeleteInstance(Qt3DSDMInstanceHandle inHandle) = 0;
+    virtual void DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent) = 0;
 
     virtual void GetInstances(TInstanceHandleList &outInstances) const = 0;
 
-    virtual CUICDMPropertyHandle AddProperty(CUICDMInstanceHandle inInstance, TCharPtr inName,
+    virtual Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                              DataModelDataType::Value inPropType) = 0;
 
-    virtual CUICDMPropertyHandle
-    GetAggregateInstancePropertyByName(CUICDMInstanceHandle inInstance,
+    virtual Qt3DSDMPropertyHandle
+    GetAggregateInstancePropertyByName(Qt3DSDMInstanceHandle inInstance,
                                        const TCharStr &inStr) const = 0;
-    virtual void GetAggregateInstanceProperties(CUICDMInstanceHandle inInstance,
+    virtual void GetAggregateInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                                 TPropertyHandleList &outProperties) const = 0;
-    virtual bool HasAggregateInstanceProperty(CUICDMInstanceHandle inInstance,
-                                              CUICDMPropertyHandle inProperty) const = 0;
+    virtual bool HasAggregateInstanceProperty(Qt3DSDMInstanceHandle inInstance,
+                                              Qt3DSDMPropertyHandle inProperty) const = 0;
 
-    virtual bool GetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty,
+    virtual bool GetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
-    virtual void SetInstancePropertyValue(CUICDMInstanceHandle inHandle,
-                                          CUICDMPropertyHandle inProperty,
+    virtual void SetInstancePropertyValue(Qt3DSDMInstanceHandle inHandle,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           const SValue &inValue) = 0;
 
-    virtual bool IsInstanceOrDerivedFrom(CUICDMInstanceHandle inInstance,
-                                         CUICDMInstanceHandle inParent) const = 0;
+    virtual bool IsInstanceOrDerivedFrom(Qt3DSDMInstanceHandle inInstance,
+                                         Qt3DSDMInstanceHandle inParent) const = 0;
 
-    virtual DataModelDataType::Value GetDataType(CUICDMPropertyHandle inProperty) const = 0;
-    virtual TCharStr GetName(CUICDMPropertyHandle inProperty) const = 0;
-    virtual TCharStr GetFormalName(CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty) const = 0;
+    virtual DataModelDataType::Value GetDataType(Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual TCharStr GetName(Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual TCharStr GetFormalName(Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty) const = 0;
     virtual AdditionalMetaDataType::Value
-    GetAdditionalMetaDataType(CUICDMInstanceHandle inInstance,
-                              CUICDMPropertyHandle inProperty) const = 0;
-    virtual TMetaDataData GetAdditionalMetaDataData(CUICDMInstanceHandle inInstance,
-                                                    CUICDMPropertyHandle inProperty) const = 0;
-    virtual CUICDMInstanceHandle GetPropertyOwner(CUICDMPropertyHandle inProperty) const = 0;
+    GetAdditionalMetaDataType(Qt3DSDMInstanceHandle inInstance,
+                              Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual TMetaDataData GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual Qt3DSDMInstanceHandle GetPropertyOwner(Qt3DSDMPropertyHandle inProperty) const = 0;
 };
 typedef std::shared_ptr<IPropertySystem> TPropertySystemPtr;
 
 template <typename TCoreType>
-inline SValue GetInstancePropertyValue(TCoreType inCore, CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty)
+inline SValue GetInstancePropertyValue(TCoreType inCore, Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty)
 {
     SValue retval;
     if (!inCore->GetInstancePropertyValue(inInstance, inProperty, retval))
@@ -285,29 +285,29 @@ inline SValue GetInstancePropertyValue(TCoreType inCore, CUICDMInstanceHandle in
 
 template <typename TDataType, typename TCoreType>
 inline TDataType GetSpecificInstancePropertyValue(TCoreType inDataCore,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty)
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty)
 {
     return qt3dsdm::get<TDataType>(GetInstancePropertyValue(inDataCore, inInstance, inProperty));
 }
 
 template <typename TDataType, typename TCoreType>
 inline TDataType GetNamedInstancePropertyValue(TCoreType inDataCore,
-                                               CUICDMInstanceHandle inInstance,
+                                               Qt3DSDMInstanceHandle inInstance,
                                                const TCharStr &inName)
 {
-    CUICDMPropertyHandle theProperty =
+    Qt3DSDMPropertyHandle theProperty =
         inDataCore->GetAggregateInstancePropertyByName(inInstance, inName);
     return GetSpecificInstancePropertyValue<TDataType, TCoreType>(inDataCore, inInstance,
                                                                   theProperty);
 }
 
-inline CUICDMPropertyHandle AddPropertyWithValue(IPropertySystem &inPropertySystem,
-                                                 CUICDMInstanceHandle inInstance, TCharPtr inName,
+inline Qt3DSDMPropertyHandle AddPropertyWithValue(IPropertySystem &inPropertySystem,
+                                                 Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                                  DataModelDataType::Value inDataType,
                                                  const SValue &inValue)
 {
-    CUICDMPropertyHandle theProperty(inPropertySystem.AddProperty(inInstance, inName, inDataType));
+    Qt3DSDMPropertyHandle theProperty(inPropertySystem.AddProperty(inInstance, inName, inDataType));
     inPropertySystem.SetInstancePropertyValue(inInstance, theProperty, inValue);
     return theProperty;
 }
diff --git a/src/Authoring/UICDM/Systems/UICDMHandles.h b/src/Authoring/UICDM/Systems/UICDMHandles.h
index 29147ae9..0a040214 100644
--- a/src/Authoring/UICDM/Systems/UICDMHandles.h
+++ b/src/Authoring/UICDM/Systems/UICDMHandles.h
@@ -86,62 +86,62 @@ inline bool CDataModelHandle::operator<(const CDataModelHandle &other) const
     return m_Handle < other.m_Handle;
 }
 
-class CUICDMInstanceHandle : public CDataModelHandle
+class Qt3DSDMInstanceHandle : public CDataModelHandle
 {
 public:
-    CUICDMInstanceHandle(int inHandle = 0)
+    Qt3DSDMInstanceHandle(int inHandle = 0)
         : CDataModelHandle(inHandle)
     {
     }
 
-    CUICDMInstanceHandle(const CDataModelHandle &inOther)
+    Qt3DSDMInstanceHandle(const CDataModelHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMInstanceHandle(const CUICDMInstanceHandle &inOther)
+    Qt3DSDMInstanceHandle(const Qt3DSDMInstanceHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMInstanceHandle &operator=(const CUICDMInstanceHandle &inOther)
+    Qt3DSDMInstanceHandle &operator=(const Qt3DSDMInstanceHandle &inOther)
     {
-        return static_cast<CUICDMInstanceHandle &>(CDataModelHandle::operator=(inOther));
+        return static_cast<Qt3DSDMInstanceHandle &>(CDataModelHandle::operator=(inOther));
     }
 
-    inline bool operator==(const CUICDMInstanceHandle &other) const
+    inline bool operator==(const Qt3DSDMInstanceHandle &other) const
     {
         return CDataModelHandle::operator==(other);
     }
 };
 
-typedef std::vector<CUICDMInstanceHandle> TInstanceHandleList;
+typedef std::vector<Qt3DSDMInstanceHandle> TInstanceHandleList;
 
-class CUICDMPropertyHandle : public CDataModelHandle
+class Qt3DSDMPropertyHandle : public CDataModelHandle
 {
 public:
-    CUICDMPropertyHandle(int inHandle = 0)
+    Qt3DSDMPropertyHandle(int inHandle = 0)
         : CDataModelHandle(inHandle)
     {
     }
 
-    CUICDMPropertyHandle(const CDataModelHandle &inOther)
+    Qt3DSDMPropertyHandle(const CDataModelHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMPropertyHandle(const CUICDMInstanceHandle &inOther)
+    Qt3DSDMPropertyHandle(const Qt3DSDMInstanceHandle &inOther)
         : CDataModelHandle(inOther)
     {
     }
 
-    CUICDMPropertyHandle &operator=(const CUICDMPropertyHandle &inOther)
+    Qt3DSDMPropertyHandle &operator=(const Qt3DSDMPropertyHandle &inOther)
     {
-        return static_cast<CUICDMPropertyHandle &>(CDataModelHandle::operator=(inOther));
+        return static_cast<Qt3DSDMPropertyHandle &>(CDataModelHandle::operator=(inOther));
     }
 };
 
-typedef std::vector<CUICDMPropertyHandle> TPropertyHandleList;
+typedef std::vector<Qt3DSDMPropertyHandle> TPropertyHandleList;
 
 class CUICDMSlideHandle : public CDataModelHandle
 {
diff --git a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
index e11b0511..495a13a3 100644
--- a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
+++ b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
@@ -69,8 +69,8 @@ using std::ref;
 using std::get;
 using qt3ds::foundation::Empty;
 
-typedef CUICDMInstanceHandle TInstanceHandle;
-typedef CUICDMPropertyHandle TPropertyHandle;
+typedef Qt3DSDMInstanceHandle TInstanceHandle;
+typedef Qt3DSDMPropertyHandle TPropertyHandle;
 typedef CUICDMEventHandle TEventHandle;
 typedef CUICDMHandlerHandle THandlerHandle;
 typedef CUICDMHandlerArgHandle THandlerArgHandle;
@@ -370,13 +370,13 @@ struct InstanceHandleVecHash
 
 struct SEventAndHandlerBase
 {
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     TStrType m_Name;
     TStrType m_FormalName;
     TStrType m_Category;
     TStrType m_Description;
     SEventAndHandlerBase() {}
-    SEventAndHandlerBase(CUICDMInstanceHandle hdl)
+    SEventAndHandlerBase(Qt3DSDMInstanceHandle hdl)
         : m_Instance(hdl)
     {
     }
@@ -385,7 +385,7 @@ struct SEventAndHandlerBase
 struct SEvent : public SEventAndHandlerBase
 {
     SEvent() {}
-    SEvent(CUICDMInstanceHandle hdl)
+    SEvent(Qt3DSDMInstanceHandle hdl)
         : SEventAndHandlerBase(hdl)
     {
     }
@@ -394,7 +394,7 @@ struct SEvent : public SEventAndHandlerBase
 struct SHandler : public SEventAndHandlerBase
 {
     SHandler() {}
-    SHandler(CUICDMInstanceHandle hdl)
+    SHandler(Qt3DSDMInstanceHandle hdl)
         : SEventAndHandlerBase(hdl)
     {
     }
@@ -738,7 +738,7 @@ struct SNewMetaDataImpl : public IMetaData
 
     template <typename THandleType, typename TValueType, typename TMapType,
               typename TInstanceListMapType>
-    THandleType CreateItem(const char *inFile, int inLine, CUICDMInstanceHandle inInstance,
+    THandleType CreateItem(const char *inFile, int inLine, Qt3DSDMInstanceHandle inInstance,
                            TMapType &inMap, TInstanceListMapType &inInstanceListMap)
     {
         int retval = GetNextId();
@@ -916,7 +916,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     template <typename TListMapType, typename TSizeTOpType, typename TVectorType>
-    void DoGetHandleList(CUICDMInstanceHandle inInstance, TListMapType &inMap,
+    void DoGetHandleList(Qt3DSDMInstanceHandle inInstance, TListMapType &inMap,
                          TVectorType &outHandles, TSizeTOpType inOperator)
     {
         typename TListMapType::iterator find;
@@ -966,7 +966,7 @@ struct SNewMetaDataImpl : public IMetaData
 
     // Ensure we don't return two items of the same name.
     template <typename THandleType, typename TListMapType, typename TMapType>
-    void GetHandleList(CUICDMInstanceHandle inInstance, TListMapType &inMap, TMapType &inTypeName,
+    void GetHandleList(Qt3DSDMInstanceHandle inInstance, TListMapType &inMap, TMapType &inTypeName,
                        vector<THandleType> &outHandles)
     {
         DoGetHandleList(inInstance, inMap, outHandles,
@@ -993,7 +993,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     template <typename THandleType, typename TListMapType>
-    void ForEachItem(CUICDMInstanceHandle inInstance, TListMapType &ioMap,
+    void ForEachItem(Qt3DSDMInstanceHandle inInstance, TListMapType &ioMap,
                      function<void(THandleType)> inOperation)
     {
         typename TListMapType::iterator find = ioMap.find(inInstance);
@@ -1032,7 +1032,7 @@ struct SNewMetaDataImpl : public IMetaData
         return NULL;
     }
 
-    void OnPropertyRemoved(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty)
+    void OnPropertyRemoved(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty)
     {
         if (m_IgnorePropertyDeleted)
             return;
@@ -1048,7 +1048,7 @@ struct SNewMetaDataImpl : public IMetaData
             DestroyMetaDataProperty(propertiesToDestroy[idx]);
     }
 
-    void OnInstanceRemoved(CUICDMInstanceHandle inInstance) { DestroyMetaData(inInstance); }
+    void OnInstanceRemoved(Qt3DSDMInstanceHandle inInstance) { DestroyMetaData(inInstance); }
     template <typename TEntryType, typename TMapType>
     void InsertWithTransaction(const char *inFile, int inLine, const TEntryType &inEntry,
                                TMapType &inMap)
@@ -1093,7 +1093,7 @@ struct SNewMetaDataImpl : public IMetaData
 
     ////////////////////////////////////////////////////////////////////////////////////
     // Canonical Instances
-    void SetInstanceAsCanonical(CUICDMInstanceHandle inInstance, TStrType inTypename) override
+    void SetInstanceAsCanonical(Qt3DSDMInstanceHandle inInstance, TStrType inTypename) override
     {
         const wchar_t *theTypename(Intern(inTypename));
         if (g_UICDMDebugLogger)
@@ -1112,7 +1112,7 @@ struct SNewMetaDataImpl : public IMetaData
             g_UICDMDebugLogger("IMetaData::SetInstanceAsCanonical Leave");
     }
 
-    CUICDMInstanceHandle GetCanonicalInstanceForType(TStrType inTypename) override
+    Qt3DSDMInstanceHandle GetCanonicalInstanceForType(TStrType inTypename) override
     {
         TStrInstanceMap::iterator find = m_CanonicalTypeToInstances.find(Intern(inTypename));
         if (find != m_CanonicalTypeToInstances.end())
@@ -1120,7 +1120,7 @@ struct SNewMetaDataImpl : public IMetaData
         return 0;
     }
 
-    Option<TCharStr> GetTypeForCanonicalInstance(CUICDMInstanceHandle inInstance) override
+    Option<TCharStr> GetTypeForCanonicalInstance(Qt3DSDMInstanceHandle inInstance) override
     {
         TInstanceStrMap::iterator find = m_InstancesToCanonicalType.find(inInstance);
         if (find != m_InstancesToCanonicalType.end())
@@ -1128,7 +1128,7 @@ struct SNewMetaDataImpl : public IMetaData
         return Empty();
     }
 
-    Option<TCharStr> GetTypeForInstance(CUICDMInstanceHandle inInstance) override
+    Option<TCharStr> GetTypeForInstance(Qt3DSDMInstanceHandle inInstance) override
     {
         Option<TCharStr> theType = GetTypeForCanonicalInstance(inInstance);
         if (theType.hasValue())
@@ -1142,14 +1142,14 @@ struct SNewMetaDataImpl : public IMetaData
         return Empty();
     }
 
-    QT3DSU32 GetGroupCountForInstance(CUICDMInstanceHandle inInstance) override
+    QT3DSU32 GetGroupCountForInstance(Qt3DSDMInstanceHandle inInstance) override
     {
         std::vector<TCharStr> outNames;
         QT3DSU32 count = GetGroupNamesForInstance(inInstance, outNames);
         return (count == 0) ? 1 : count;
     }
 
-    QT3DSU32 GetGroupNamesForInstance(CUICDMInstanceHandle inInstance,
+    QT3DSU32 GetGroupNamesForInstance(Qt3DSDMInstanceHandle inInstance,
                                               std::vector<TCharStr> &outNames) override
     {
         TInstanceStrMap::iterator canonicalFind = m_InstancesToCanonicalType.find(inInstance);
@@ -1204,7 +1204,7 @@ struct SNewMetaDataImpl : public IMetaData
         return (QT3DSU32)outNames.size();
     }
 
-    Option<TCharStr> GetGroupFilterNameForInstance(CUICDMInstanceHandle inInstance,
+    Option<TCharStr> GetGroupFilterNameForInstance(Qt3DSDMInstanceHandle inInstance,
                                                            long inIndex) override
     {
         std::vector<TCharStr> outNames;
@@ -1296,7 +1296,7 @@ struct SNewMetaDataImpl : public IMetaData
     ////////////////////////////////////////////////////////////////////////////////////
     // Properties
 
-    CUICDMMetaDataPropertyHandle CreateMetaDataProperty(CUICDMInstanceHandle inInstance) override
+    CUICDMMetaDataPropertyHandle CreateMetaDataProperty(Qt3DSDMInstanceHandle inInstance) override
     {
         return CreateItem<CUICDMMetaDataPropertyHandle, SMetaDataPropertyInfo>(
                     __FILE__, __LINE__, inInstance, m_Properties, m_InstanceToProperties);
@@ -1307,7 +1307,7 @@ struct SNewMetaDataImpl : public IMetaData
         m_IgnorePropertyDeleted = true;
         // If the existing property under the new name doesn't match
         // the new info, then we also have to delete the property
-        CUICDMPropertyHandle theExistingProperty =
+        Qt3DSDMPropertyHandle theExistingProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(newInfo.m_Instance, newInfo.m_Name);
         // Ensure the types match.
         if (theExistingProperty.Valid()) {
@@ -1424,14 +1424,14 @@ struct SNewMetaDataImpl : public IMetaData
         RemoveMetaDataPropertyFilters(inProperty);
     }
 
-    CUICDMMetaDataPropertyHandle GetMetaDataProperty(CUICDMInstanceHandle inInstance,
+    CUICDMMetaDataPropertyHandle GetMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
                                                              TStrType inPropertyName) override
     {
         return FindItemByName<CUICDMMetaDataPropertyHandle>(inInstance, Intern(inPropertyName),
                                                             m_InstanceNameToProperties);
     }
-    CUICDMMetaDataPropertyHandle GetMetaDataProperty(CUICDMInstanceHandle inInstance,
-                                                             CUICDMPropertyHandle inProperty) override
+    CUICDMMetaDataPropertyHandle GetMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
+                                                             Qt3DSDMPropertyHandle inProperty) override
     {
         SUICDMPropertyDefinition propDef(m_DataCore->GetProperty(inProperty));
         return GetMetaDataProperty(inInstance, propDef.m_Name);
@@ -1447,14 +1447,14 @@ struct SNewMetaDataImpl : public IMetaData
         return *infoPtr;
     }
 
-    void GetMetaDataProperties(CUICDMInstanceHandle inInstance,
+    void GetMetaDataProperties(Qt3DSDMInstanceHandle inInstance,
                                        vector<CUICDMMetaDataPropertyHandle> &outProperties) override
     {
         return GetHandleList<CUICDMMetaDataPropertyHandle>(inInstance, m_InstanceToProperties,
                                                            m_Properties, outProperties);
     }
     virtual CUICDMMetaDataPropertyHandle
-    GetSpecificMetaDataProperty(CUICDMInstanceHandle inInstance, TStrType inPropertyName)
+    GetSpecificMetaDataProperty(Qt3DSDMInstanceHandle inInstance, TStrType inPropertyName)
     {
         TInstancePropertyNamePropertyMap::iterator theFind = m_InstanceNameToProperties.find(
                     make_pair(inInstance, m_StringTable.RegisterStr(inPropertyName.wide_str())));
@@ -1463,7 +1463,7 @@ struct SNewMetaDataImpl : public IMetaData
         return 0;
     }
     virtual CUICDMMetaDataPropertyHandle
-    GetOrCreateSpecificMetaDataProperty(CUICDMInstanceHandle inInstance, TStrType inPropertyName) override
+    GetOrCreateSpecificMetaDataProperty(Qt3DSDMInstanceHandle inInstance, TStrType inPropertyName) override
     {
         CUICDMMetaDataPropertyHandle theProp(
                     GetSpecificMetaDataProperty(inInstance, inPropertyName));
@@ -1472,7 +1472,7 @@ struct SNewMetaDataImpl : public IMetaData
         return CreateMetaDataProperty(inInstance);
     }
 
-    void GetSpecificMetaDataProperties(CUICDMInstanceHandle inInstance,
+    void GetSpecificMetaDataProperties(Qt3DSDMInstanceHandle inInstance,
                                                vector<CUICDMMetaDataPropertyHandle> &outProperties) override
     {
         TInstancePropertyMap::iterator find = m_InstanceToProperties.find(inInstance);
@@ -1480,7 +1480,7 @@ struct SNewMetaDataImpl : public IMetaData
             outProperties.insert(outProperties.end(), find->second.begin(), find->second.end());
     }
 
-    TCharStr GetFormalName(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override
+    TCharStr GetFormalName(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override
     {
         CUICDMMetaDataPropertyHandle propHandle(GetMetaDataProperty(inInstance, inProperty));
         SMetaDataPropertyInfo *infoPtr = FindProperty(propHandle);
@@ -1488,8 +1488,8 @@ struct SNewMetaDataImpl : public IMetaData
             return infoPtr->m_FormalName;
         return TCharStr();
     }
-    AdditionalMetaDataType::Value GetAdditionalMetaDataType(CUICDMInstanceHandle inInstance,
-                                                              CUICDMPropertyHandle inProperty) override
+    AdditionalMetaDataType::Value GetAdditionalMetaDataType(Qt3DSDMInstanceHandle inInstance,
+                                                              Qt3DSDMPropertyHandle inProperty) override
     {
         CUICDMMetaDataPropertyHandle propHandle(GetMetaDataProperty(inInstance, inProperty));
         SMetaDataPropertyInfo *infoPtr = FindProperty(propHandle);
@@ -1497,8 +1497,8 @@ struct SNewMetaDataImpl : public IMetaData
             return infoPtr->GetAdditionalType();
         return AdditionalMetaDataType::None;
     }
-    TMetaDataData GetAdditionalMetaDataData(CUICDMInstanceHandle inInstance,
-                                                    CUICDMPropertyHandle inProperty) override
+    TMetaDataData GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMPropertyHandle inProperty) override
     {
         CUICDMMetaDataPropertyHandle propHandle(GetMetaDataProperty(inInstance, inProperty));
         SMetaDataPropertyInfo *infoPtr = FindProperty(propHandle);
@@ -1507,12 +1507,12 @@ struct SNewMetaDataImpl : public IMetaData
         return TMetaDataData();
     }
 
-    bool IsCustomInstance(CUICDMInstanceHandle inInstance)
+    bool IsCustomInstance(Qt3DSDMInstanceHandle inInstance)
     {
         return m_InstancesToCanonicalType.find(inInstance) == m_InstancesToCanonicalType.end();
     }
 
-    SValue GetDefaultValue(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override
+    SValue GetDefaultValue(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override
     {
         CUICDMMetaDataPropertyHandle theProperty(GetMetaDataProperty(inInstance, inProperty));
         if (theProperty.Valid() == false) {
@@ -1522,7 +1522,7 @@ struct SNewMetaDataImpl : public IMetaData
         return FindProperty(theProperty)->m_DefaultValue;
     }
 
-    bool IsCustomProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) override
+    bool IsCustomProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) override
     {
         CUICDMMetaDataPropertyHandle propHandle(GetMetaDataProperty(inInstance, inProperty));
         SMetaDataPropertyInfo *infoPtr = FindProperty(propHandle);
@@ -1541,7 +1541,7 @@ struct SNewMetaDataImpl : public IMetaData
         }
 
         SUICDMPropertyDefinition theProp(m_DataCore->GetProperty(inFilter.m_FilterProperty));
-        CUICDMPropertyHandle propCheck =
+        Qt3DSDMPropertyHandle propCheck =
                 m_DataCore->GetAggregateInstancePropertyByName(infoPtr->m_Instance, theProp.m_Name);
         if (propCheck != inFilter.m_FilterProperty) {
             QT3DS_ASSERT(false);
@@ -1624,13 +1624,13 @@ struct SNewMetaDataImpl : public IMetaData
                     m_InstanceNameToEvents, m_InstanceToEvents);
     }
 
-    void GetEvents(CUICDMInstanceHandle inInstance, TEventHandleList &outEvents) override
+    void GetEvents(Qt3DSDMInstanceHandle inInstance, TEventHandleList &outEvents) override
     {
         return GetHandleList<CUICDMEventHandle>(inInstance, m_InstanceToEvents, m_Events,
                                                 outEvents);
     }
 
-    CUICDMEventHandle FindEvent(CUICDMInstanceHandle inInstance, TStrType inName) override
+    CUICDMEventHandle FindEvent(Qt3DSDMInstanceHandle inInstance, TStrType inName) override
     {
         return FindItemByName<CUICDMEventHandle>(inInstance, Intern(inName),
                                                  m_InstanceNameToEvents);
@@ -1658,14 +1658,14 @@ struct SNewMetaDataImpl : public IMetaData
         return false;
     }
 
-    void GetSpecificEvents(CUICDMInstanceHandle inInstance, TEventHandleList &outEvents) override
+    void GetSpecificEvents(Qt3DSDMInstanceHandle inInstance, TEventHandleList &outEvents) override
     {
         TInstanceEventMap::iterator theFind(m_InstanceToEvents.find(inInstance));
         if (theFind != m_InstanceToEvents.end())
             outEvents.insert(outEvents.end(), theFind->second.begin(), theFind->second.end());
     }
 
-    CUICDMEventHandle GetOrCreateSpecificEvent(CUICDMInstanceHandle inInstance,
+    CUICDMEventHandle GetOrCreateSpecificEvent(Qt3DSDMInstanceHandle inInstance,
                                                        TStrType inName) override
     {
         TInstanceEventNameEventMap::iterator theFind(
@@ -1678,7 +1678,7 @@ struct SNewMetaDataImpl : public IMetaData
     ////////////////////////////////////////////////////////////////////////////////////
     // Handlers
 
-    CUICDMHandlerHandle CreateHandler(CUICDMInstanceHandle inInstance) override
+    CUICDMHandlerHandle CreateHandler(Qt3DSDMInstanceHandle inInstance) override
     {
         return CreateItem<CUICDMHandlerHandle, SHandler>(__FILE__, __LINE__, inInstance, m_Handlers,
                                                          m_InstanceToHandlers);
@@ -1716,7 +1716,7 @@ struct SNewMetaDataImpl : public IMetaData
                     m_InstanceNameToHandlers, m_InstanceToHandlers);
     }
 
-    CUICDMHandlerHandle FindHandlerByName(CUICDMInstanceHandle inInstance, TStrType inName) override
+    CUICDMHandlerHandle FindHandlerByName(Qt3DSDMInstanceHandle inInstance, TStrType inName) override
     {
         return FindItemByName<CUICDMHandlerHandle>(inInstance, Intern(inName),
                                                    m_InstanceNameToHandlers);
@@ -1737,7 +1737,7 @@ struct SNewMetaDataImpl : public IMetaData
         return retval;
     }
 
-    void GetHandlers(CUICDMInstanceHandle inInstance, THandlerHandleList &outHandlers) override
+    void GetHandlers(Qt3DSDMInstanceHandle inInstance, THandlerHandleList &outHandlers) override
     {
         return GetHandleList<CUICDMHandlerHandle>(inInstance, m_InstanceToHandlers, m_Handlers,
                                                   outHandlers);
@@ -1751,7 +1751,7 @@ struct SNewMetaDataImpl : public IMetaData
         return false;
     }
 
-    void GetSpecificHandlers(CUICDMInstanceHandle inInstance,
+    void GetSpecificHandlers(Qt3DSDMInstanceHandle inInstance,
                                      THandlerHandleList &outHandlers) override
     {
         TInstanceHandlerMap::iterator theFind = m_InstanceToHandlers.find(inInstance);
@@ -1759,7 +1759,7 @@ struct SNewMetaDataImpl : public IMetaData
             outHandlers.insert(outHandlers.end(), theFind->second.begin(), theFind->second.end());
     }
 
-    CUICDMHandlerHandle GetOrCreateSpecificHandler(CUICDMInstanceHandle inInstance,
+    CUICDMHandlerHandle GetOrCreateSpecificHandler(Qt3DSDMInstanceHandle inInstance,
                                                            TStrType inName) override
     {
         TInstanceHandlerNameHandlerMap::iterator theFind =
@@ -1986,7 +1986,7 @@ struct SNewMetaDataImpl : public IMetaData
 
     ////////////////////////////////////////////////////////////////////////////////////
     // References
-    void AddReference(CUICDMInstanceHandle inInstance, TStrType inRefString) override
+    void AddReference(Qt3DSDMInstanceHandle inInstance, TStrType inRefString) override
     {
         // trim whitespace from the beginning and the end of the string
         TCharStr::size_type startPos = inRefString.find_first_not_of(L"\n\r\t ");
@@ -2008,7 +2008,7 @@ struct SNewMetaDataImpl : public IMetaData
         }
     }
 
-    void DestroyReferences(CUICDMInstanceHandle inInstance) override
+    void DestroyReferences(Qt3DSDMInstanceHandle inInstance) override
     {
         TInstanceStringListMap::iterator find = m_InstanceToReferences.find(inInstance);
 
@@ -2034,7 +2034,7 @@ struct SNewMetaDataImpl : public IMetaData
         }
     };
 
-    void GetReferences(CUICDMInstanceHandle inInstance, vector<TCharStr> &outReferences) override
+    void GetReferences(Qt3DSDMInstanceHandle inInstance, vector<TCharStr> &outReferences) override
     {
         DoGetHandleList(inInstance, m_InstanceToReferences, outReferences,
                         InternSizeTOpType(*this));
@@ -2046,7 +2046,7 @@ struct SNewMetaDataImpl : public IMetaData
     // Calling this on a derived instance does nothing, this only works if this specific
     // instance was mapped to a type.
     // This function must be completely undoable.
-    void DestroyMetaData(CUICDMInstanceHandle inInstance) override
+    void DestroyMetaData(Qt3DSDMInstanceHandle inInstance) override
     {
         ForEachItem<TMetaDataPropertyHandle>(
                     inInstance, m_InstanceToProperties,
@@ -2315,7 +2315,7 @@ struct SNewMetaDataImpl : public IMetaData
             if (AreEqual(inArchive.GetElementName(), L"ShowIfEqual")) {
                 TCharStr theName;
                 inArchive.Att(L"property", theName);
-                CUICDMPropertyHandle theProperty =
+                Qt3DSDMPropertyHandle theProperty =
                         m_DataCore->GetAggregateInstancePropertyByName(inItem.m_Instance, theName);
                 if (theProperty.Valid() == false) {
                     QT3DS_ASSERT(false);
@@ -2331,7 +2331,7 @@ struct SNewMetaDataImpl : public IMetaData
             } else if (AreEqual(inArchive.GetElementName(), L"HideIfEqual")) {
                 TCharStr theName;
                 inArchive.Att(L"property", theName);
-                CUICDMPropertyHandle theProperty =
+                Qt3DSDMPropertyHandle theProperty =
                         m_DataCore->GetAggregateInstancePropertyByName(inItem.m_Instance, theName);
                 if (theProperty.Valid() == false) {
                     QT3DS_ASSERT(false);
@@ -2666,8 +2666,8 @@ struct SNewMetaDataImpl : public IMetaData
 
     template <typename THandleType, typename TMapType>
     void RemoveOldItemsAndSetOrder(
-            CUICDMInstanceHandle inInstance, vector<THandleType> &inNewHandles,
-            void (SNewMetaDataImpl::*inGetSpecificFun)(CUICDMInstanceHandle, vector<THandleType> &),
+            Qt3DSDMInstanceHandle inInstance, vector<THandleType> &inNewHandles,
+            void (SNewMetaDataImpl::*inGetSpecificFun)(Qt3DSDMInstanceHandle, vector<THandleType> &),
             void (SNewMetaDataImpl::*inDestroyFun)(THandleType), TMapType &inListMap)
     {
         vector<THandleType> theHandles;
@@ -2683,7 +2683,7 @@ struct SNewMetaDataImpl : public IMetaData
     // Load meta data and apply it to just this instance
     // This needs to be undoable so we have to do this through a slightly different
     // system than we did before.
-    void LoadInstance(IDOMReader &inReader, CUICDMInstanceHandle inInstance,
+    void LoadInstance(IDOMReader &inReader, Qt3DSDMInstanceHandle inInstance,
                               const TCharStr &inObjectName,
                               std::vector<SMetaDataLoadWarning> &outWarnings) override
     {
@@ -2779,7 +2779,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     // Save just this instances meta data out to the writer
-    void SaveInstance(IDOMWriter &inWriter, CUICDMInstanceHandle inInstance) override
+    void SaveInstance(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance) override
     {
         SerializeInstance(inWriter, inInstance);
     }
@@ -2795,7 +2795,7 @@ struct SNewMetaDataImpl : public IMetaData
         return NULL;
     }
 
-    void LoadEffectInstance(const char *inShaderFile, CUICDMInstanceHandle inInstance,
+    void LoadEffectInstance(const char *inShaderFile, Qt3DSDMInstanceHandle inInstance,
                                     const TCharStr &inObjectName,
                                     std::vector<SMetaDataLoadWarning> &outWarnings,
                                     qt3ds::foundation::IInStream &inStream) override
@@ -3045,7 +3045,7 @@ struct SNewMetaDataImpl : public IMetaData
         qt3ds::foundation::ConvertUTF(inCode, 0, inConvertBuffer);
         ioStr.append(inConvertBuffer);
     }
-    void HideEffectProperty(CUICDMInstanceHandle inInstance, const char8_t *inParamName)
+    void HideEffectProperty(Qt3DSDMInstanceHandle inInstance, const char8_t *inParamName)
     {
         CUICDMMetaDataPropertyHandle theProp =
                 GetSpecificMetaDataProperty(inInstance, Intern(inParamName));
@@ -3068,7 +3068,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     void LoadDynamicObjectProperties(IDOMReader &inStream, SMetaDataDynamicObjectImpl &ioObject,
-                                     CUICDMInstanceHandle inInstance, const TCharStr &inObjectName,
+                                     Qt3DSDMInstanceHandle inInstance, const TCharStr &inObjectName,
                                      std::vector<SMetaDataLoadWarning> &outWarnings,
                                      eastl::string &shaderPrefix)
     {
@@ -3403,7 +3403,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     // Reloads an effect if one is already loaded so we can replace the existing effect definition
-    void LoadEffectXML(IDOMReader &inStream, CUICDMInstanceHandle inInstance,
+    void LoadEffectXML(IDOMReader &inStream, Qt3DSDMInstanceHandle inInstance,
                                const TCharStr &inObjectName,
                                std::vector<SMetaDataLoadWarning> &outWarnings,
                                const TCharStr &inSourcePath) override
@@ -3741,7 +3741,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     bool LoadEffectXMLFromSourcePath(const char *inSourcePath,
-                                             CUICDMInstanceHandle inInstance,
+                                             Qt3DSDMInstanceHandle inInstance,
                                              const TCharStr &inObjectName,
                                              std::vector<SMetaDataLoadWarning> &outWarnings,
                                              qt3ds::foundation::IInStream &inStream) override
@@ -3772,7 +3772,7 @@ struct SNewMetaDataImpl : public IMetaData
         return Empty();
     }
 
-    void LoadMaterialInstance(const char *inShaderFile, CUICDMInstanceHandle inInstance,
+    void LoadMaterialInstance(const char *inShaderFile, Qt3DSDMInstanceHandle inInstance,
                                       const TCharStr &inName,
                                       std::vector<SMetaDataLoadWarning> &outWarnings,
                                       qt3ds::foundation::IInStream &inStream) override
@@ -3791,7 +3791,7 @@ struct SNewMetaDataImpl : public IMetaData
         return m_CustomMaterials.find(Intern(inName)) != m_CustomMaterials.end();
     }
 
-    void LoadMaterialClassXML(IDOMReader &inStream, CUICDMInstanceHandle inInstance,
+    void LoadMaterialClassXML(IDOMReader &inStream, Qt3DSDMInstanceHandle inInstance,
                                       const TCharStr &inObjectName,
                                       std::vector<SMetaDataLoadWarning> &outWarnings,
                                       const TCharStr &inSourcePath) override
@@ -4024,7 +4024,7 @@ struct SNewMetaDataImpl : public IMetaData
     }
 
     bool LoadMaterialClassFromSourcePath(const char *inSourcePath,
-                                                 CUICDMInstanceHandle inInstance,
+                                                 Qt3DSDMInstanceHandle inInstance,
                                                  const TCharStr &inObjectName,
                                                  std::vector<SMetaDataLoadWarning> &outWarnings,
                                                  qt3ds::foundation::IInStream &inStream) override
diff --git a/src/Authoring/UICDM/Systems/UICDMMetaData.h b/src/Authoring/UICDM/Systems/UICDMMetaData.h
index 082ed04b..a31d4e43 100644
--- a/src/Authoring/UICDM/Systems/UICDMMetaData.h
+++ b/src/Authoring/UICDM/Systems/UICDMMetaData.h
@@ -138,20 +138,20 @@ public:
     // If this object is canonical, then we expect this mapping setup before loading the
     // canonical data, and we will use a type lookup instead of a direct handle lookup
     // when loading canonical information.
-    virtual void SetInstanceAsCanonical(CUICDMInstanceHandle inInstance, TStrType inTypename) = 0;
+    virtual void SetInstanceAsCanonical(Qt3DSDMInstanceHandle inInstance, TStrType inTypename) = 0;
 
-    virtual CUICDMInstanceHandle GetCanonicalInstanceForType(TStrType inTypename) = 0;
+    virtual Qt3DSDMInstanceHandle GetCanonicalInstanceForType(TStrType inTypename) = 0;
     // If this instance wasn't registered as canonical, then we return empty.
-    virtual Option<TCharStr> GetTypeForCanonicalInstance(CUICDMInstanceHandle inInstance) = 0;
+    virtual Option<TCharStr> GetTypeForCanonicalInstance(Qt3DSDMInstanceHandle inInstance) = 0;
     // Gets the type for this instance via derivation
-    virtual Option<TCharStr> GetTypeForInstance(CUICDMInstanceHandle inInstance) = 0;
+    virtual Option<TCharStr> GetTypeForInstance(Qt3DSDMInstanceHandle inInstance) = 0;
     // Get group count for instance
-    virtual QT3DSU32 GetGroupCountForInstance(CUICDMInstanceHandle inInstance) = 0;
+    virtual QT3DSU32 GetGroupCountForInstance(Qt3DSDMInstanceHandle inInstance) = 0;
     // Get all group names
-    virtual QT3DSU32 GetGroupNamesForInstance(CUICDMInstanceHandle inInstance,
+    virtual QT3DSU32 GetGroupNamesForInstance(Qt3DSDMInstanceHandle inInstance,
                                            std::vector<TCharStr> &outNames) = 0;
     // Get group count for instance
-    virtual Option<TCharStr> GetGroupFilterNameForInstance(CUICDMInstanceHandle inInstance,
+    virtual Option<TCharStr> GetGroupFilterNameForInstance(Qt3DSDMInstanceHandle inInstance,
                                                            long inIndex) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////
@@ -178,7 +178,7 @@ public:
     // the parent definition.  We currently use this to give different formal names and description
     // to the sourcepath property (for models it is mesh, for materials it is image).
     virtual CUICDMMetaDataPropertyHandle
-    CreateMetaDataProperty(CUICDMInstanceHandle inInstance) = 0;
+    CreateMetaDataProperty(Qt3DSDMInstanceHandle inInstance) = 0;
 
     // For properties, you set the default values separately
     // This may delete the underlying data model property rebuild it.
@@ -196,34 +196,34 @@ public:
     // this property.
     virtual void DestroyMetaDataProperty(CUICDMMetaDataPropertyHandle inProperty) = 0;
 
-    virtual CUICDMMetaDataPropertyHandle GetMetaDataProperty(CUICDMInstanceHandle inInstance,
+    virtual CUICDMMetaDataPropertyHandle GetMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
                                                              TStrType inPropertyName) = 0;
-    virtual CUICDMMetaDataPropertyHandle GetMetaDataProperty(CUICDMInstanceHandle inInstance,
-                                                             CUICDMPropertyHandle inProperty) = 0;
+    virtual CUICDMMetaDataPropertyHandle GetMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
+                                                             Qt3DSDMPropertyHandle inProperty) = 0;
     virtual Option<SMetaDataPropertyInfo>
     GetMetaDataPropertyInfo(CUICDMMetaDataPropertyHandle inProperty) = 0;
     // Get all of the meta data properties defined on this object or its derivation parents
-    virtual void GetMetaDataProperties(CUICDMInstanceHandle inInstance,
+    virtual void GetMetaDataProperties(Qt3DSDMInstanceHandle inInstance,
                                        vector<CUICDMMetaDataPropertyHandle> &outProperties) = 0;
 
     // Get the meta data properties defined on *only* this object, don't search parents
     virtual CUICDMMetaDataPropertyHandle
-    GetOrCreateSpecificMetaDataProperty(CUICDMInstanceHandle inInstance,
+    GetOrCreateSpecificMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
                                         TStrType inPropertyName) = 0;
     virtual void
-    GetSpecificMetaDataProperties(CUICDMInstanceHandle inInstance,
+    GetSpecificMetaDataProperties(Qt3DSDMInstanceHandle inInstance,
                                   vector<CUICDMMetaDataPropertyHandle> &outProperties) = 0;
 
-    virtual TCharStr GetFormalName(CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty) = 0;
-    virtual AdditionalMetaDataType::Value GetAdditionalMetaDataType(CUICDMInstanceHandle inInstance,
-                                                              CUICDMPropertyHandle inProperty) = 0;
-    virtual TMetaDataData GetAdditionalMetaDataData(CUICDMInstanceHandle inInstance,
-                                                    CUICDMPropertyHandle inProperty) = 0;
-    virtual bool IsCustomProperty(CUICDMInstanceHandle inInstance,
-                                  CUICDMPropertyHandle inProperty) = 0;
-    virtual SValue GetDefaultValue(CUICDMInstanceHandle inInstance,
-                                   CUICDMPropertyHandle inProperty) = 0;
+    virtual TCharStr GetFormalName(Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual AdditionalMetaDataType::Value GetAdditionalMetaDataType(Qt3DSDMInstanceHandle inInstance,
+                                                              Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual TMetaDataData GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstance,
+                                                    Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual bool IsCustomProperty(Qt3DSDMInstanceHandle inInstance,
+                                  Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual SValue GetDefaultValue(Qt3DSDMInstanceHandle inInstance,
+                                   Qt3DSDMPropertyHandle inProperty) = 0;
 
     virtual void
     SetMetaDataPropertyFilters(CUICDMMetaDataPropertyHandle inProperty,
@@ -236,41 +236,41 @@ public:
     // Events
     // CreateMetaDataEvent was original named CreateEvent but this collides with
     // the microsoft macro CreateEvent which expands to CreateEventA or CreateEventW
-    virtual CUICDMEventHandle CreateMetaDataEvent(CUICDMInstanceHandle inInstance) = 0;
+    virtual CUICDMEventHandle CreateMetaDataEvent(Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SetEventInfo(CUICDMEventHandle inEventHandle, TStrType inName,
                               TStrType inFormalName, TStrType inCategory,
                               TStrType inDescription) = 0;
 
     virtual void DestroyEvent(CUICDMEventHandle inEventHandle) = 0;
 
-    virtual void GetEvents(CUICDMInstanceHandle inInstance, TEventHandleList &outEvents) = 0;
-    virtual CUICDMEventHandle FindEvent(CUICDMInstanceHandle inInstance, TStrType inName) = 0;
+    virtual void GetEvents(Qt3DSDMInstanceHandle inInstance, TEventHandleList &outEvents) = 0;
+    virtual CUICDMEventHandle FindEvent(Qt3DSDMInstanceHandle inInstance, TStrType inName) = 0;
     virtual Option<SEventInfo> GetEventInfo(CUICDMEventHandle inEventHandle) = 0;
     virtual bool IsCustomEvent(CUICDMEventHandle inEventHandle) = 0;
 
     // Get/Find an event that occurs on just this instance, don't search parent instances
-    virtual void GetSpecificEvents(CUICDMInstanceHandle inInstance,
+    virtual void GetSpecificEvents(Qt3DSDMInstanceHandle inInstance,
                                    TEventHandleList &outEvents) = 0;
-    virtual CUICDMEventHandle GetOrCreateSpecificEvent(CUICDMInstanceHandle inInstance,
+    virtual CUICDMEventHandle GetOrCreateSpecificEvent(Qt3DSDMInstanceHandle inInstance,
                                                        TStrType inName) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////
     // Handlers
-    virtual CUICDMHandlerHandle CreateHandler(CUICDMInstanceHandle inInstance) = 0;
+    virtual CUICDMHandlerHandle CreateHandler(Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SetHandlerInfo(CUICDMHandlerHandle inHandle, TStrType inName,
                                 TStrType inFormalName, TStrType inCategory,
                                 TStrType inDescription) = 0;
     virtual void DestroyHandler(CUICDMHandlerHandle inHandlerHandle) = 0;
 
-    virtual CUICDMHandlerHandle FindHandlerByName(CUICDMInstanceHandle inInstance,
+    virtual CUICDMHandlerHandle FindHandlerByName(Qt3DSDMInstanceHandle inInstance,
                                                   TStrType inName) = 0;
     virtual Option<SHandlerInfo> GetHandlerInfo(CUICDMHandlerHandle inHandlerHandle) = 0;
-    virtual void GetHandlers(CUICDMInstanceHandle inInstance, THandlerHandleList &outHandlers) = 0;
+    virtual void GetHandlers(Qt3DSDMInstanceHandle inInstance, THandlerHandleList &outHandlers) = 0;
     virtual bool IsCustomHandler(CUICDMHandlerHandle inEventHandle) = 0;
 
-    virtual void GetSpecificHandlers(CUICDMInstanceHandle inInstance,
+    virtual void GetSpecificHandlers(Qt3DSDMInstanceHandle inInstance,
                                      THandlerHandleList &outHandlers) = 0;
-    virtual CUICDMHandlerHandle GetOrCreateSpecificHandler(CUICDMInstanceHandle inInstance,
+    virtual CUICDMHandlerHandle GetOrCreateSpecificHandler(Qt3DSDMInstanceHandle inInstance,
                                                            TStrType inName) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////
@@ -295,12 +295,12 @@ public:
     ////////////////////////////////////////////////////////////////////////////////////
     // References
     // Duplicate references are removed from this instance
-    virtual void AddReference(CUICDMInstanceHandle inInstance, TStrType inRefString) = 0;
-    virtual void DestroyReferences(CUICDMInstanceHandle inInstance) = 0;
+    virtual void AddReference(Qt3DSDMInstanceHandle inInstance, TStrType inRefString) = 0;
+    virtual void DestroyReferences(Qt3DSDMInstanceHandle inInstance) = 0;
 
     // Does the recursive gather from all the parents.  Duplicate references are removed from the
     // final list.
-    virtual void GetReferences(CUICDMInstanceHandle inInstance,
+    virtual void GetReferences(Qt3DSDMInstanceHandle inInstance,
                                std::vector<TCharStr> &outReferences) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ public:
     // Destroy all meta data that relates to this instance.
     // Calling this on a derived instance does nothing, this only works if this specific
     // instance was mapped directly to meta data.
-    virtual void DestroyMetaData(CUICDMInstanceHandle inInstance) = 0;
+    virtual void DestroyMetaData(Qt3DSDMInstanceHandle inInstance) = 0;
 
     ////////////////////////////////////////////////////////////////////////////////////
     // Serialization
@@ -325,43 +325,43 @@ public:
     virtual void Load(IDOMReader &ioStream) = 0;
 
     // Load meta data and apply it to just this instance
-    virtual void LoadInstance(IDOMReader &inReader, CUICDMInstanceHandle inInstance,
+    virtual void LoadInstance(IDOMReader &inReader, Qt3DSDMInstanceHandle inInstance,
                               const TCharStr &inName,
                               std::vector<SMetaDataLoadWarning> &outWarnings) = 0;
 
     // Save just this instances meta data out to the writer
-    virtual void SaveInstance(IDOMWriter &inWriter, CUICDMInstanceHandle inInstance) = 0;
+    virtual void SaveInstance(IDOMWriter &inWriter, Qt3DSDMInstanceHandle inInstance) = 0;
 
     // Load effect meta data from file and apply it to just this instance
-    virtual void LoadEffectInstance(const char *inShaderFile, CUICDMInstanceHandle inInstance,
+    virtual void LoadEffectInstance(const char *inShaderFile, Qt3DSDMInstanceHandle inInstance,
                                     const TCharStr &inName,
                                     std::vector<SMetaDataLoadWarning> &outWarnings,
                                     qt3ds::foundation::IInStream &inStream) = 0;
 
     virtual bool IsEffectInstanceRegistered(const char *inName) = 0;
-    virtual void LoadEffectXML(IDOMReader &inStream, CUICDMInstanceHandle inInstance,
+    virtual void LoadEffectXML(IDOMReader &inStream, Qt3DSDMInstanceHandle inInstance,
                                const TCharStr &inObjectName,
                                std::vector<SMetaDataLoadWarning> &outWarnings,
                                const TCharStr &inSourcePath) = 0;
     virtual bool LoadEffectXMLFromSourcePath(const char *inSourcePath,
-                                             CUICDMInstanceHandle inInstance,
+                                             Qt3DSDMInstanceHandle inInstance,
                                              const TCharStr &inObjectName,
                                              std::vector<SMetaDataLoadWarning> &outWarnings,
                                              qt3ds::foundation::IInStream &inStream) = 0;
     virtual Option<SMetaDataEffect> GetEffectBySourcePath(const char *inName) = 0;
 
     virtual void LoadMaterialInstance(const char *inShaderFile,
-                                      CUICDMInstanceHandle inInstance,
+                                      Qt3DSDMInstanceHandle inInstance,
                                       const TCharStr &inName,
                                       std::vector<SMetaDataLoadWarning> &outWarnings,
                                       qt3ds::foundation::IInStream &inStream) = 0;
     virtual bool IsMaterialClassRegistered(const char *inName) = 0;
-    virtual void LoadMaterialClassXML(IDOMReader &inStream, CUICDMInstanceHandle inInstance,
+    virtual void LoadMaterialClassXML(IDOMReader &inStream, Qt3DSDMInstanceHandle inInstance,
                                       const TCharStr &inObjectName,
                                       std::vector<SMetaDataLoadWarning> &outWarnings,
                                       const TCharStr &inSourcePath) = 0;
     virtual bool LoadMaterialClassFromSourcePath(const char *inSourcePath,
-                                                 CUICDMInstanceHandle inInstance,
+                                                 Qt3DSDMInstanceHandle inInstance,
                                                  const TCharStr &inObjectName,
                                                  std::vector<SMetaDataLoadWarning> &outWarnings,
                                                  qt3ds::foundation::IInStream &inStream) = 0;
diff --git a/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h b/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h
index ddda36c4..1632c3bf 100644
--- a/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h
+++ b/src/Authoring/UICDM/Systems/UICDMMetaDataTypes.h
@@ -151,13 +151,13 @@ struct SMetaPropertyBase
 
 struct SMetaDataPropertyInfo : SMetaPropertyBase
 {
-    CUICDMInstanceHandle m_Instance;
-    CUICDMPropertyHandle m_Property;
+    Qt3DSDMInstanceHandle m_Instance;
+    Qt3DSDMPropertyHandle m_Property;
     bool m_IsHidden; // Is this property visible in the UI
     bool m_Animatable; // Is this property visible in the UI
     TCharStr m_GroupName; // Name of the group this property belongs to or "default"
 
-    SMetaDataPropertyInfo(CUICDMInstanceHandle inInstance)
+    SMetaDataPropertyInfo(Qt3DSDMInstanceHandle inInstance)
         : m_Instance(inInstance)
     {
         init();
@@ -249,13 +249,13 @@ struct PropertyFilterTypes
 struct SPropertyFilterInfo
 {
     PropertyFilterTypes::Enum m_FilterType;
-    CUICDMPropertyHandle m_FilterProperty;
+    Qt3DSDMPropertyHandle m_FilterProperty;
     SValue m_Value;
     SPropertyFilterInfo()
         : m_FilterType(PropertyFilterTypes::Unknown)
     {
     }
-    SPropertyFilterInfo(PropertyFilterTypes::Enum inFilterType, CUICDMPropertyHandle inProp,
+    SPropertyFilterInfo(PropertyFilterTypes::Enum inFilterType, Qt3DSDMPropertyHandle inProp,
                         const SValue &inValue)
         : m_FilterType(inFilterType)
         , m_FilterProperty(inProp)
diff --git a/src/Authoring/UICDM/Systems/UICDMPropertyDefinition.h b/src/Authoring/UICDM/Systems/UICDMPropertyDefinition.h
index 33e5c738..a0b0ad9f 100644
--- a/src/Authoring/UICDM/Systems/UICDMPropertyDefinition.h
+++ b/src/Authoring/UICDM/Systems/UICDMPropertyDefinition.h
@@ -37,14 +37,14 @@ namespace qt3dsdm {
 struct SUICDMPropertyDefinition
 {
     TCharStr m_Name;
-    CUICDMInstanceHandle m_Instance;
+    Qt3DSDMInstanceHandle m_Instance;
     DataModelDataType::Value m_Type;
 
     SUICDMPropertyDefinition()
         : m_Type(DataModelDataType::None)
     {
     }
-    SUICDMPropertyDefinition(CUICDMInstanceHandle inInstanceHandle, TCharPtr inName,
+    SUICDMPropertyDefinition(Qt3DSDMInstanceHandle inInstanceHandle, TCharPtr inName,
                              DataModelDataType::Value inType)
         : m_Name(inName)
         , m_Instance(inInstanceHandle)
diff --git a/src/Authoring/UICDM/Systems/UICDMSignals.h b/src/Authoring/UICDM/Systems/UICDMSignals.h
index 4a65a2f6..080103bd 100644
--- a/src/Authoring/UICDM/Systems/UICDMSignals.h
+++ b/src/Authoring/UICDM/Systems/UICDMSignals.h
@@ -66,15 +66,15 @@ class IInstancePropertyCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectInstancePropertyValue(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, const SValue &)>
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, const SValue &)>
             &inCallback) = 0;
 };
 
 class IInstancePropertyCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SignalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                             CUICDMPropertyHandle inProperty,
+    virtual void SignalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                             Qt3DSDMPropertyHandle inProperty,
                                              const SValue &inValue) = 0;
 };
 
@@ -82,38 +82,38 @@ class IDataCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr
-    ConnectInstanceCreated(const std::function<void(CUICDMInstanceHandle)> &inCallback) = 0;
+    ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectBeforeInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) = 0;
+    ConnectBeforeInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) = 0;
+    ConnectInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceDerived(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceParentRemoved(
-        const std::function<void(CUICDMInstanceHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectPropertyAdded(const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle,
+    ConnectPropertyAdded(const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                                     TCharPtr, DataModelDataType::Value)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyRemoved(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle, TCharPtr,
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, TCharPtr,
                                    DataModelDataType::Value)> &inCallback) = 0;
 };
 
 class IDataCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SignalInstanceCreated(CUICDMInstanceHandle inInstance) = 0;
-    virtual void SignalBeforeInstanceDeleted(CUICDMInstanceHandle inInstance) = 0;
-    virtual void SignalInstanceDeleted(CUICDMInstanceHandle inInstance) = 0;
-    virtual void SignalInstanceDerived(CUICDMInstanceHandle inInstance,
-                                       CUICDMInstanceHandle inParent) = 0;
-    virtual void SignalInstanceParentRemoved(CUICDMInstanceHandle inInstance,
-                                             CUICDMInstanceHandle inParent) = 0;
-    virtual void SignalPropertyAdded(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty, TCharPtr inName,
+    virtual void SignalInstanceCreated(Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual void SignalBeforeInstanceDeleted(Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual void SignalInstanceDeleted(Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual void SignalInstanceDerived(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMInstanceHandle inParent) = 0;
+    virtual void SignalInstanceParentRemoved(Qt3DSDMInstanceHandle inInstance,
+                                             Qt3DSDMInstanceHandle inParent) = 0;
+    virtual void SignalPropertyAdded(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty, TCharPtr inName,
                                      DataModelDataType::Value inDataType) = 0;
-    virtual void SignalPropertyRemoved(CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, TCharPtr inName,
+    virtual void SignalPropertyRemoved(Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty, TCharPtr inName,
                                        DataModelDataType::Value inDataType) = 0;
 };
 
@@ -129,10 +129,10 @@ public:
     virtual TSignalConnectionPtr ConnectSlideDerived(
         const std::function<void(CUICDMSlideHandle, CUICDMSlideHandle, int)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstancePropertyValueSet(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstancePropertyValueRemoved(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle,
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle,
                                    const SValue &)> &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectSlideTimeChanged(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
@@ -146,12 +146,12 @@ public:
     virtual void SendSlideDeleted(CUICDMSlideHandle inSlide) = 0;
     virtual void SendSlideDerived(CUICDMSlideHandle inSlide, CUICDMSlideHandle inParent,
                                   int inIndex) = 0;
-    virtual void SendPropertyValueSet(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inParent, const SValue &inValue) = 0;
+    virtual void SendPropertyValueSet(CUICDMSlideHandle 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,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inParent, const SValue &inValue) = 0;
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inParent, const SValue &inValue) = 0;
     virtual void SendSlideTimeChanged(CUICDMSlideHandle inSlide) = 0;
 };
 
@@ -163,10 +163,10 @@ public:
     virtual TSignalConnectionPtr ConnectGraphDeleted(
         const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectGraphActiveSlide(
         const std::function<void(CUICDMSlideGraphHandle, CUICDMSlideHandle)> &inCallback) = 0;
@@ -178,9 +178,9 @@ public:
     virtual void SendGraphCreated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) = 0;
     virtual void SendGraphDeleted(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide) = 0;
     virtual void SendInstanceAssociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
-                                        CUICDMInstanceHandle inInstance) = 0;
+                                        Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SendInstanceDissociated(CUICDMSlideGraphHandle inGraph, CUICDMSlideHandle inSlide,
-                                         CUICDMInstanceHandle inInstance) = 0;
+                                         Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SendGraphActiveSlide(CUICDMSlideGraphHandle inGraph,
                                       CUICDMSlideHandle inSlide) = 0;
 };
@@ -189,13 +189,13 @@ class IAnimationCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectAnimationCreated(
-        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) = 0;
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, 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, CUICDMInstanceHandle,
-                                   CUICDMPropertyHandle, size_t, EAnimationType)> &inCallback) = 0;
+        const std::function<void(CUICDMAnimationHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle,
+                                   Qt3DSDMPropertyHandle, size_t, EAnimationType)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectKeyframeInserted(
         const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle, const TKeyframe &)>
             &inCallback) = 0;
@@ -216,13 +216,13 @@ class IAnimationCoreSignalSender : public ISignalItem
 {
 public:
     virtual void SendAnimationCreated(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, size_t inIndex,
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) = 0;
     virtual void SendBeforeAnimationDeleted(CUICDMAnimationHandle inAnimation) = 0;
     virtual void SendAnimationDeleted(CUICDMAnimationHandle inAnimation, CUICDMSlideHandle inSlide,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty, size_t inIndex,
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty, size_t inIndex,
                                       EAnimationType inAnimationType) = 0;
     virtual void SendKeyframeInserted(CUICDMAnimationHandle inAnimation,
                                       CUICDMKeyframeHandle inKeyframe, const TKeyframe &inData) = 0;
@@ -283,10 +283,10 @@ class IActionSystemSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
 };
 
@@ -294,32 +294,32 @@ class IActionSystemSignalSender : public ISignalItem
 {
 public:
     virtual void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) = 0;
+                                   Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) = 0;
+                                   Qt3DSDMInstanceHandle inOwner) = 0;
 };
 
 class ICustomPropCoreSignalProvider : public ISignalItem
 {
 public:
     virtual TSignalConnectionPtr ConnectCustomPropertyCreated(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomPropertyDeleted(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomPropertyModified(
-        const std::function<void(CUICDMPropertyHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectCustomEventCreated(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomEventDeleted(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectCustomEventModified(const std::function<void(CUICDMEventHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectCustomHandlerCreated(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomHandlerDeleted(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectCustomHandlerModified(const std::function<void(CUICDMHandlerHandle)> &inCallback) = 0;
 
@@ -331,28 +331,28 @@ public:
         const std::function<void(CUICDMHandlerParamHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectCustomReferencesModified(
-        const std::function<void(CUICDMInstanceHandle, const TCharStr &)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMInstanceHandle, const TCharStr &)> &inCallback) = 0;
 };
 
 class ICustomPropCoreSignalSender : public ISignalItem
 {
 public:
-    virtual void SendCustomPropertyCreated(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) = 0;
-    virtual void SendCustomPropertyDeleted(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) = 0;
-    virtual void SendCustomPropertyModified(CUICDMPropertyHandle inProp) = 0;
+    virtual void SendCustomPropertyCreated(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) = 0;
+    virtual void SendCustomPropertyDeleted(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) = 0;
+    virtual void SendCustomPropertyModified(Qt3DSDMPropertyHandle inProp) = 0;
 
     virtual void SendCustomEventCreated(CUICDMEventHandle inEvent,
-                                        CUICDMInstanceHandle inOwner) = 0;
+                                        Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomEventDeleted(CUICDMEventHandle inEvent,
-                                        CUICDMInstanceHandle inOwner) = 0;
+                                        Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomEventModified(CUICDMEventHandle inEvent) = 0;
 
     virtual void SendCustomHandlerCreated(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) = 0;
+                                          Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomHandlerDeleted(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) = 0;
+                                          Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomHandlerModified(CUICDMHandlerHandle inHandler) = 0;
 
     virtual void SendCustomHandlerParamCreated(CUICDMHandlerParamHandle inParameter,
@@ -361,7 +361,7 @@ public:
                                                CUICDMHandlerHandle inHandler) = 0;
     virtual void SendCustomHandlerParamModified(CUICDMHandlerParamHandle inParameter) = 0;
 
-    virtual void SendCustomReferencesModified(CUICDMInstanceHandle inOwner,
+    virtual void SendCustomReferencesModified(Qt3DSDMInstanceHandle inOwner,
                                               const TCharStr &inString) = 0;
 };
 
@@ -379,14 +379,14 @@ public:
     virtual TSignalConnectionPtr ConnectSlideRearranged(
         const std::function<void(CUICDMSlideHandle, int, int)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceAssociated(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectInstanceDissociated(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActiveSlide(
         const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle, CUICDMSlideHandle)>
@@ -405,13 +405,13 @@ public:
     virtual void SendSlideRearranged(CUICDMSlideHandle inMaster, int inOldIndex,
                                      int inNewIndex) = 0;
     virtual void SendInstanceAssociated(CUICDMSlideHandle inMaster,
-                                        CUICDMInstanceHandle inInstance) = 0;
+                                        Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void SendInstanceDissociated(CUICDMSlideHandle inMaster,
-                                         CUICDMInstanceHandle inInstance) = 0;
-    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) = 0;
-    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) = 0;
+                                         Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) = 0;
     virtual void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex,
                                  CUICDMSlideHandle inOldSlide, CUICDMSlideHandle inNewSlide) = 0;
 };
@@ -430,25 +430,25 @@ public:
     virtual TSignalConnectionPtr
     ConnectComponentSeconds(const std::function<void(CUICDMSlideHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyLinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectPropertyUnlinked(
-        const std::function<void(CUICDMSlideHandle, CUICDMInstanceHandle, CUICDMPropertyHandle)>
+        const std::function<void(CUICDMSlideHandle, Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActiveSlide(
         const std::function<void(CUICDMSlideHandle, int, CUICDMSlideHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr
-    ConnectInstanceCreated(const std::function<void(CUICDMInstanceHandle)> &inCallback) = 0;
+    ConnectInstanceCreated(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectInstanceDeleted(const std::function<void(CUICDMInstanceHandle)> &inCallback) = 0;
+    ConnectInstanceDeleted(const std::function<void(Qt3DSDMInstanceHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr
-    ConnectAnimationCreated(const std::function<void(CUICDMAnimationHandle, CUICDMInstanceHandle,
-                                                       CUICDMPropertyHandle)> &inCallback) = 0;
+    ConnectAnimationCreated(const std::function<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle,
+                                                       Qt3DSDMPropertyHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
-    ConnectAnimationDeleted(const std::function<void(CUICDMAnimationHandle, CUICDMInstanceHandle,
-                                                       CUICDMPropertyHandle)> &inCallback) = 0;
+    ConnectAnimationDeleted(const std::function<void(CUICDMAnimationHandle, Qt3DSDMInstanceHandle,
+                                                       Qt3DSDMPropertyHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectKeyframeInserted(
         const std::function<void(CUICDMAnimationHandle, CUICDMKeyframeHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectKeyframeErased(
@@ -459,13 +459,13 @@ public:
         const std::function<void(CUICDMAnimationHandle, bool)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectInstancePropertyValue(
-        const std::function<void(CUICDMInstanceHandle, CUICDMPropertyHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectActionCreated(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectActionDeleted(
-        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, CUICDMInstanceHandle)>
+        const std::function<void(CUICDMActionHandle, CUICDMSlideHandle, Qt3DSDMInstanceHandle)>
             &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectTriggerObjectSet(const std::function<void(CUICDMActionHandle)> &inCallback) = 0;
@@ -479,21 +479,21 @@ public:
         const std::function<void(CUICDMHandlerArgHandle)> &inCallback) = 0;
 
     virtual TSignalConnectionPtr ConnectCustomPropertyCreated(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomPropertyDeleted(
-        const std::function<void(CUICDMPropertyHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomPropertyModified(
-        const std::function<void(CUICDMPropertyHandle)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMPropertyHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomEventCreated(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomEventDeleted(
-        const std::function<void(CUICDMEventHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMEventHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectCustomEventModified(const std::function<void(CUICDMEventHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomHandlerCreated(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomHandlerDeleted(
-        const std::function<void(CUICDMHandlerHandle, CUICDMInstanceHandle)> &inCallback) = 0;
+        const std::function<void(CUICDMHandlerHandle, Qt3DSDMInstanceHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr
     ConnectCustomHandlerModified(const std::function<void(CUICDMHandlerHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomHandlerParamCreated(
@@ -503,7 +503,7 @@ public:
     virtual TSignalConnectionPtr ConnectCustomHandlerParamModified(
         const std::function<void(CUICDMHandlerParamHandle)> &inCallback) = 0;
     virtual TSignalConnectionPtr ConnectCustomReferencesModified(
-        const std::function<void(CUICDMInstanceHandle, const TCharStr &)> &inCallback) = 0;
+        const std::function<void(Qt3DSDMInstanceHandle, const TCharStr &)> &inCallback) = 0;
 };
 
 class IStudioFullSystemSignalSender : public ISignalItem
@@ -515,22 +515,22 @@ public:
                                      int inNewIndex) = 0;
     virtual void SendComponentSeconds(CUICDMSlideHandle inMaster) = 0;
     virtual void SendBeginComponentSeconds(CUICDMSlideHandle inMaster) = 0;
-    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                    CUICDMPropertyHandle inProperty) = 0;
-    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) = 0;
+    virtual void SendPropertyLinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                    Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual void SendPropertyUnlinked(CUICDMSlideHandle inMaster, Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) = 0;
     virtual void SendActiveSlide(CUICDMSlideHandle inMaster, int inIndex,
                                  CUICDMSlideHandle inSlide) = 0;
 
-    virtual void SendInstanceCreated(CUICDMInstanceHandle inInstance) = 0;
-    virtual void SendInstanceDeleted(CUICDMInstanceHandle inInstance) = 0;
+    virtual void SendInstanceCreated(Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual void SendInstanceDeleted(Qt3DSDMInstanceHandle inInstance) = 0;
 
     virtual void SendAnimationCreated(CUICDMAnimationHandle inAnimation,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) = 0;
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) = 0;
     virtual void SendAnimationDeleted(CUICDMAnimationHandle inAnimation,
-                                      CUICDMInstanceHandle inInstance,
-                                      CUICDMPropertyHandle inProperty) = 0;
+                                      Qt3DSDMInstanceHandle inInstance,
+                                      Qt3DSDMPropertyHandle inProperty) = 0;
     virtual void SendKeyframeInserted(CUICDMAnimationHandle inAnimation,
                                       CUICDMKeyframeHandle inKeyframe) = 0;
     virtual void SendKeyframeErased(CUICDMAnimationHandle inAnimation,
@@ -539,49 +539,49 @@ public:
     virtual void SendConnectFirstKeyframeDynamicSet(CUICDMAnimationHandle inAnimation,
                                                     bool inDynamic) = 0;
 
-    virtual void SendInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                           CUICDMPropertyHandle inProperty) = 0;
+    virtual void SendInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                           Qt3DSDMPropertyHandle inProperty) = 0;
 
     virtual void SendActionCreated(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) = 0;
+                                   Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendActionDeleted(CUICDMActionHandle inAction, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inOwner) = 0;
+                                   Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendTriggerObjectSet(CUICDMActionHandle inAction) = 0;
     virtual void SendTargetObjectSet(CUICDMActionHandle inAction) = 0;
     virtual void SendEventSet(CUICDMActionHandle inAction) = 0;
     virtual void SendHandlerSet(CUICDMActionHandle inAction) = 0;
     virtual void SendHandlerArgumentValueSet(CUICDMHandlerArgHandle inHandlerArgument) = 0;
 
-    virtual void SendCustomPropertyCreated(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) = 0;
-    virtual void SendCustomPropertyDeleted(CUICDMPropertyHandle inProp,
-                                           CUICDMInstanceHandle inOwner) = 0;
-    virtual void SendCustomPropertyModified(CUICDMPropertyHandle inProp) = 0;
+    virtual void SendCustomPropertyCreated(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) = 0;
+    virtual void SendCustomPropertyDeleted(Qt3DSDMPropertyHandle inProp,
+                                           Qt3DSDMInstanceHandle inOwner) = 0;
+    virtual void SendCustomPropertyModified(Qt3DSDMPropertyHandle inProp) = 0;
     virtual void SendCustomEventCreated(CUICDMEventHandle inEvent,
-                                        CUICDMInstanceHandle inOwner) = 0;
+                                        Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomEventDeleted(CUICDMEventHandle inEvent,
-                                        CUICDMInstanceHandle inOwner) = 0;
+                                        Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomEventModified(CUICDMEventHandle inEvent) = 0;
     virtual void SendCustomHandlerCreated(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) = 0;
+                                          Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomHandlerDeleted(CUICDMHandlerHandle inHandler,
-                                          CUICDMInstanceHandle inOwner) = 0;
+                                          Qt3DSDMInstanceHandle inOwner) = 0;
     virtual void SendCustomHandlerModified(CUICDMHandlerHandle inHandler) = 0;
     virtual void SendCustomHandlerParamCreated(CUICDMHandlerParamHandle inParameter,
                                                CUICDMHandlerHandle inHandler) = 0;
     virtual void SendCustomHandlerParamDeleted(CUICDMHandlerParamHandle inParameter,
                                                CUICDMHandlerHandle inHandler) = 0;
     virtual void SendCustomHandlerParamModified(CUICDMHandlerParamHandle inParameter) = 0;
-    virtual void SendCustomReferencesModified(CUICDMInstanceHandle inOwner,
+    virtual void SendCustomReferencesModified(Qt3DSDMInstanceHandle inOwner,
                                               const TCharStr &inString) = 0;
 };
 
 // Use this if you want to register for only a specific instance or specific property
 template <typename TTransaction>
-inline void MaybackCallbackInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty,
-                                                 CUICDMInstanceHandle inDesiredInstance,
-                                                 CUICDMPropertyHandle inDesiredProperty,
+inline void MaybackCallbackInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                 Qt3DSDMPropertyHandle inProperty,
+                                                 Qt3DSDMInstanceHandle inDesiredInstance,
+                                                 Qt3DSDMPropertyHandle inDesiredProperty,
                                                  TTransaction inCallback)
 {
     if ((!inDesiredInstance.Valid() || (inDesiredInstance == inInstance))
diff --git a/src/Authoring/UICDM/Systems/UICDMSlideCore.h b/src/Authoring/UICDM/Systems/UICDMSlideCore.h
index aa79833d..2f4392fe 100644
--- a/src/Authoring/UICDM/Systems/UICDMSlideCore.h
+++ b/src/Authoring/UICDM/Systems/UICDMSlideCore.h
@@ -36,11 +36,11 @@
 #include "UICDMDataCore.h"
 
 namespace qt3dsdm {
-typedef std::pair<CUICDMInstanceHandle, CUICDMPropertyHandle> TInstancePropertyPair;
+typedef std::pair<Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle> TInstancePropertyPair;
 typedef std::vector<TInstancePropertyPair> TInstancePropertyPairList;
 
 // instance,property,value
-typedef std::tuple<CUICDMInstanceHandle, CUICDMPropertyHandle, SValue> TSlideEntry;
+typedef std::tuple<Qt3DSDMInstanceHandle, Qt3DSDMPropertyHandle, SValue> TSlideEntry;
 typedef std::vector<TSlideEntry> TSlideEntryList;
 
 class ISlideCore : public IHandleBase
@@ -55,15 +55,15 @@ public:
     /**
      *	Create a new slide.  Slides must have an instance allocated for them.
      */
-    virtual CUICDMSlideHandle CreateSlide(CUICDMInstanceHandle inInstance) = 0;
+    virtual CUICDMSlideHandle CreateSlide(Qt3DSDMInstanceHandle inInstance) = 0;
     /**
      *	Return the instance that was allocated for this slide.
      */
-    virtual CUICDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    virtual CUICDMSlideHandle GetSlideByInstance(CUICDMInstanceHandle inSlide) const = 0;
+    virtual CUICDMSlideHandle 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.
@@ -113,8 +113,8 @@ public:
      *	Get this property from this instance in this slide.  Includes lookup into any parent slides.
      */
     virtual bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
 
     /**
@@ -125,8 +125,8 @@ public:
      *	it already has a property entry then it sets the value locally.
      */
     virtual void SetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           const SValue &inValue) = 0;
 
     /**
@@ -134,23 +134,23 @@ public:
      *Always adds entry to this slide.
      */
     virtual void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inInstance,
-                                               CUICDMPropertyHandle inProperty,
+                                               Qt3DSDMInstanceHandle inInstance,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) = 0;
 
     /**
      *	Return the value for this property if it exists on this slide.
      */
     virtual bool GetSpecificInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                                  CUICDMInstanceHandle inInstance,
-                                                  CUICDMPropertyHandle inProperty,
+                                                  Qt3DSDMInstanceHandle inInstance,
+                                                  Qt3DSDMPropertyHandle inProperty,
                                                   SValue &outValue) const = 0;
 
     /**
      *	Return all of the properties for this instance stored on this slide.
      */
     virtual void GetSpecificInstancePropertyValues(CUICDMSlideHandle inSlide,
-                                                   CUICDMInstanceHandle inInstance,
+                                                   Qt3DSDMInstanceHandle inInstance,
                                                    TPropertyHandleValuePairList &outValues) = 0;
 
     /**
@@ -163,8 +163,8 @@ public:
      *	Set this property value on all my child slides.
      */
     virtual void PushPropertyValueToChildren(CUICDMSlideHandle inParent,
-                                             CUICDMInstanceHandle inInstance,
-                                             CUICDMPropertyHandle inProperty,
+                                             Qt3DSDMInstanceHandle inInstance,
+                                             Qt3DSDMPropertyHandle inProperty,
                                              const SValue &inValue) = 0;
 
     /**
@@ -187,18 +187,18 @@ public:
      *	Ensure the children of this parent item do not contain entries for a given property.
      */
     virtual void ClearChildrenPropertyValues(CUICDMSlideHandle inParent,
-                                             CUICDMInstanceHandle inHandle,
-                                             CUICDMPropertyHandle inProperty) = 0;
+                                             Qt3DSDMInstanceHandle inHandle,
+                                             Qt3DSDMPropertyHandle inProperty) = 0;
 
     /**
      *	Delete all property entries related to this instance.
      */
-    virtual void DeleteAllInstanceEntries(CUICDMInstanceHandle inHandle) = 0;
+    virtual void DeleteAllInstanceEntries(Qt3DSDMInstanceHandle inHandle) = 0;
 
     /**
      *	Delete all of the property entries related to this property
      */
-    virtual void DeleteAllPropertyEntries(CUICDMPropertyHandle inHandle) = 0;
+    virtual void DeleteAllPropertyEntries(Qt3DSDMPropertyHandle inHandle) = 0;
 
     /**
      *	Delete all property entries that have an instance in the instances list *and*
@@ -210,8 +210,8 @@ public:
     /**
      *	Does this slide contain this property?
      */
-    virtual bool ContainsProperty(CUICDMSlideHandle inSlide, CUICDMInstanceHandle inHandle,
-                                  CUICDMPropertyHandle inProperty) const = 0;
+    virtual bool ContainsProperty(CUICDMSlideHandle inSlide, Qt3DSDMInstanceHandle inHandle,
+                                  Qt3DSDMPropertyHandle inProperty) const = 0;
 
     /**
      *	Copy the properties from the source slide and source instance to the destination slide and
@@ -219,9 +219,9 @@ public:
      *	instance.
      */
     virtual void CopyProperties(CUICDMSlideHandle inSourceSlide,
-                                CUICDMInstanceHandle inSourceInstance,
+                                Qt3DSDMInstanceHandle inSourceInstance,
                                 CUICDMSlideHandle inDestSlide,
-                                CUICDMInstanceHandle inDestInstance) = 0;
+                                Qt3DSDMInstanceHandle inDestInstance) = 0;
 
     virtual bool IsSlide(CUICDMSlideHandle inSlide) const = 0;
 };
diff --git a/src/Authoring/UICDM/Systems/UICDMSlideGraphCore.h b/src/Authoring/UICDM/Systems/UICDMSlideGraphCore.h
index ac1b7ed5..3aadcdb3 100644
--- a/src/Authoring/UICDM/Systems/UICDMSlideGraphCore.h
+++ b/src/Authoring/UICDM/Systems/UICDMSlideGraphCore.h
@@ -35,7 +35,7 @@
 
 namespace qt3dsdm {
 
-typedef std::pair<CUICDMSlideHandle, CUICDMInstanceHandle> TSlideInstancePair;
+typedef std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle> TSlideInstancePair;
 typedef std::vector<TSlideInstancePair> TSlideInstancePairList;
 typedef std::pair<CUICDMSlideGraphHandle, CUICDMSlideHandle> TGraphSlidePair;
 
@@ -70,11 +70,11 @@ public:
      *	implicitly associated with any root-derived slides.
      */
     virtual void AssociateInstance(CUICDMSlideGraphHandle inSlideGraph, CUICDMSlideHandle inSlide,
-                                   CUICDMInstanceHandle inInstance) = 0;
+                                   Qt3DSDMInstanceHandle inInstance) = 0;
     virtual void GetAssociatedInstances(CUICDMSlideGraphHandle inSlideGraph,
                                         TSlideInstancePairList &outAssociations) const = 0;
-    virtual TGraphSlidePair GetAssociatedGraph(CUICDMInstanceHandle inInstance) const = 0;
-    virtual void DissociateInstance(CUICDMInstanceHandle inInstance) = 0;
+    virtual TGraphSlidePair GetAssociatedGraph(Qt3DSDMInstanceHandle inInstance) const = 0;
+    virtual void DissociateInstance(Qt3DSDMInstanceHandle inInstance) = 0;
 
     /**
      *	All graphs always have an active slide.  This is assumed to be the root right off the bat.
diff --git a/src/Authoring/UICDM/Systems/UICDMSlides.h b/src/Authoring/UICDM/Systems/UICDMSlides.h
index e6fb75f3..d49618a5 100644
--- a/src/Authoring/UICDM/Systems/UICDMSlides.h
+++ b/src/Authoring/UICDM/Systems/UICDMSlides.h
@@ -49,7 +49,7 @@ public:
     /**
      *	Return the instance that relates to this property
      */
-    virtual CUICDMInstanceHandle GetInstanceForProperty(const SValue &inValue) = 0;
+    virtual Qt3DSDMInstanceHandle GetInstanceForProperty(const SValue &inValue) = 0;
 
     /**
      *	Duplicate this instance and whichever properties and animations you desire,
@@ -59,7 +59,7 @@ public:
      */
     virtual SValue CreateInstanceForProperty(CUICDMSlideHandle inSourceSlide,
                                              CUICDMSlideHandle inDestSlide,
-                                             CUICDMInstanceHandle inInstance) = 0;
+                                             Qt3DSDMInstanceHandle inInstance) = 0;
 };
 
 typedef std::shared_ptr<IPropertyInstanceInfo> TPropertyInstanceInfoPtr;
@@ -117,11 +117,11 @@ public:
      */
     virtual float GetComponentSeconds(CUICDMSlideHandle inSlide) const = 0;
     virtual long GetComponentSecondsLong(CUICDMSlideHandle inSlide) const = 0;
-    virtual long GetComponentSecondsLong(CUICDMInstanceHandle inInstance) const = 0;
+    virtual long GetComponentSecondsLong(Qt3DSDMInstanceHandle inInstance) const = 0;
 
     // The fastest way possible, get all of the slide information for this instance.
     virtual SInstanceSlideInformation
-    GetInstanceSlideInformation(CUICDMInstanceHandle inInstance) const = 0;
+    GetInstanceSlideInformation(Qt3DSDMInstanceHandle inInstance) const = 0;
     /**
      *	Slide count includes the master slide;
      */
@@ -130,60 +130,60 @@ public:
      * Use the instance for storing information such as name, or the GUID of the object
      * this slide links to.
      */
-    virtual CUICDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideInstance(CUICDMSlideHandle inSlide) const = 0;
     /**
      *	Reverse lookup into the slide system so you can match slides to instances.
      */
-    virtual CUICDMSlideHandle GetSlideByInstance(CUICDMInstanceHandle inInstance) const = 0;
+    virtual CUICDMSlideHandle GetSlideByInstance(Qt3DSDMInstanceHandle inInstance) const = 0;
     /**
      *	Slide may be either a master slide
      */
     virtual void AssociateInstanceWithSlide(CUICDMSlideHandle inSlide,
-                                            CUICDMInstanceHandle inInstance) = 0;
-    virtual CUICDMSlideHandle GetAssociatedSlide(CUICDMInstanceHandle inInstance) const = 0;
+                                            Qt3DSDMInstanceHandle inInstance) = 0;
+    virtual CUICDMSlideHandle GetAssociatedSlide(Qt3DSDMInstanceHandle inInstance) const = 0;
     virtual void GetAssociatedInstances(
         CUICDMSlideHandle inMaster,
-        std::vector<std::pair<CUICDMSlideHandle, CUICDMInstanceHandle>> &outAssociations) const = 0;
+        std::vector<std::pair<CUICDMSlideHandle, Qt3DSDMInstanceHandle>> &outAssociations) const = 0;
     virtual void GetAssociatedInstances(CUICDMSlideHandle inSlide,
                                         TInstanceHandleList &outAssociations) const = 0;
-    virtual void LinkProperty(CUICDMInstanceHandle inInstance, CUICDMPropertyHandle inProperty) = 0;
-    virtual void UnlinkProperty(CUICDMInstanceHandle inInstance,
-                                CUICDMPropertyHandle inProperty) = 0;
-    virtual bool IsPropertyLinked(CUICDMInstanceHandle inInstance,
-                                  CUICDMPropertyHandle inProperty) const = 0;
-    virtual bool CanPropertyBeLinked(CUICDMInstanceHandle inInstance,
-                                     CUICDMPropertyHandle inProperty) const = 0;
+    virtual void LinkProperty(Qt3DSDMInstanceHandle inInstance, Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual void UnlinkProperty(Qt3DSDMInstanceHandle inInstance,
+                                Qt3DSDMPropertyHandle inProperty) = 0;
+    virtual bool IsPropertyLinked(Qt3DSDMInstanceHandle inInstance,
+                                  Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual bool CanPropertyBeLinked(Qt3DSDMInstanceHandle inInstance,
+                                     Qt3DSDMPropertyHandle inProperty) const = 0;
     virtual void GetUnionOfProperties(CUICDMSlideHandle inSlide1, CUICDMSlideHandle inSlide,
                                       TInstancePropertyPairList &outProperties) const = 0;
 
-    virtual bool GetSlidePropertyValue(size_t inSlide, CUICDMInstanceHandle inInstance,
-                                       CUICDMPropertyHandle inProperty, SValue &outValue) = 0;
+    virtual bool GetSlidePropertyValue(size_t inSlide, Qt3DSDMInstanceHandle inInstance,
+                                       Qt3DSDMPropertyHandle inProperty, SValue &outValue) = 0;
 
     virtual void SetActiveSlide(CUICDMSlideHandle inSlide) = 0;
-    virtual CUICDMSlideHandle GetAssociatedSlide(CUICDMInstanceHandle inInstance,
-                                                 CUICDMPropertyHandle inProperty) const = 0;
+    virtual CUICDMSlideHandle 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 CUICDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const = 0;
+    virtual Qt3DSDMInstanceHandle GetSlideSelectedInstance(CUICDMSlideHandle inSlide) const = 0;
     virtual void SetSlideSelectedInstance(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance) = 0;
+                                          Qt3DSDMInstanceHandle inInstance) = 0;
 
-    virtual CUICDMSlideHandle GetApplicableSlide(CUICDMInstanceHandle inHandle,
-                                                 CUICDMPropertyHandle inProperty) = 0;
+    virtual CUICDMSlideHandle GetApplicableSlide(Qt3DSDMInstanceHandle inHandle,
+                                                 Qt3DSDMPropertyHandle inProperty) = 0;
 
     virtual bool GetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                          CUICDMInstanceHandle inInstance,
-                                          CUICDMPropertyHandle inProperty,
+                                          Qt3DSDMInstanceHandle inInstance,
+                                          Qt3DSDMPropertyHandle inProperty,
                                           SValue &outValue) const = 0;
-    virtual bool GetCanonicalInstancePropertyValue(CUICDMInstanceHandle inInstance,
-                                                   CUICDMPropertyHandle inProperty,
+    virtual bool GetCanonicalInstancePropertyValue(Qt3DSDMInstanceHandle inInstance,
+                                                   Qt3DSDMPropertyHandle inProperty,
                                                    SValue &outValue) const = 0;
     virtual void ForceSetInstancePropertyValue(CUICDMSlideHandle inSlide,
-                                               CUICDMInstanceHandle inInstance,
-                                               CUICDMPropertyHandle inProperty,
+                                               Qt3DSDMInstanceHandle inInstance,
+                                               Qt3DSDMPropertyHandle inProperty,
                                                const SValue &inValue) = 0;
 
     /**
@@ -191,7 +191,7 @@ public:
      *	and give an outside entity the chance to create new objects and properties when
      *	the property is unlinked and linked.
      */
-    virtual void RegisterPropertyInstance(CUICDMPropertyHandle inPropertyHandle,
+    virtual void RegisterPropertyInstance(Qt3DSDMPropertyHandle inPropertyHandle,
                                           TPropertyInstanceInfoPtr inPropertyInfo) = 0;
 };
 
diff --git a/src/Authoring/UICDM/Systems/UICDMTestOps.h b/src/Authoring/UICDM/Systems/UICDMTestOps.h
index 19d4dc1d..3c6959e5 100644
--- a/src/Authoring/UICDM/Systems/UICDMTestOps.h
+++ b/src/Authoring/UICDM/Systems/UICDMTestOps.h
@@ -31,19 +31,19 @@
 #define UICDMOPSH
 
 namespace UICDM {
-inline const TCharStr &GetPropertyName(const IDataCore &inModel, CUICDMPropertyHandle inProperty)
+inline const TCharStr &GetPropertyName(const IDataCore &inModel, Qt3DSDMPropertyHandle inProperty)
 {
     return inModel.GetProperty(inProperty).m_Name;
 }
 
 inline bool PropertyNameMatches(const IDataCore &inModel, const TCharStr &inName,
-                                CUICDMPropertyHandle inProperty)
+                                Qt3DSDMPropertyHandle inProperty)
 {
     return inName == GetPropertyName(inModel, inProperty);
 }
 
-inline const CUICDMPropertyHandle
-GetPropertyByName(const IDataCore &inModel, CUICDMInstanceHandle inInstance, const TCharStr &inName)
+inline const Qt3DSDMPropertyHandle
+GetPropertyByName(const IDataCore &inModel, Qt3DSDMInstanceHandle inInstance, const TCharStr &inName)
 {
     using namespace std;
     TPropertyHandleList properties;
diff --git a/src/Authoring/UICDM/Systems/UICDMWStrOpsImpl.h b/src/Authoring/UICDM/Systems/UICDMWStrOpsImpl.h
index 4177b2e8..3c033710 100644
--- a/src/Authoring/UICDM/Systems/UICDMWStrOpsImpl.h
+++ b/src/Authoring/UICDM/Systems/UICDMWStrOpsImpl.h
@@ -634,8 +634,8 @@ struct WStrOps<CDataModelHandle>
     struct WStrOps<HandleType> : public WStrOps<CDataModelHandle>                                  \
     {                                                                                              \
     };
-IMPLEMENT_HANDLE_WSTROPS(CUICDMInstanceHandle);
-IMPLEMENT_HANDLE_WSTROPS(CUICDMPropertyHandle);
+IMPLEMENT_HANDLE_WSTROPS(Qt3DSDMInstanceHandle);
+IMPLEMENT_HANDLE_WSTROPS(Qt3DSDMPropertyHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMSlideHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMSlideGraphHandle);
 IMPLEMENT_HANDLE_WSTROPS(CUICDMAnimationHandle);
diff --git a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
index 71da3576..422da413 100644
--- a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
+++ b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
@@ -250,12 +250,12 @@ public:
     inline const wchar_t *Convert2(const char *inName) { return ConvertChar(inName, 2); }
     inline const wchar_t *Convert3(const char *inName) { return ConvertChar(inName, 3); }
 
-    inline CUICDMInstanceHandle GetInstanceForType(const wchar_t *inType)
+    inline Qt3DSDMInstanceHandle GetInstanceForType(const wchar_t *inType)
     {
         return m_Objects->GetInstanceForType(ComposerObjectTypes::Convert(inType));
     }
 
-    CUICDMInstanceHandle GetInstanceById(const wchar_t *inId)
+    Qt3DSDMInstanceHandle GetInstanceById(const wchar_t *inId)
     {
         if (IsTrivial(inId))
             return 0;
@@ -271,10 +271,10 @@ public:
     virtual bool IsPropertyExist(const wchar_t *inType, const wchar_t *inProperty,
                                  const wchar_t *inId)
     {
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
         if (theInstance.Valid()) {
-            CUICDMPropertyHandle theProperty =
+            Qt3DSDMPropertyHandle theProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(theInstance, inProperty);
 
             return theProperty.Valid();
@@ -316,9 +316,9 @@ public:
     virtual ERuntimeDataModelDataType
     GetPropertyType(const wchar_t *inType, const wchar_t *inProperty, const wchar_t *inId)
     {
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
-        CUICDMPropertyHandle theProperty =
+        Qt3DSDMPropertyHandle theProperty =
             m_DataCore->GetAggregateInstancePropertyByName(theInstance, inProperty);
         return Convert(m_DataCore->GetProperty(theProperty).m_Type);
     }
@@ -367,9 +367,9 @@ public:
     virtual ERuntimeAdditionalMetaDataType
     GetAdditionalType(const wchar_t *inType, const wchar_t *inProperty, const wchar_t *inId)
     {
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
-        CUICDMPropertyHandle theProperty =
+        Qt3DSDMPropertyHandle theProperty =
             m_DataCore->GetAggregateInstancePropertyByName(theInstance, inProperty);
         return Convert(m_NewMetaData->GetAdditionalMetaDataType(theInstance, theProperty));
     }
@@ -377,10 +377,10 @@ public:
     bool GetPropertyValue(const wchar_t *inType, const wchar_t *inProperty, const wchar_t *inId,
                           SValue &outValue)
     {
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
         if (theInstance.Valid()) {
-            CUICDMPropertyHandle theProperty =
+            Qt3DSDMPropertyHandle theProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(theInstance, inProperty);
             return m_DataCore->GetInstancePropertyValue(theInstance, theProperty, outValue);
         } else {
@@ -534,7 +534,7 @@ public:
                                eastl::vector<TRuntimeMetaDataStrType> &outReferences,
                                const wchar_t *inId)
     {
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
 
         if (theInstance.Valid()) {
@@ -557,8 +557,8 @@ public:
 
     virtual bool IsCustomProperty(const wchar_t *inId, const wchar_t *inProperty)
     {
-        CUICDMInstanceHandle theInstance = GetInstanceById(inId);
-        CUICDMPropertyHandle theProperty =
+        Qt3DSDMInstanceHandle theInstance = GetInstanceById(inId);
+        Qt3DSDMPropertyHandle theProperty =
             m_DataCore->GetAggregateInstancePropertyByName(theInstance, inProperty);
         return m_NewMetaData->IsCustomProperty(theInstance, theProperty);
     }
@@ -570,7 +570,7 @@ public:
 
     virtual bool IsCustomHandler(const wchar_t *inId, const wchar_t *inHandlerName)
     {
-        CUICDMInstanceHandle theInstance = GetInstanceById(inId);
+        Qt3DSDMInstanceHandle theInstance = GetInstanceById(inId);
         CUICDMHandlerHandle theHandle =
             m_NewMetaData->FindHandlerByName(theInstance, inHandlerName);
         return m_NewMetaData->IsCustomHandler(theHandle);
@@ -604,7 +604,7 @@ public:
     THandlerList GetCustomHandlers(const char *inId) override
     {
         THandlerList retval;
-        CUICDMInstanceHandle theInstance = GetInstanceById(Convert0(inId));
+        Qt3DSDMInstanceHandle theInstance = GetInstanceById(Convert0(inId));
         THandlerHandleList handlerList;
         m_NewMetaData->GetHandlers(theInstance, handlerList);
         retval.reserve((uint32_t)handlerList.size());
@@ -634,7 +634,7 @@ public:
     TVisualEventList GetVisualEvents(const char *inId) override
     {
         TVisualEventList theRetval;
-        CUICDMInstanceHandle theInstance = GetInstanceById(Convert0(inId));
+        Qt3DSDMInstanceHandle theInstance = GetInstanceById(Convert0(inId));
         TEventHandleList theEventList;
         m_NewMetaData->GetEvents(theInstance, theEventList);
         theRetval.reserve((uint32_t)theEventList.size());
@@ -672,8 +672,8 @@ public:
     SElementInfo LoadElement(const char *clsName, const char *clsRef, const char *inId) override
     {
         SElementInfo retval;
-        CUICDMInstanceHandle theInstance;
-        CUICDMInstanceHandle parentInstance;
+        Qt3DSDMInstanceHandle theInstance;
+        Qt3DSDMInstanceHandle parentInstance;
         if (!qt3ds::foundation::isTrivial(clsRef)) {
             if (clsRef[0] == '#')
                 ++clsRef;
@@ -689,7 +689,7 @@ public:
         m_DataCore->DeriveInstance(theInstance, parentInstance);
         m_IdToHandleMap.insert(std::make_pair(TCharStr(Convert0(inId)), theInstance));
         // setup isComponent
-        CUICDMInstanceHandle slideOwner = m_NewMetaData->GetCanonicalInstanceForType(L"SlideOwner");
+        Qt3DSDMInstanceHandle slideOwner = m_NewMetaData->GetCanonicalInstanceForType(L"SlideOwner");
         retval.m_IsComponent = m_DataCore->IsInstanceOrDerivedFrom(theInstance, slideOwner);
         TCharStr type = m_NewMetaData->GetTypeForInstance(theInstance);
         qt3ds::foundation::ConvertUTF(type.c_str(), type.size(), retval.m_ClassName);
@@ -702,7 +702,7 @@ public:
     TAttOrArgList GetSlideAttributes() override
     {
         TAttOrArgList retval;
-        CUICDMInstanceHandle slideOwner = m_NewMetaData->GetCanonicalInstanceForType(L"Slide");
+        Qt3DSDMInstanceHandle slideOwner = m_NewMetaData->GetCanonicalInstanceForType(L"Slide");
         vector<CUICDMMetaDataPropertyHandle> theProperties;
         m_NewMetaData->GetSpecificMetaDataProperties(slideOwner, theProperties);
         MetaPropertiesToAttList(theProperties, retval);
@@ -722,7 +722,7 @@ public:
         outType = ERuntimeDataModelDataTypeNone;
         outAdditionalType = ERuntimeAdditionalMetaDataTypeNone;
 
-        CUICDMInstanceHandle theInstance = GetInstanceById(inId);
+        Qt3DSDMInstanceHandle theInstance = GetInstanceById(inId);
         CUICDMHandlerHandle theHandle =
             m_NewMetaData->FindHandlerByName(theInstance, inHandlerName);
         Option<SMetaDataHandlerArgumentInfo> theArgMetaData(
@@ -787,19 +787,19 @@ public:
         return theReaderPtr;
     }
 
-    CUICDMInstanceHandle CreateAndDeriveInstance(const wchar_t *inType, const wchar_t *inId)
+    Qt3DSDMInstanceHandle CreateAndDeriveInstance(const wchar_t *inType, const wchar_t *inId)
     {
         // Make sure that the same id has not been created before
         TCharStr theId(inId);
         QT3DS_ASSERT(m_IdToHandleMap.find(theId) == m_IdToHandleMap.end());
 
-        CUICDMInstanceHandle theCanonicalType(m_NewMetaData->GetCanonicalInstanceForType(inType));
+        Qt3DSDMInstanceHandle theCanonicalType(m_NewMetaData->GetCanonicalInstanceForType(inType));
         if (theCanonicalType.Valid() == false) {
             QT3DS_ASSERT(false);
             return 0;
         }
 
-        CUICDMInstanceHandle theMaster = m_DataCore->CreateInstance();
+        Qt3DSDMInstanceHandle theMaster = m_DataCore->CreateInstance();
         m_DataCore->DeriveInstance(theMaster, theCanonicalType);
         m_IdToHandleMap.insert(std::make_pair(theId, theMaster));
         return theMaster;
@@ -813,7 +813,7 @@ public:
         if (m_IdToHandleMap.find(theId) != m_IdToHandleMap.end())
             return true;
 
-        CUICDMInstanceHandle theMaster = CreateAndDeriveInstance(inType, inId);
+        Qt3DSDMInstanceHandle theMaster = CreateAndDeriveInstance(inType, inId);
         if (!theMaster.Valid())
             return false;
 
@@ -826,7 +826,7 @@ public:
             m_NewMetaData->LoadInstance(*theLuaPtr, theMaster, inName, warnings);
 
             // Set the name
-            CUICDMPropertyHandle theProperty =
+            Qt3DSDMPropertyHandle theProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(theMaster, L"name");
             m_DataCore->SetInstancePropertyValue(theMaster, theProperty,
                                                  std::make_shared<CDataStr>(inName));
@@ -843,7 +843,7 @@ public:
         if (m_IdToHandleMap.find(theId) != m_IdToHandleMap.end())
             return true;
 
-        CUICDMInstanceHandle theMaster = CreateAndDeriveInstance(inType, inId);
+        Qt3DSDMInstanceHandle theMaster = CreateAndDeriveInstance(inType, inId);
         if (!theMaster.Valid())
             return false;
 
@@ -855,7 +855,7 @@ public:
             m_NewMetaData->LoadInstance(*theScriptPtr, theMaster, inName, warnings);
 
             // Set the name
-            CUICDMPropertyHandle theProperty =
+            Qt3DSDMPropertyHandle theProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(theMaster, L"name");
             m_DataCore->SetInstancePropertyValue(theMaster, theProperty,
                                                  std::make_shared<CDataStr>(inName));
@@ -888,7 +888,7 @@ public:
         if (m_IdToHandleMap.find(theId) != m_IdToHandleMap.end())
             return true;
 
-        CUICDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
+        Qt3DSDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
         if (!theMaster.Valid())
             return false;
         NVScopedRefCounted<IRefCountedInputStream> theStream(
@@ -914,7 +914,7 @@ public:
         if (m_IdToHandleMap.find(theId) != m_IdToHandleMap.end())
             return true;
 
-        CUICDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
+        Qt3DSDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
         if (!theMaster.Valid())
             return false;
 
@@ -945,7 +945,7 @@ public:
         if (m_IdToHandleMap.find(theId) != m_IdToHandleMap.end())
             return true;
 
-        CUICDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
+        Qt3DSDMInstanceHandle theMaster = CreateAndDeriveInstance(theType, theId);
         if (!theMaster.Valid())
             return false;
 
@@ -959,7 +959,7 @@ public:
             Q3DStudio::CRenderPluginParser::NavigateToMetadata(theReader);
             std::vector<SMetaDataLoadWarning> theWarnings;
             m_NewMetaData->LoadInstance(*theReader, theMaster, theName, theWarnings);
-            CUICDMPropertyHandle theProperty =
+            Qt3DSDMPropertyHandle theProperty =
                 m_DataCore->GetAggregateInstancePropertyByName(theMaster, L"name");
             m_DataCore->SetInstancePropertyValue(theMaster, theProperty,
                                                  std::make_shared<CDataStr>(theName));
@@ -984,7 +984,7 @@ public:
                                        bool inSearchParent)
     {
         // Get the instance handle given the type or id
-        CUICDMInstanceHandle theInstance =
+        Qt3DSDMInstanceHandle theInstance =
             IsTrivial(inId) ? GetInstanceForType(inType) : GetInstanceById(inId);
         if (!theInstance.Valid()) {
             QT3DS_ASSERT(false);