Rename the rest of the UIC to Qt3DS

Task-number: QT3DS-18 Change-Id: Ia8141980f575565ee7dbfa33422f25f121da5fe1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
author: Määttä Antti <antti.maatta@qt.io> 2017-10-23 10:47:49 +0300
committer: Antti Määttä <antti.maatta@qt.io> 2017-10-24 13:24:20 +0000
commit: e0307030ff18b911a91ff5e4fa7958cd77493c42 (patch)
tree: 06154565d413773c445b8ea99bf42837c82f7237 /src
parent: 9bd7da7fc5c25589c80869f9f554d120e978a69a (diff)
381 files changed, 3055 insertions, 3061 deletions
diff --git a/src/3rdparty/color/CColor.cpp b/src/3rdparty/color/CColor.cpp
index 02e0ad3c..63c5bf13 100644
--- a/src/3rdparty/color/CColor.cpp
+++ b/src/3rdparty/color/CColor.cpp
@@ -473,7 +473,7 @@ unsigned char CColor::ToRGB1(float rm1, float rm2, float rh)
 Q3DStudio::CString CColor::GetString() const
 {
     Q3DStudio::CString color;
-	color.Format( _UIC( "%02X%02X%02X" ), GetRed(), GetGreen(), GetBlue());
+    color.Format( _LSTR( "%02X%02X%02X" ), GetRed(), GetGreen(), GetBlue());
 
 	return color;
 }
diff --git a/src/Authoring/Client/Code/Core/Commands/Cmd.cpp b/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
index 1d9cbd2e..f065bdf6 100644
--- a/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/Cmd.cpp
@@ -87,7 +87,7 @@ bool CCmd::IsCommitted()
 QString CCmd::ToString()
 {
     Q3DStudio::CString theString;
-    theString.Format(_UIC("Command - %d"), GetType());
+    theString.Format(_LSTR("Command - %d"), GetType());
 
     return theString.toQString();
 }
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
index 2a993ff0..3655ef1d 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp
@@ -64,7 +64,7 @@ void SApplicationState::Notify(const SApplicationState &inOther, CDoc &inDoc)
         inDoc.NotifyActiveSlideChanged(m_ActiveSlide, true);
 
     if (m_SelectedInstance != inOther.m_SelectedInstance)
-        inDoc.SelectUICDMObject(m_SelectedInstance);
+        inDoc.SelectDataModelObject(m_SelectedInstance);
 }
 
 // We clear the selection just as a precaution because we want to be sure that
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModelBase.h b/src/Authoring/Client/Code/Core/Commands/CmdDataModelBase.h
index f6f518db..deec6a58 100644
--- a/src/Authoring/Client/Code/Core/Commands/CmdDataModelBase.h
+++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModelBase.h
@@ -42,7 +42,7 @@
 
 //==============================================================================
 /**
- * Base class that provide basic Update/Finalize functionality, when changing UICDM data.
+ * Base class that provide basic Update/Finalize functionality, when changing DataModel data.
  */
 template <class TDataType>
 class CCmdDataModelBase : public CCmd, public qt3dsdm::CmdDataModel
diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index a8c276be..bda56381 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -113,16 +113,16 @@ bool CCore::LoadBuildConfigurations()
 {
     using namespace Q3DStudio;
     // See if we can find the build configurations where they are located first
-    CFilePath theCurrentPath(CUICFile::GetApplicationDirectory().GetAbsolutePath());
+    CFilePath theCurrentPath(Qt3DSFile::GetApplicationDirectory().GetAbsolutePath());
     CFilePath theMainDir = theCurrentPath.GetDirectory()
             .GetDirectory()
             .GetDirectory(); //.GetDirectory();	// Developing directory
     CFilePath theStudioDir =
             CFilePath::CombineBaseAndRelative(theMainDir, CFilePath(L"Studio/Build Configurations"));
-    CUICFile theConfigurationDirectory(theStudioDir);
+    Qt3DSFile theConfigurationDirectory(theStudioDir);
     if (!theStudioDir.IsDirectory())
-        theConfigurationDirectory = CUICFile(
-                    CUICFile::GetApplicationDirectory().GetAbsolutePath(),
+        theConfigurationDirectory = Qt3DSFile(
+                    Qt3DSFile::GetApplicationDirectory().GetAbsolutePath(),
                     Q3DStudio::CString(L"Build Configurations")); // Installed directory // TODO: Localize
 
     Q3DStudio::CBuildConfigParser theParser(m_BuildConfigurations);
@@ -207,7 +207,7 @@ void CCore::RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler)
                 Qt::Key_BracketRight);
 }
 
-void CCore::GetCreateDirectoryFileName(const CUICFile &inDocument,
+void CCore::GetCreateDirectoryFileName(const Qt3DSFile &inDocument,
                                        Q3DStudio::CFilePath &outFinalDir,
                                        Q3DStudio::CFilePath &outFinalDoc)
 {
@@ -225,7 +225,7 @@ void CCore::GetCreateDirectoryFileName(const CUICFile &inDocument,
  * Call to create a new document.
  * This will clear out the current doc (if there is one) then create a new one.
  */
-void CCore::OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory)
+void CCore::OnNewDocument(const Qt3DSFile &inDocument, bool inCreateDirectory)
 {
     CDispatchDataModelNotificationScope __dispatchScope(*m_Dispatch);
 
@@ -263,7 +263,7 @@ void CCore::OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory)
  * This will do all the prompting, directory stuff necessary and perform the
  * saving of the document.
  */
-void CCore::OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy /*= false*/)
+void CCore::OnSaveDocument(const Qt3DSFile &inDocument, bool inSaveCopy /*= false*/)
 {
     m_JustSaved = true;
     GetDispatch()->FireOnSavingPresentation(&inDocument);
@@ -288,14 +288,14 @@ void CCore::OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy /*= false
  * leave the document in a dirty state and not update it to point to the new
  * file path.
 */
-void CCore::OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy /*= false*/)
+void CCore::OnSaveDocumentCatcher(const Qt3DSFile &inDocument, bool inSaveCopy /*= false*/)
 {
     m_Dispatch->FireOnProgressBegin(Q3DStudio::CString::fromQString(QObject::tr("Saving ")),
                                     inDocument.GetName());
 
     bool theDisplaySaveFailDialog = false;
     bool theFileExists = inDocument.Exists();
-    CUICFile theTempFile(inDocument);
+    Qt3DSFile theTempFile(inDocument);
 
     // Test for readonly files
     if (theFileExists && inDocument.CanWrite() == false)
@@ -305,7 +305,7 @@ void CCore::OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy /*
             // if file already exists, write to a temp file first, to prevent corrupting the
             // original file.
             if (theFileExists) {
-                theTempFile = CUICFile::GetTemporaryFile();
+                theTempFile = Qt3DSFile::GetTemporaryFile();
                 // sanity check: if we fail to get a temporary file
                 if (theTempFile.GetAbsolutePosixPath().IsEmpty()) { // too bad, we'll have to use
                     // the original (which might be
diff --git a/src/Authoring/Client/Code/Core/Core/Core.h b/src/Authoring/Client/Code/Core/Core/Core.h
index e057e4e3..2e78e227 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.h
+++ b/src/Authoring/Client/Code/Core/Core/Core.h
@@ -73,16 +73,16 @@ public: // Methods
     bool LoadBuildConfigurations();
     void RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler);
 
-    void OnNewDocument(const CUICFile &inDocument, bool inCreateDirectory);
-    void OnSaveDocument(const CUICFile &inDocument, bool inSaveCopy = false);
-    void OnSaveDocumentCatcher(const CUICFile &inDocument, bool inSaveCopy = false);
+    void OnNewDocument(const Qt3DSFile &inDocument, bool inCreateDirectory);
+    void OnSaveDocument(const Qt3DSFile &inDocument, bool inSaveCopy = false);
+    void OnSaveDocumentCatcher(const Qt3DSFile &inDocument, bool inSaveCopy = false);
     void SetCommandStackModifier(ICmdStackModifier *inModifier);
     bool ExecuteCommand(CCmd *inCommand, bool inIsSynchronous = true);
     void CommitCurrentCommand();
     void SetCommandModifiedFlag(bool inModified) override;
     void CommandUpdate(unsigned long inUpdateFlags) override;
 
-    void GetCreateDirectoryFileName(const CUICFile &inDocument, Q3DStudio::CFilePath &outFinalDir,
+    void GetCreateDirectoryFileName(const Qt3DSFile &inDocument, Q3DStudio::CFilePath &outFinalDir,
                                     Q3DStudio::CFilePath &outFinalDoc);
 
     // CPresentationListener
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
index 41434270..b807494d 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.cpp
@@ -315,7 +315,7 @@ void CDispatch::FireOnLoadedSubPresentation()
  */
 void CDispatch::FireOnNewPresentation()
 {
-    UICPROFILE(FireOnNewPresentation);
+    QT3DS_PROFILE(FireOnNewPresentation);
 
     m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnNewPresentation);
 }
@@ -329,7 +329,7 @@ void CDispatch::FireOnClosingPresentation()
     m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnClosingPresentation);
 }
 
-void CDispatch::FireOnSavingPresentation(const CUICFile *inNewPresentationFile)
+void CDispatch::FireOnSavingPresentation(const Qt3DSFile *inNewPresentationFile)
 {
     m_PresentationChangeListeners.FireEvent(&CPresentationChangeListener::OnSavingPresentation,
                                             inNewPresentationFile);
@@ -428,7 +428,7 @@ void CDispatch::RemoveFileOpenListener(CFileOpenListener *inListener)
 /**
  * Fire an event to all the file open listeners that a has been opened.
  */
-void CDispatch::FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded)
+void CDispatch::FireOnOpenDocument(const Qt3DSFile &inFile, bool inSucceeded)
 {
     m_FileOpenListeners.FireEvent(&CFileOpenListener::OnOpenDocument, inFile, inSucceeded);
 }
@@ -437,7 +437,7 @@ void CDispatch::FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded)
 /**
  * Fire an event to all the file open listeners that a has been saved.
  */
-void CDispatch::FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, bool inSaveCopy)
+void CDispatch::FireOnSaveDocument(const Qt3DSFile &inFile, bool inSucceeded, bool inSaveCopy)
 {
     m_FileOpenListeners.FireEvent(&CFileOpenListener::OnSaveDocument, inFile, inSucceeded,
                                   inSaveCopy);
@@ -447,7 +447,7 @@ void CDispatch::FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, boo
 /**
  * Fire an event to all the file open listeners that a has been saved.
  */
-void CDispatch::FireOnDocumentPathChanged(const CUICFile &inNewPath)
+void CDispatch::FireOnDocumentPathChanged(const Qt3DSFile &inNewPath)
 {
     m_FileOpenListeners.FireEvent(&CFileOpenListener::OnDocumentPathChanged, inNewPath);
 }
diff --git a/src/Authoring/Client/Code/Core/Core/Dispatch.h b/src/Authoring/Client/Code/Core/Core/Dispatch.h
index 16c817bd..8a70923e 100644
--- a/src/Authoring/Client/Code/Core/Core/Dispatch.h
+++ b/src/Authoring/Client/Code/Core/Core/Dispatch.h
@@ -51,7 +51,7 @@
 class CSceneDragListener;
 class CSelectionChangeListener;
 class CAsset;
-class CUICFile;
+class Qt3DSFile;
 class CURL;
 class CPresentationChangeListener;
 class CResourceChangeListener;
@@ -137,7 +137,7 @@ public:
     void FireOnLoadedSubPresentation();
     void FireOnNewPresentation();
     void FireOnClosingPresentation();
-    void FireOnSavingPresentation(const CUICFile *inNewPresentationFile = NULL);
+    void FireOnSavingPresentation(const Qt3DSFile *inNewPresentationFile = NULL);
     void FireOnExportingAsset(qt3dsdm::Qt3DSDMInstanceHandle inInstance);
     void FireOnPresentationModifiedExternally();
 
@@ -153,9 +153,9 @@ public:
 
     void AddFileOpenListener(CFileOpenListener *inListener);
     void RemoveFileOpenListener(CFileOpenListener *inListener);
-    void FireOnOpenDocument(const CUICFile &inFile, bool inSucceeded);
-    void FireOnSaveDocument(const CUICFile &inFile, bool inSucceeded, bool inSaveCopy);
-    void FireOnDocumentPathChanged(const CUICFile &inNewPath);
+    void FireOnOpenDocument(const Qt3DSFile &inFile, bool inSucceeded);
+    void FireOnSaveDocument(const Qt3DSFile &inFile, bool inSucceeded, bool inSaveCopy);
+    void FireOnDocumentPathChanged(const Qt3DSFile &inNewPath);
 
     // Toolbar changes
     void AddToolbarChangeListener(CToolbarChangeListener *inListener);
diff --git a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
index 8ed46f08..fd63d85c 100644
--- a/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
+++ b/src/Authoring/Client/Code/Core/Core/DispatchListeners.h
@@ -46,7 +46,7 @@
 //==============================================================================
 
 class CAsset;
-class CUICFile;
+class Qt3DSFile;
 class CURL;
 class ISelectable;
 class CCmd;
@@ -179,7 +179,7 @@ public:
     /**
      * The current presentation is being saved.
      */
-    virtual void OnSavingPresentation(const CUICFile *inNewPresentationFile)
+    virtual void OnSavingPresentation(const Qt3DSFile *inNewPresentationFile)
     {
         Q_UNUSED(inNewPresentationFile);
     }
@@ -226,9 +226,9 @@ public:
 class CFileOpenListener
 {
 public:
-    virtual void OnOpenDocument(const CUICFile &inFilename, bool inSucceeded) = 0;
-    virtual void OnSaveDocument(const CUICFile &inFilename, bool inSucceeded, bool inSaveCopy) = 0;
-    virtual void OnDocumentPathChanged(const CUICFile &inNewPath) = 0;
+    virtual void OnOpenDocument(const Qt3DSFile &inFilename, bool inSucceeded) = 0;
+    virtual void OnSaveDocument(const Qt3DSFile &inFilename, bool inSucceeded, bool inSaveCopy) = 0;
+    virtual void OnDocumentPathChanged(const Qt3DSFile &inNewPath) = 0;
 };
 
 class CSelectedNodePropChangeListener
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
index a249a68c..6e0625c8 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp
@@ -880,7 +880,7 @@ qt3dsdm::Qt3DSDMInstanceHandle CClientDataModelBridge::GetInstance(qt3dsdm::Qt3D
 std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
 CClientDataModelBridge::CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
                                             Qt3DSDMPropertyHandle inSlot,
-                                            Qt3DSDMSlideHandle inUICDMSlide)
+                                            Qt3DSDMSlideHandle inSlide)
 {
     Qt3DSDMInstanceHandle theNewInstance =
         m_Doc->GetStudioSystem()
@@ -908,8 +908,8 @@ CClientDataModelBridge::CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSou
                                          SValue(theInstanceLong4));
 
     // Library objects does not need to be associated with any slide.
-    if (inUICDMSlide.Valid())
-        m_Doc->GetStudioSystem()->GetSlideSystem()->AssociateInstanceWithSlide(inUICDMSlide,
+    if (inSlide.Valid())
+        m_Doc->GetStudioSystem()->GetSlideSystem()->AssociateInstanceWithSlide(inSlide,
                                                                                theNewInstance);
 
     if (m_DefaultMaterial.m_SpecularReflection.m_Property
@@ -1041,7 +1041,7 @@ CClientDataModelBridge::GetUniqueChildName(qt3dsdm::Qt3DSDMInstanceHandle inPare
 
         // If the name is in use then increment the index until one is found.
         while (theExistingChild != 0 && theExistingChild != inInstance) {
-            theUniqueName.Format(_UIC("%ls%d"), static_cast<const wchar_t *>(theBaseName), theIndex);
+            theUniqueName.Format(_LSTR("%ls%d"), static_cast<const wchar_t *>(theBaseName), theIndex);
             ++theIndex;
             theExistingChild = GetChildByName(inParent, theUniqueName);
         }
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
index dc212a7b..60f2b384 100644
--- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
+++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.h
@@ -47,7 +47,7 @@ class IDataCore;
 class ISlideGraphCore;
 class ISlideCore;
 class IAnimationCore;
-struct SUICDMPropertyDefinition;
+struct Qt3DSDMPropertyDefinition;
 class IPropertySystem;
 class IInstancePropertyCore;
 class ISignalConnection;
@@ -245,9 +245,9 @@ public: // Operations which likely don't belong on this class
                                                 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
+public: // Bridging to Actions. These needs to be here as DataModel 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.
+    // We should really reconsider to have the hierachcy store outside of DataModel.
     void GetReferencedActions(qt3dsdm::Qt3DSDMInstanceHandle inReferencedInstance,
                               long inReferencedMode, qt3dsdm::TActionHandleList &outActions);
     void UpdateHandlerArgumentValue(qt3dsdm::HandlerArgumentType::Value inArgType,
@@ -340,7 +340,7 @@ public: // helpers
 
     std::pair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::SLong4>
     CreateImageInstance(qt3dsdm::Qt3DSDMInstanceHandle inSourceInstance,
-                        qt3dsdm::Qt3DSDMPropertyHandle inSlot, qt3dsdm::Qt3DSDMSlideHandle inUICDMSlide);
+                        qt3dsdm::Qt3DSDMPropertyHandle inSlot, qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
     void SetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle, const Q3DStudio::CString &inName);
     Q3DStudio::CString GetName(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index f5870b42..de555b98 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -390,7 +390,7 @@ qt3dsdm::Qt3DSDMInstanceHandle
 CDoc::GetInstanceFromSelectable(Q3DStudio::SSelectedValue inSelectedItem)
 {
     if (inSelectedItem.getType() == Q3DStudio::SelectedValueTypes::Instance) {
-        // This is UICDM asset. Find corresponding CAsset if there is any
+        // This is DataModel asset. Find corresponding CAsset if there is any
         return inSelectedItem.getData<qt3dsdm::Qt3DSDMInstanceHandle>();
     } else if (inSelectedItem.getType() == Q3DStudio::SelectedValueTypes::MultipleInstances) {
         const qt3dsdm::TInstanceHandleList &theData =
@@ -414,7 +414,7 @@ CCore *CDoc::GetCore()
 
 //=============================================================================
 /**
- *	Calls NotifyActiveSlideChanged( UICDM::Qt3DSDMSlideHandle inNewActiveSlide, bool
+ *	Calls NotifyActiveSlideChanged( qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide, bool
  *inForceRefresh )
  *	Could not make this on optional param because someone is calling from CGenericCmd that
  *	seems to only allow 1 param.
@@ -449,7 +449,7 @@ void CDoc::SetActiveSlideChange(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide)
 
         // Disable the active layer and set it lazily.
 
-        // Set active slide to UICDM
+        // Set active slide to DataModel
     }
 }
 
@@ -538,7 +538,7 @@ void CDoc::NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide
         if (theNextSelectedInstance.Valid() == false)
             theNextSelectedInstance = GetDocumentReader().GetComponentForSlide(inNewActiveSlide);
 
-        SelectUICDMObject(theNextSelectedInstance);
+        SelectDataModelObject(theNextSelectedInstance);
     }
 }
 
@@ -678,7 +678,7 @@ void CDoc::CutObject(qt3dsdm::TInstanceHandleList inInstances)
 
     if (theContinueCutFlag) {
         CFilePath thePath(GetDocumentReader().CopySceneGraphObjects(inInstances));
-        CUICFile theFile(thePath);
+        Qt3DSFile theFile(thePath);
         CStudioClipboard::CopyObjectToClipboard(
             theFile, false, false,
             m_StudioSystem->GetClientDataModelBridge()->GetObjectType(inInstances[0]));
@@ -694,7 +694,7 @@ void CDoc::CopyObject(qt3dsdm::TInstanceHandleList inInstances)
         return;
     using namespace Q3DStudio;
     CFilePath thePath(GetDocumentReader().CopySceneGraphObjects(inInstances));
-    CUICFile theFile(thePath);
+    Qt3DSFile theFile(thePath);
     CStudioClipboard::CopyObjectToClipboard(
         theFile, false, false,
         m_StudioSystem->GetClientDataModelBridge()->GetObjectType(inInstances[0]));
@@ -705,7 +705,7 @@ void CDoc::PasteObject(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     using namespace Q3DStudio;
     qt3dsdm::Qt3DSDMInstanceHandle theInstance(inInstance);
     qint64 dummy = 0;
-    CUICFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
+    Qt3DSFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
     SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Paste Object"))
         ->PasteSceneGraphObject(theTempAPFile.GetAbsolutePath(), theInstance, true,
                                 DocumentEditorInsertType::LastChild, CPt());
@@ -716,7 +716,7 @@ void CDoc::PasteObjectMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
     using namespace Q3DStudio;
     qt3dsdm::Qt3DSDMInstanceHandle theInstance(inInstance);
     qint64 dummy = 0;
-    CUICFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
+    Qt3DSFile theTempAPFile = CStudioClipboard::GetObjectFromClipboard(false, dummy);
     SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Paste Object"))
         ->PasteSceneGraphObjectMaster(theTempAPFile.GetAbsolutePath(), theInstance, true,
                                       DocumentEditorInsertType::LastChild, CPt());
@@ -1081,10 +1081,10 @@ Q3DStudio::SSelectedValue CDoc::SetupInstanceSelection(qt3dsdm::Qt3DSDMInstanceH
 
 //==============================================================================
 /**
- *	Select UICDM Object given its instance handle.
- *	@param inInstanceHandle The instance handle of the UICDM Object to be selected
+ *	Select DataModel Object given its instance handle.
+ *	@param inInstanceHandle The instance handle of the DataModel Object to be selected
  */
-void CDoc::SelectUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
+void CDoc::SelectDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     qt3dsdm::TInstanceHandleList theObjects = m_SelectedValue.GetSelectedInstances();
     if (std::find(theObjects.begin(), theObjects.end(), inInstanceHandle) == theObjects.end())
@@ -1093,7 +1093,7 @@ void CDoc::SelectUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
         NotifySelectionChanged(theObjects);
 }
 
-void CDoc::ToggleUICDMObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
+void CDoc::ToggleDataModelObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
 {
     if (m_StudioSystem->GetClientDataModelBridge()->IsMultiSelectable(inInstance)) {
         qt3dsdm::TInstanceHandleList theNewHandles;
@@ -1119,7 +1119,7 @@ void CDoc::ToggleUICDMObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstanc
     }
 }
 
-void CDoc::SelectAndNavigateToUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
+void CDoc::SelectAndNavigateToDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle)
 {
     if (inInstanceHandle.Valid() == false) {
         QT3DS_ASSERT(false);
@@ -1163,7 +1163,7 @@ void CDoc::OnComponentSeconds()
     long theTime = GetCurrentClientTime();
 
     m_CurrentViewTime = theTime;
-    UICPROFILE(NotifyTimeChanged_UpdateAllViews);
+    QT3DS_PROFILE(NotifyTimeChanged_UpdateAllViews);
 
     m_Core->GetDispatch()->FireOnTimeChanged(m_CurrentViewTime);
 }
@@ -1182,7 +1182,7 @@ void CDoc::NotifyTimeChanged(long inNewTime)
 
 void CDoc::DoNotifyTimeChanged(long inNewTime)
 {
-    UICPROFILE(NotifyTimeChanged);
+    QT3DS_PROFILE(NotifyTimeChanged);
 
     // Make sure time is within valid range
     long theMinTime = 0; // min time is always 0
@@ -1194,7 +1194,7 @@ void CDoc::DoNotifyTimeChanged(long inNewTime)
             inNewTime = theLatestEndTime;
     }
 
-    // Update UICDM
+    // Update DataModel
     qt3dsdm::Qt3DSDMSlideHandle theMasterSlide =
         m_StudioSystem->GetSlideSystem()->GetMasterSlide(GetActiveSlide());
     // TODO: fix precision issue from converting to/from float & long. choose 1 type
@@ -1298,7 +1298,7 @@ Q3DStudio::IDirectoryWatchingSystem *CDoc::GetDirectoryWatchingSystem()
     return m_DirectoryWatchingSystem ? m_DirectoryWatchingSystem.get() : NULL;
 }
 
-void CDoc::SetDocumentPath(const CUICFile &inDocumentPath)
+void CDoc::SetDocumentPath(const Qt3DSFile &inDocumentPath)
 {
     Q3DStudio::CString theDocPath = inDocumentPath.GetName();
     // We always need to have a document path.
@@ -1314,7 +1314,7 @@ void CDoc::SetDocumentPath(const CUICFile &inDocumentPath)
     }
 
     // Document path should always be absolute path
-    ASSERT(!CUICFile::IsPathRelative(m_DocumentPath.GetPath()));
+    ASSERT(!Qt3DSFile::IsPathRelative(m_DocumentPath.GetPath()));
     // Document path should exist.
     Q_ASSERT(m_DocumentPath.Exists());
 
@@ -1325,21 +1325,21 @@ void CDoc::SetDocumentPath(const CUICFile &inDocumentPath)
 /**
  * Create Untitled document in user directory
  */
-CUICFile CDoc::CreateUntitledDocument() const
+Qt3DSFile CDoc::CreateUntitledDocument() const
 {
     Q3DStudio::CFilePath theAppDirectory = Q3DStudio::CFilePath::GetUserApplicationDirectory();
-    Q3DStudio::CFilePath theUICDirectory = Q3DStudio::CFilePath::CombineBaseAndRelative(
-        theAppDirectory, Q3DStudio::CFilePath(L"Qt3DSomposer/Untitled"));
-    theUICDirectory.CreateDir(true);
-    Q3DStudio::CFilePath theUICFilePath = Q3DStudio::CFilePath::CombineBaseAndRelative(
-        theUICDirectory, Q3DStudio::CFilePath(L"Untitled.uip"));
+    Q3DStudio::CFilePath theDirectory = Q3DStudio::CFilePath::CombineBaseAndRelative(
+        theAppDirectory, Q3DStudio::CFilePath(L"Qt3DSComposer/Untitled"));
+    theDirectory.CreateDir(true);
+    Q3DStudio::CFilePath theFilePath = Q3DStudio::CFilePath::CombineBaseAndRelative(
+        theDirectory, Q3DStudio::CFilePath(L"Untitled.uip"));
     // Keep jokers from screwing with our system.
-    if (theUICFilePath.IsDirectory())
-        theUICFilePath.DeleteThisDirectory(true);
+    if (theFilePath.IsDirectory())
+        theFilePath.DeleteThisDirectory(true);
 
-    if (!theUICFilePath.IsFile())
-        theUICFilePath.Touch();
-    return CUICFile(theUICFilePath);
+    if (!theFilePath.IsFile())
+        theFilePath.Touch();
+    return Qt3DSFile(theFilePath);
 }
 
 void CDoc::SetImportFailedHandler(std::shared_ptr<Q3DStudio::IImportFailedHandler> inHandler)
@@ -1358,7 +1358,7 @@ void CDoc::SetDocMessageBoxHandler(
     m_DeletingReferencedObjectHandler = inHandler;
 }
 
-CUICFile CDoc::GetDocumentPath() const
+Qt3DSFile CDoc::GetDocumentPath() const
 {
     return m_DocumentPath;
 }
@@ -1461,7 +1461,7 @@ void CDoc::CloseDocument()
 /**
  * Called when the core opens a UIP file.
  */
-void CDoc::LoadDocument(const CUICFile &inDocument)
+void CDoc::LoadDocument(const Qt3DSFile &inDocument)
 {
     ResetData();
 
@@ -1476,7 +1476,7 @@ void CDoc::LoadDocument(const CUICFile &inDocument)
 /**
  * Save Document
  */
-void CDoc::SaveDocument(const CUICFile &inDocument)
+void CDoc::SaveDocument(const Qt3DSFile &inDocument)
 {
     CFileOutputStream theFileStream(inDocument.GetAbsolutePosixPath());
     // Exceptions here get propagated to the crash dialog.
@@ -1919,7 +1919,7 @@ bool CDoc::VerifyCanRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset)
         // theMessage.Format( theFormat, static_cast<const wchar_t*>( theFormulatedString ) );
         //
         // if ( m_StudioApp->GetDialogs( )->DisplayMessageBox( theTitle, theMessage,
-        // CUICMessageBox::ICON_WARNING, true ) == CUICMessageBox::MSGBX_CANCEL )
+        // Qt3DSMessageBox::ICON_WARNING, true ) == Qt3DSMessageBox::MSGBX_CANCEL )
         theResult = false;
     }
     return theResult;
@@ -2083,7 +2083,7 @@ void CDoc::LoadStudioData(CBufferedInputStream *inInputStream)
     using namespace qt3dsdm;
     using namespace Q3DStudio;
 
-    UICPROFILE(LoadStudioData);
+    QT3DS_PROFILE(LoadStudioData);
     bool theModifiedFlag = false;
 
     try {
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h
index 176d0101..ae37f141 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.h
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.h
@@ -66,7 +66,6 @@ class CBufferedInputStream;
 class CBufferedOutputStream;
 class CDataManager;
 class CClientDataModelBridge;
-class IUICDMSerializer;
 class IKeyframesManager;
 class IObjectReferenceHelper;
 class CCore;
@@ -163,18 +162,18 @@ public:
 
     // The system may be null in the case where we are running without a UI.
     Q3DStudio::IDirectoryWatchingSystem *GetDirectoryWatchingSystem();
-    void SetDocumentPath(const CUICFile &inFile);
-    CUICFile GetDocumentPath() const;
+    void SetDocumentPath(const Qt3DSFile &inFile);
+    Qt3DSFile GetDocumentPath() const;
     bool IsInDocSubDirectory(const Q3DStudio::CString &inPath) const;
     Q3DStudio::CString GetDocumentDirectory() const;
     Q3DStudio::CString GetRelativePathToDoc(const Q3DStudio::CFilePath &inPath);
     Q3DStudio::CString GetResolvedPathToDoc(const Q3DStudio::CFilePath &inPath);
 
-    CUICFile CreateUntitledDocument() const;
+    Qt3DSFile CreateUntitledDocument() const;
 
     void CloseDocument();
-    void LoadDocument(const CUICFile &inDocument);
-    void SaveDocument(const CUICFile &inDocument);
+    void LoadDocument(const Qt3DSFile &inDocument);
+    void SaveDocument(const Qt3DSFile &inDocument);
     void CreateNewDocument();
     QString GetDocumentUIAFile();
     void LoadUIASubpresentations(const QString &uiaFile,
@@ -305,10 +304,10 @@ public:
     virtual std::shared_ptr<qt3dsdm::IDOMReader> CreateDOMReader(CBufferedInputStream &inStream,
                                                                  qt3ds::QT3DSI32 &outVersion);
 
-    void SelectUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
+    void SelectDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
     // multiselect support
-    void ToggleUICDMObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
-    void SelectAndNavigateToUICDMObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
+    void ToggleDataModelObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
+    void SelectAndNavigateToDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle);
     long GetLatestEndTime();
 
     CCore *GetCore() override;
@@ -423,7 +422,7 @@ protected:
     CCore *m_Core;
     bool m_IsModified;
     bool m_IsTemporary;
-    CUICFile m_DocumentPath;
+    Qt3DSFile m_DocumentPath;
 
     CDataManager *m_DataManager; ///< Manager for handling data properties.
 
@@ -458,7 +457,7 @@ public:
 
 protected:
     CRenderContext *m_RenderContext; ///< The render context attached to this player's window.
-    UICRenderDevice m_WindowHandle; ///< The window handle to which to render
+    Qt3DSRenderDevice m_WindowHandle; ///< The window handle to which to render
     Q3DStudio::CRect m_ClientSize;
     Q3DStudio::CRect m_SceneRect; ///< The dimensions of the active scene view
 };
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index a6ec3a26..226152c5 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -109,12 +109,12 @@ inline float ToDeg(float numberRad)
     return (QT3DSF32)57.29577951308232286465 * numberRad;
 }
 
-inline SFloat3 ToUICDM(QT3DSVec3 inData)
+inline SFloat3 ToDataModel(QT3DSVec3 inData)
 {
     return SFloat3(inData.x, inData.y, inData.z);
 }
 
-inline SFloat2 ToUICDM(QT3DSVec2 inData)
+inline SFloat2 ToDataModel(QT3DSVec2 inData)
 {
     return SFloat2(inData.x, inData.y);
 }
@@ -124,14 +124,14 @@ inline QT3DSVec2 ToFnd(SFloat2 value)
     return QT3DSVec2(value.m_Floats[0], value.m_Floats[1]);
 }
 
-inline QT3DSF32 ToUICDM(Option<QT3DSF32> inValue, QT3DSF32 inDefault)
+inline QT3DSF32 ToDataModel(Option<QT3DSF32> inValue, QT3DSF32 inDefault)
 {
     if (inValue.hasValue())
         return *inValue;
     return inDefault;
 }
 
-inline bool ToUICDM(Option<bool> inValue, bool inDefault)
+inline bool ToDataModel(Option<bool> inValue, bool inDefault)
 {
     if (inValue.hasValue())
         return *inValue;
@@ -773,7 +773,7 @@ public:
     CFilePath WriteWriterToFile(IDOMWriter &inWriter, const CString &inStem)
     {
         CFilePath theTempFileDir = CFilePath::CombineBaseAndRelative(
-            CFilePath::GetUserApplicationDirectory(), CFilePath(L"Qt3DSomposer\\temp_files"));
+            CFilePath::GetUserApplicationDirectory(), CFilePath(L"Qt3DSComposer\\temp_files"));
         theTempFileDir.CreateDir(true);
         CFilePath theFinalPath;
         {
@@ -781,7 +781,7 @@ public:
 
             theFinalPath = theFile->m_Path;
 
-            CUICFile::AddTempFile(theFile->m_Path);
+            Qt3DSFile::AddTempFile(theFile->m_Path);
 
             SFilePtrOutStream theFileStream(theFile);
 
@@ -1698,7 +1698,7 @@ public:
                 m_ActionCore.SetHandlerArgumentValue(theParamHandle, theArgData.m_Value);
             }
         }
-        m_Doc.SelectUICDMObject(newMaterial);
+        m_Doc.SelectDataModelObject(newMaterial);
     }
 
     void SetSlideName(TInstanceHandle inSlideInstance, TPropertyHandle propName,
@@ -2151,7 +2151,7 @@ public:
         if (inSetTimeRangeToParent)
             SetTimeRangeToParent(inInstance);
         if (inSelectInstanceWhenFinished)
-            m_Doc.SelectUICDMObject(inInstance);
+            m_Doc.SelectDataModelObject(inInstance);
         return inInstance;
     }
 
@@ -2392,7 +2392,7 @@ public:
         SetTimeRange(component, theStartEndTimes.first, theStartEndTimes.second);
         SetName(component, theName);
 
-        m_Doc.SelectUICDMObject(component);
+        m_Doc.SelectDataModelObject(component);
         return component;
     }
 
@@ -2549,7 +2549,7 @@ public:
         CheckSlideGroupPlayThroughTo(theNewSlide);
         Qt3DSDMInstanceHandle theInstance = m_Doc.GetSelectedInstance();
         if (theInstance.Valid() && GetAssociatedSlide(theInstance) != inMasterSlide)
-            m_Doc.SelectUICDMObject(0);
+            m_Doc.SelectDataModelObject(0);
         return theNewSlide;
     }
 
@@ -2560,7 +2560,7 @@ public:
         m_SlideSystem.GetAssociatedInstances(inSlide, theInstances);
         for (size_t idx = 0, end = theInstances.size(); idx < end; ++idx) {
             // Action instances are also associated with slides but they need to be deleted
-            // by UICDM when the action itself is deleted rather than by us right here.
+            // by DataModel when the action itself is deleted rather than by us right here.
             TInstanceHandle theInstance(theInstances[idx]);
             if (m_SlideSystem.GetAssociatedSlide(theInstance) == inSlide && IsInstance(theInstance)
                 && m_DataCore.IsInstanceOrDerivedFrom(
@@ -2746,7 +2746,7 @@ public:
         if (docPath.size() == 0) {
             if (theHandler)
                 theHandler->DisplayImportFailed(importSrc.toQString(),
-                                                QObject::tr("Qt3DSomposer Document Has No Path"),
+                                                QObject::tr("Qt3DSComposer Document Has No Path"),
                                                 false);
             return 0;
         }
@@ -3533,11 +3533,11 @@ public:
     TInstanceHandle ParseSVGPath(TInstanceHandle inParent, TSlideHandle inSlide,
                                  eastl::vector<Q3DStudio::CString> &inExistingNames)
     {
-        QT3DSF32 strokeWidth = ToUICDM(m_LuaState->NumberFromTopOfStackTable("stroke-width"), 1.0f);
-        QT3DSF32 pathOpacity = ToUICDM(m_LuaState->NumberFromTopOfStackTable("opacity"), 100.0f);
-        QT3DSF32 fillOpacity = ToUICDM(m_LuaState->NumberFromTopOfStackTable("fill-opacity"), 100.0f);
+        QT3DSF32 strokeWidth = ToDataModel(m_LuaState->NumberFromTopOfStackTable("stroke-width"), 1.0f);
+        QT3DSF32 pathOpacity = ToDataModel(m_LuaState->NumberFromTopOfStackTable("opacity"), 100.0f);
+        QT3DSF32 fillOpacity = ToDataModel(m_LuaState->NumberFromTopOfStackTable("fill-opacity"), 100.0f);
         QT3DSF32 strokeOpacity =
-            ToUICDM(m_LuaState->NumberFromTopOfStackTable("stroke-opacity"), 100.0f);
+            ToDataModel(m_LuaState->NumberFromTopOfStackTable("stroke-opacity"), 100.0f);
         Option<QT3DSVec3> fillColor = m_LuaState->Vec3FromTopOfStackTable("fill");
         Option<QT3DSVec3> strokeColor = m_LuaState->Vec3FromTopOfStackTable("stroke");
         eastl::string pathName = m_LuaState->StringFromTopOfStackTable("name");
@@ -3566,7 +3566,7 @@ public:
             wchar_t theNameBuffer[256];
             swprintf(theNameBuffer, 256, L"SubPath_%d", childIndex);
             SetName(subpath, theNameBuffer);
-            bool isClosed = ToUICDM(m_LuaState->BooleanFromTopOfStackTable("closepath"), true);
+            bool isClosed = ToDataModel(m_LuaState->BooleanFromTopOfStackTable("closepath"), true);
             theSlideCore.ForceSetInstancePropertyValue(inSlide, subpath, theDefs.m_SubPath.m_Closed,
                                                        isClosed);
             // Note that this pops the child off the stack so it is no longer available as it is the
@@ -3674,7 +3674,7 @@ public:
                 m_AssetGraph.GetChild(retval, fillMaterialIndex);
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theFillMaterial, m_Bridge.GetObjectDefinitions().m_Material.m_DiffuseColor,
-                ToUICDM(*fillColor));
+                ToDataModel(*fillColor));
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theFillMaterial, m_Bridge.GetObjectDefinitions().m_Material.m_Opacity,
                 fillOpacity);
@@ -3683,7 +3683,7 @@ public:
             qt3dsdm::Qt3DSDMInstanceHandle theStrokeMaterial = m_AssetGraph.GetChild(retval, 0);
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theStrokeMaterial,
-                m_Bridge.GetObjectDefinitions().m_Material.m_DiffuseColor, ToUICDM(*strokeColor));
+                m_Bridge.GetObjectDefinitions().m_Material.m_DiffuseColor, ToDataModel(*strokeColor));
             theSlideCore.ForceSetInstancePropertyValue(
                 inSlide, theStrokeMaterial, m_Bridge.GetObjectDefinitions().m_Material.m_Opacity,
                 strokeOpacity);
@@ -4187,7 +4187,7 @@ public:
                 theCurrentPosition = ToFnd(NextDataItem(theLoadedBuffer->m_Data, dataIdx));
                 theSlideCore.ForceSetInstancePropertyValue(theCurrentSlide, theCurrentAnchorPoint,
                                                            positionProp,
-                                                           ToUICDM(theCurrentPosition));
+                                                           ToDataModel(theCurrentPosition));
                 ++subPathIndex;
                 break;
             case qt3dsimp::PathCommand::CubicCurveTo: {
@@ -4212,7 +4212,7 @@ public:
                 SetName(theCurrentAnchorPoint, L"PathAnchorPoint");
                 theSlideCore.ForceSetInstancePropertyValue(theCurrentSlide, theCurrentAnchorPoint,
                                                            positionProp,
-                                                           ToUICDM(theCurrentPosition));
+                                                           ToDataModel(theCurrentPosition));
                 theSlideCore.ForceSetInstancePropertyValue(theCurrentSlide, theCurrentAnchorPoint,
                                                            incomingdistanceProp, incoming.y);
                 if (fabs(incoming.y) > .01f)
diff --git a/src/Authoring/Client/Code/Core/Doc/Exceptions.h b/src/Authoring/Client/Code/Core/Doc/Exceptions.h
index 97e21381..49fa6b71 100644
--- a/src/Authoring/Client/Code/Core/Doc/Exceptions.h
+++ b/src/Authoring/Client/Code/Core/Doc/Exceptions.h
@@ -60,7 +60,7 @@ public:
     virtual ~CNoClientException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Client is not installed"));
+        return Q3DStudio::CString(_LSTR("Client is not installed"));
     }
 };
 
@@ -71,7 +71,7 @@ public:
     virtual ~CClientCreationException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Unable to create Client"));
+        return Q3DStudio::CString(_LSTR("Unable to create Client"));
     }
 };
 
@@ -82,7 +82,7 @@ public:
     virtual ~CInvalidFileFormatException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Invalid file format"));
+        return Q3DStudio::CString(_LSTR("Invalid file format"));
     }
 };
 
@@ -93,7 +93,7 @@ public:
     virtual ~CUnsupportedFileFormatException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Unsupported file format"));
+        return Q3DStudio::CString(_LSTR("Unsupported file format"));
     }
 };
 
@@ -102,7 +102,7 @@ class CENotImplException : public CStudioException
 public:
     CENotImplException() {}
     virtual ~CENotImplException() {}
-    const wchar_t *GetDescription() const override { return Q3DStudio::CString(_UIC("ENOTIMPL")); }
+    const wchar_t *GetDescription() const override { return Q3DStudio::CString(_LSTR("ENOTIMPL")); }
 };
 
 class CInvalidArgumentsException : public CStudioException
@@ -112,7 +112,7 @@ public:
     virtual ~CInvalidArgumentsException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Invalid Argument"));
+        return Q3DStudio::CString(_LSTR("Invalid Argument"));
     }
 };
 
@@ -123,7 +123,7 @@ public:
     virtual ~CNullPointerException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Null Pointer Error"));
+        return Q3DStudio::CString(_LSTR("Null Pointer Error"));
     }
 };
 
@@ -134,7 +134,7 @@ public:
     virtual ~CUnexpectedResultException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Unexpected Result"));
+        return Q3DStudio::CString(_LSTR("Unexpected Result"));
     }
 };
 
@@ -145,7 +145,7 @@ public:
     virtual ~CClientFailException() {}
     const wchar_t *GetDescription() const override
     {
-        return Q3DStudio::CString(_UIC("Client Failure"));
+        return Q3DStudio::CString(_LSTR("Client Failure"));
     }
 };
 
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index 948e65aa..ee3dd160 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -621,7 +621,7 @@ struct SComposerSerializerImpl : public IComposerSerializer
                 for (size_t propIdx = 0, propEnd = theProperties.size();
                      propIdx < propEnd && theProperty.Valid() == false; ++propIdx) {
                     SValue theValue;
-                    const SUICDMPropertyDefinition &theDefinition(
+                    const Qt3DSDMPropertyDefinition &theDefinition(
                                 m_DataCore.GetProperty(theProperties[propIdx]));
                     if (theDefinition.m_Type == DataModelDataType::Long4) {
                         SValue theDCValue;
@@ -938,8 +938,8 @@ struct SComposerSerializerImpl : public IComposerSerializer
         {
             SAnimationInfo lhsInfo(m_AnimationCore.GetAnimationInfo(lhs));
             SAnimationInfo rhsInfo(m_AnimationCore.GetAnimationInfo(rhs));
-            const SUICDMPropertyDefinition &theLhsDef(m_DataCore.GetProperty(lhsInfo.m_Property));
-            const SUICDMPropertyDefinition &theRhsDef(m_DataCore.GetProperty(rhsInfo.m_Property));
+            const Qt3DSDMPropertyDefinition &theLhsDef(m_DataCore.GetProperty(lhsInfo.m_Property));
+            const Qt3DSDMPropertyDefinition &theRhsDef(m_DataCore.GetProperty(rhsInfo.m_Property));
             int theComparison = theLhsDef.m_Name.compare(theRhsDef.m_Name);
             if (theComparison == 0)
                 return lhsInfo.m_Index < rhsInfo.m_Index;
@@ -2648,16 +2648,16 @@ struct SComposerSerializerImpl : public IComposerSerializer
         {
             m_PreserveFileIds = inPreserveVariable;
             // The act of preserving file ids means that we have to write information
-            // into UICDM.  Nothing expects this at this time and this information really shouldn't
+            // into DataModel.  Nothing expects this at this time and this information really shouldn't
             // be transmitted into the universe.  Transmitting the changes could cause the rendering
             // system to render the scene a bunch.
             m_PreserveFileIds = true;
-            SetUICDMSignalsEnabled(false);
+            SetDataModelSignalsEnabled(false);
         }
         ~ScopedPreserveFileIds()
         {
             m_PreserveFileIds = false;
-            SetUICDMSignalsEnabled(true);
+            SetDataModelSignalsEnabled(true);
         }
     };
 
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
index 2b3fb0c2..804e1228 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentReader.h
@@ -71,7 +71,7 @@ using qt3dsdm::SValue;
 using qt3dsdm::IDOMReader;
 using qt3dsdm::IDOMWriter;
 
-// Reader class to read complex information from the document.  Encapsulates the various UICDM
+// Reader class to read complex information from the document.  Encapsulates the various DataModel
 // subsystems
 // Implemented in DocumentEditor.cpp
 class IDocumentReader
@@ -214,7 +214,7 @@ public:
     virtual void SetGuidesEditable(bool inEditable) = 0;
 
     // Given the active slide on the document (which we query) and an instance,
-    // produce a temporary file (CUICFile::GetTemporaryFile) and serialize this object
+    // produce a temporary file (Qt3DSFile::GetTemporaryFile) and serialize this object
     // to that temporary file.
     virtual CFilePath CopySceneGraphObjects(qt3dsdm::TInstanceHandleList inInstances) = 0;
 
diff --git a/src/Authoring/Client/Code/Core/Doc/PathImportTranslator.cpp b/src/Authoring/Client/Code/Core/Doc/PathImportTranslator.cpp
index b9ed763d..c0833c56 100644
--- a/src/Authoring/Client/Code/Core/Doc/PathImportTranslator.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/PathImportTranslator.cpp
@@ -141,17 +141,17 @@ QT3DSU64 SPathImportTranslator::ParseSVGGroup(TInstanceHandle inParent,
 }
 
 namespace {
-QT3DSF32 ToUICDM(Option<QT3DSF32> inData, QT3DSF32 inDefault)
+QT3DSF32 ToDataModel(Option<QT3DSF32> inData, QT3DSF32 inDefault)
 {
     if (inData.hasValue())
         return *inData;
     return inDefault;
 }
-SFloat3 ToUICDM(const QT3DSVec3 &inData)
+SFloat3 ToDataModel(const QT3DSVec3 &inData)
 {
     return SFloat3(inData.x, inData.y, inData.z);
 }
-bool ToUICDM(Option<bool> inData, bool inDefault)
+bool ToDataModel(Option<bool> inData, bool inDefault)
 {
     if (inData.hasValue())
         return *inData;
@@ -162,10 +162,10 @@ bool ToUICDM(Option<bool> inData, bool inDefault)
 QT3DSU64 SPathImportTranslator::ParseSVGPath(TInstanceHandle inParent,
                                           eastl::vector<Q3DStudio::CString> &inExistingNames)
 {
-    QT3DSF32 strokeWidth = ToUICDM(m_LuaState.NumberFromTopOfStackTable("stroke-width"), 1.0f);
-    QT3DSF32 pathOpacity = ToUICDM(m_LuaState.NumberFromTopOfStackTable("opacity"), 100.0f);
-    QT3DSF32 fillOpacity = ToUICDM(m_LuaState.NumberFromTopOfStackTable("fill-opacity"), 100.0f);
-    QT3DSF32 strokeOpacity = ToUICDM(m_LuaState.NumberFromTopOfStackTable("stroke-opacity"), 100.0f);
+    QT3DSF32 strokeWidth = ToDataModel(m_LuaState.NumberFromTopOfStackTable("stroke-width"), 1.0f);
+    QT3DSF32 pathOpacity = ToDataModel(m_LuaState.NumberFromTopOfStackTable("opacity"), 100.0f);
+    QT3DSF32 fillOpacity = ToDataModel(m_LuaState.NumberFromTopOfStackTable("fill-opacity"), 100.0f);
+    QT3DSF32 strokeOpacity = ToDataModel(m_LuaState.NumberFromTopOfStackTable("stroke-opacity"), 100.0f);
     Option<QT3DSVec3> fillColor = m_LuaState.Vec3FromTopOfStackTable("fill");
     Option<QT3DSVec3> strokeColor = m_LuaState.Vec3FromTopOfStackTable("stroke");
     eastl::string pathName = m_LuaState.StringFromTopOfStackTable("name");
@@ -191,7 +191,7 @@ QT3DSU64 SPathImportTranslator::ParseSVGPath(TInstanceHandle inParent,
 
     for (bool success = m_LuaState.GetChildFromTopOfStackTable(childIndex); success;
          ++childIndex, success = m_LuaState.GetChildFromTopOfStackTable(childIndex)) {
-        bool isClosed = ToUICDM(m_LuaState.BooleanFromTopOfStackTable("closepath"), true);
+        bool isClosed = ToDataModel(m_LuaState.BooleanFromTopOfStackTable("closepath"), true);
         // Note that this pops the child off the stack so it is no longer available as it is the
         // first argument
         // to the coordinates function.
@@ -243,14 +243,14 @@ QT3DSU64 SPathImportTranslator::ParseSVGPath(TInstanceHandle inParent,
 
         TInstanceHandle theFillMaterial = GetChild(retval, fillMaterialIndex);
         m_Import->SetInstancePropertyValue(theFillMaterial, m_ObjectTypes.m_Material.m_DiffuseColor,
-                                           ToUICDM(*fillColor));
+                                           ToDataModel(*fillColor));
         m_Import->SetInstancePropertyValue(theFillMaterial, m_ObjectTypes.m_Material.m_Opacity,
                                            fillOpacity);
     }
     if (hasStroke) {
         TInstanceHandle theStrokeMaterial = GetChild(retval, 0);
         m_Import->SetInstancePropertyValue(
-            theStrokeMaterial, m_ObjectTypes.m_Material.m_DiffuseColor, ToUICDM(*strokeColor));
+            theStrokeMaterial, m_ObjectTypes.m_Material.m_DiffuseColor, ToDataModel(*strokeColor));
         m_Import->SetInstancePropertyValue(theStrokeMaterial, m_ObjectTypes.m_Material.m_Opacity,
                                            strokeOpacity);
     }
diff --git a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
index ca166330..405a4970 100644
--- a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.cpp
@@ -54,7 +54,7 @@ inline std::wstring GetFullPath(Q3DStudio::CString inSource)
     if (inSource.Left(4) == "res/" || inSource.Left(4) == "res\\")
         inSource = inSource.Mid(4);
 #endif
-    CUICFile theSourcePath(CUICFile::GetApplicationDirectory().GetAbsolutePath() + inSource);
+    Qt3DSFile theSourcePath(Qt3DSFile::GetApplicationDirectory().GetAbsolutePath() + inSource);
     return std::wstring(theSourcePath.GetAbsolutePath());
 }
 
diff --git a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.h b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.h
index 63704181..cc7d5c5e 100644
--- a/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.h
+++ b/src/Authoring/Client/Code/Core/Doc/Qt3DSDMStudioSystem.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSTUDIOSYSTEMH
-#define UICDMSTUDIOSYSTEMH
+#ifndef QT3DSDM_STUDIOSYSTEM_H
+#define QT3DSDM_STUDIOSYSTEM_H
 #include "Qt3DSDMTransactions.h"
 #include "Qt3DSDMHandles.h"
 
@@ -81,4 +81,4 @@ public:
 };
 };
 
-#endif
+#endif // QT3DSDM_STUDIOSYSTEM_H
diff --git a/src/Authoring/Client/Code/Core/Include/Qt3DSKeyDefs.h b/src/Authoring/Client/Code/Core/Include/Qt3DSKeyDefs.h
index 0fbad54a..71302a4b 100644
--- a/src/Authoring/Client/Code/Core/Include/Qt3DSKeyDefs.h
+++ b/src/Authoring/Client/Code/Core/Include/Qt3DSKeyDefs.h
@@ -30,10 +30,10 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef __UICKEYDEFS_H__
-#define __UICKEYDEFS_H__
+#ifndef __QT3DS_KEYDEFS_H__
+#define __QT3DS_KEYDEFS_H__
 
-enum EUICKeyDefines {
+enum QT3DSKeyDefines {
     // We start this at 0x30 so all alpha-numeric keyCodes will match Studio 1.5 Windows virtual key
     // codes
     QT3DS_KEY_0 = 0x30, // 0
@@ -162,4 +162,4 @@ enum EUICKeyDefines {
     QT3DS_KEY_SINGLEQUOTE_DOUBLEQUOTE, //
 };
 
-#endif // #ifndef __UICKEYDEFS_H__
+#endif // #ifndef __QT3DS_KEYDEFS_H__
diff --git a/src/Authoring/Client/Code/Core/StdAfx.h b/src/Authoring/Client/Code/Core/StdAfx.h
index 11e85100..9de3228a 100644
--- a/src/Authoring/Client/Code/Core/StdAfx.h
+++ b/src/Authoring/Client/Code/Core/StdAfx.h
@@ -139,7 +139,7 @@ extern CComModule _Module;
 //==============================================================================
 //	Global Variables
 //==============================================================================
-QT3DS_LOGEXTERN; // Enables access to the logger for all files.  See UICLog for more info.
+QT3DS_LOGEXTERN; // Enables access to the logger for all files.  See Qt3DSLog for more info.
 
 // I put these in to help with some of the data model compile times.
 #ifdef _WIN32
diff --git a/src/Authoring/Client/Code/Core/Types/Pixel.h b/src/Authoring/Client/Code/Core/Types/Pixel.h
index 81499f81..6a081607 100644
--- a/src/Authoring/Client/Code/Core/Types/Pixel.h
+++ b/src/Authoring/Client/Code/Core/Types/Pixel.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef __UICPIXEL_H_
-#define __UICPIXEL_H_
+#ifndef __QT3DS_PIXEL_H_
+#define __QT3DS_PIXEL_H_
 
 //==============================================================================
 //	Includes
@@ -80,4 +80,4 @@ public:
              unsigned char &outAlpha);
 };
 
-#endif // __PIXEL_H_
-\ No newline at end of file
+#endif // __QT3DS_PIXEL_H_
diff --git a/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp b/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
index 178cdc68..a0457a6a 100644
--- a/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Qt3DSColor.cpp
@@ -579,7 +579,7 @@ Q3DStudio::CString CColor::toString()
     unsigned char theAlpha;
 
     GetRGB(theRed, theGreen, theBlue, theAlpha);
-    theStringBuffer.Format(_UIC("%.3hd %.3hd %.3hd %.3hd"), theRed, theGreen, theBlue, theAlpha);
+    theStringBuffer.Format(_LSTR("%.3hd %.3hd %.3hd %.3hd"), theRed, theGreen, theBlue, theAlpha);
 
     return theStringBuffer;
 }
diff --git a/src/Authoring/Client/Code/Core/Types/Rotation3.cpp b/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
index d9c9443e..45a349e8 100644
--- a/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Rotation3.cpp
@@ -90,15 +90,15 @@ bool CRotation3::operator==(const CVector3 &inOther) const
 
 void CRotation3::SetXDegrees(const float &inX)
 {
-    x = (float)(inX * UIC3D_DEGREES_TO_RADIANS);
+    x = (float)(inX * QT3DS_DEGREES_TO_RADIANS);
 }
 void CRotation3::SetYDegrees(const float &inY)
 {
-    y = (float)(inY * UIC3D_DEGREES_TO_RADIANS);
+    y = (float)(inY * QT3DS_DEGREES_TO_RADIANS);
 }
 void CRotation3::SetZDegrees(const float &inZ)
 {
-    z = (float)(inZ * UIC3D_DEGREES_TO_RADIANS);
+    z = (float)(inZ * QT3DS_DEGREES_TO_RADIANS);
 }
 
 void CRotation3::SetXRadians(const float &inX)
@@ -116,15 +116,15 @@ void CRotation3::SetZRadians(const float &inZ)
 
 float CRotation3::GetXDegrees() const
 {
-    return (float)(x * UIC3D_RADIANS_TO_DEGREES);
+    return (float)(x * QT3DS_RADIANS_TO_DEGREES);
 }
 float CRotation3::GetYDegrees() const
 {
-    return (float)(y * UIC3D_RADIANS_TO_DEGREES);
+    return (float)(y * QT3DS_RADIANS_TO_DEGREES);
 }
 float CRotation3::GetZDegrees() const
 {
-    return (float)(z * UIC3D_RADIANS_TO_DEGREES);
+    return (float)(z * QT3DS_RADIANS_TO_DEGREES);
 }
 
 float CRotation3::GetXRadians() const
@@ -179,9 +179,9 @@ void CRotation3::Get(float &outXRotation, float &outYRotation, float &outZRotati
 void CRotation3::SetAngles(const float &inXRotation, const float &inYRotation,
                            const float &inZRotation)
 {
-    x = (float)(inXRotation * UIC3D_DEGREES_TO_RADIANS);
-    y = (float)(inYRotation * UIC3D_DEGREES_TO_RADIANS);
-    z = (float)(inZRotation * UIC3D_DEGREES_TO_RADIANS);
+    x = (float)(inXRotation * QT3DS_DEGREES_TO_RADIANS);
+    y = (float)(inYRotation * QT3DS_DEGREES_TO_RADIANS);
+    z = (float)(inZRotation * QT3DS_DEGREES_TO_RADIANS);
 }
 
 //==============================================================================
@@ -196,9 +196,9 @@ void CRotation3::SetAngles(const float &inXRotation, const float &inYRotation,
  */
 void CRotation3::GetAngles(float &outXRotation, float &outYRotation, float &outZRotation) const
 {
-    outXRotation = (float)(x * UIC3D_RADIANS_TO_DEGREES);
-    outYRotation = (float)(y * UIC3D_RADIANS_TO_DEGREES);
-    outZRotation = (float)(z * UIC3D_RADIANS_TO_DEGREES);
+    outXRotation = (float)(x * QT3DS_RADIANS_TO_DEGREES);
+    outYRotation = (float)(y * QT3DS_RADIANS_TO_DEGREES);
+    outZRotation = (float)(z * QT3DS_RADIANS_TO_DEGREES);
 }
 
 //==============================================================================
diff --git a/src/Authoring/Client/Code/Core/Types/Rotation3.h b/src/Authoring/Client/Code/Core/Types/Rotation3.h
index 6e18fc81..661febe1 100644
--- a/src/Authoring/Client/Code/Core/Types/Rotation3.h
+++ b/src/Authoring/Client/Code/Core/Types/Rotation3.h
@@ -36,8 +36,8 @@
 namespace Q3DStudio {
 
 #ifndef __CommonConstants_H__
-const double UIC3D_DEGREES_TO_RADIANS = (6.2831856f / 360.0f);
-const double UIC3D_RADIANS_TO_DEGREES = (360.0f / 6.2831856f);
+const double QT3DS_DEGREES_TO_RADIANS = (6.2831856f / 360.0f);
+const double QT3DS_RADIANS_TO_DEGREES = (360.0f / 6.2831856f);
 #endif
 
 class CRotation3 : public CVector3
diff --git a/src/Authoring/Client/Code/Core/Types/Vector2.cpp b/src/Authoring/Client/Code/Core/Types/Vector2.cpp
index 9534ef65..345077e0 100644
--- a/src/Authoring/Client/Code/Core/Types/Vector2.cpp
+++ b/src/Authoring/Client/Code/Core/Types/Vector2.cpp
@@ -388,7 +388,7 @@ float CVector2::DotProduct(const CVector2 &inVector)
 Q3DStudio::CString CVector2::toString()
 {
     Q3DStudio::CString theStringBuffer;
-    theStringBuffer.Format(_UIC("%.6f %.6f"), x, y);
+    theStringBuffer.Format(_LSTR("%.6f %.6f"), x, y);
     return theStringBuffer;
 }
 
diff --git a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
index e8d71a3a..1c8df43b 100644
--- a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.cpp
@@ -77,13 +77,13 @@ CBuildConfigParser::~CBuildConfigParser()
  *	@param inDirectory		the directory to look for all the configuration files
  *	@return true if all files parsed successfully, else false
  */
-bool CBuildConfigParser::LoadConfigurations(CUICFile &inDirectory)
+bool CBuildConfigParser::LoadConfigurations(Qt3DSFile &inDirectory)
 {
     m_ErrorMessage.clear();
 
     CFileIterator theFileIter = inDirectory.GetSubItems();
     while (!theFileIter.IsDone()) {
-        CUICFile theCurrentFile(theFileIter.GetCurrent());
+        Qt3DSFile theCurrentFile(theFileIter.GetCurrent());
         m_CurrentFile = theCurrentFile.GetAbsolutePath();
 
         if (theCurrentFile.GetExtension().CompareNoCase(L"build")) {
diff --git a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.h b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.h
index 4debe78d..47672b18 100644
--- a/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.h
+++ b/src/Authoring/Client/Code/Core/Utility/BuildConfigParser.h
@@ -207,7 +207,7 @@ public:
     virtual ~CBuildConfigParser();
 
 public:
-    bool LoadConfigurations(CUICFile &inDirectory);
+    bool LoadConfigurations(Qt3DSFile &inDirectory);
     CString GetErrorMessage() { return CString::fromQString(m_ErrorMessage); }
 
 protected:
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
index e65c326e..d013ce72 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.cpp
@@ -40,7 +40,7 @@
 #include "Doc.h"
 #include "GraphUtils.h"
 
-// UICDM
+// DataModel
 #include "Qt3DSDMStudioSystem.h"
 #include "ClientDataModelBridge.h"
 #include "Qt3DSDMSlides.h"
@@ -84,7 +84,7 @@ CObjectReferenceHelper::~CObjectReferenceHelper()
 IObjectReferenceHelper::SObjectRefInfo
 CObjectReferenceHelper::GetInfo(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance) const
 {
-    // UICDM
+    // DataModel
     using namespace qt3dsdm;
     CClientDataModelBridge *theClientBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
 
@@ -152,7 +152,7 @@ bool CObjectReferenceHelper::GetChildInstanceList(
     CClientDataModelBridge *theClientBridge = m_Doc->GetStudioSystem()->GetClientDataModelBridge();
     if (inInstance.Valid()) {
         //		ASSERT(0); // Should this work for more than Materials?
-        if (theClientBridge->IsMaterialInstance(inInstance)) { // UICDM objects
+        if (theClientBridge->IsMaterialInstance(inInstance)) { // DataModel objects
             long theSlideIndex = m_Doc->GetStudioSystem()->GetSlideSystem()->GetSlideIndex(inSlide);
             GetPropertyAsChildrenList(inInstance, outList, theSlideIndex);
             return true;
@@ -212,7 +212,7 @@ Q3DStudio::CString CObjectReferenceHelper::GetObjectReferenceString(
 
 //==============================================================================
 /**
- * NOTE: inId is never a UICDM object, till we support dynamic properties OR actions for UICDM
+ * NOTE: inId is never a DataModel object, till we support dynamic properties OR actions for DataModel
  * objects.
  */
 bool CObjectReferenceHelper::ResolvePath(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
@@ -254,7 +254,7 @@ CObjectReferenceHelper::Resolve(const qt3dsdm::SValue &inObjectRefValue,
         }
         if (theValueType == qt3dsdm::DataModelDataType::String) // route it through the function that
                                                              // can determine both old client and
-                                                             // new UICDM objects
+                                                             // new DataModel objects
         {
             bool theFullResolvedFlag = false;
             CRelativePathTools::EPathType theUnusedPathType;
diff --git a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
index 16957e1a..545c4773 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
+++ b/src/Authoring/Client/Code/Core/Utility/DataModelObjectReferenceHelper.h
@@ -44,9 +44,9 @@
 //==============================================================================
 /**
  *	Implementation of IObjectReferenceHelper
- *	For now, this cross from the old client to new UICDM boundaries, and shield that logic from
+ *	For now, this cross from the old client to new DataModel boundaries, and shield that logic from
  *the actual control classes.
- *	Eventually, when all assets is converted to UICDM land, the meat of all these functions can
+ *	Eventually, when all assets is converted to DataModel land, the meat of all these functions can
  *change accordingly.
  */
 class CObjectReferenceHelper : public IObjectReferenceHelper
@@ -83,7 +83,7 @@ public:
                      const qt3dsdm::Qt3DSDMInstanceHandle &inBaseInstance,
                      CRelativePathTools::EPathType inPathType) const override;
 
-protected: // UICDM
+protected: // DataModel
     void GetPropertyAsChildrenList(const qt3dsdm::Qt3DSDMInstanceHandle &inInstance,
                                    qt3dsdm::TInstanceHandleList &outList, long inSlideIndex) const;
 
diff --git a/src/Authoring/Client/Code/Core/Utility/DataTypesConverter.h b/src/Authoring/Client/Code/Core/Utility/DataTypesConverter.h
index 07de788f..304a44ba 100644
--- a/src/Authoring/Client/Code/Core/Utility/DataTypesConverter.h
+++ b/src/Authoring/Client/Code/Core/Utility/DataTypesConverter.h
@@ -40,84 +40,84 @@
 #include "foundation/Qt3DSVec3.h"
 
 // Convenience functions to convert from CoreLibProject/Types Files to UICDMDataTypes
-inline UICDM::SValue ConvertToSValue(const Q3DStudio::CVector2 &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const Q3DStudio::CVector2 &inValue)
 {
-    UICDM::SFloat2 theFloat2;
+    qt3dsdm::SFloat2 theFloat2;
     theFloat2.m_Floats[0] = inValue.GetX();
     theFloat2.m_Floats[1] = inValue.GetY();
-    return (UICDM::SValue(theFloat2));
+    return (qt3dsdm::SValue(theFloat2));
 }
-inline UICDM::SValue ConvertToSValue(const Q3DStudio::CVector3 &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const Q3DStudio::CVector3 &inValue)
 {
-    UICDM::SFloat3 theFloat3;
+    qt3dsdm::SFloat3 theFloat3;
     theFloat3.m_Floats[0] = inValue.GetX();
     theFloat3.m_Floats[1] = inValue.GetY();
     theFloat3.m_Floats[2] = inValue.GetZ();
-    return (UICDM::SValue(theFloat3));
+    return (qt3dsdm::SValue(theFloat3));
 }
 
-inline UICDM::SValue ConvertToSValue(const Q3DStudio::CRotation3 &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const Q3DStudio::CRotation3 &inValue)
 {
-    UICDM::SFloat3 theFloat3;
+    qt3dsdm::SFloat3 theFloat3;
     theFloat3.m_Floats[0] = inValue.GetXDegrees();
     theFloat3.m_Floats[1] = inValue.GetYDegrees();
     theFloat3.m_Floats[2] = inValue.GetZDegrees();
-    return (UICDM::SValue(theFloat3));
+    return (qt3dsdm::SValue(theFloat3));
 }
 
-inline UICDM::SValue ConvertToSValue(float inX, float inY)
+inline qt3dsdm::SValue ConvertToSValue(float inX, float inY)
 {
-    return (UICDM::SValue(UICDM::SFloat2(inX, inY)));
+    return (qt3dsdm::SValue(qt3dsdm::SFloat2(inX, inY)));
 }
 
-inline UICDM::SValue ConvertToSValue(float inX, float inY, float inZ)
+inline qt3dsdm::SValue ConvertToSValue(float inX, float inY, float inZ)
 {
-    return (UICDM::SValue(UICDM::SFloat3(inX, inY, inZ)));
+    return (qt3dsdm::SValue(qt3dsdm::SFloat3(inX, inY, inZ)));
 }
 
-inline UICDM::SValue ConvertToSValue(const qt3ds::QT3DSVec2 &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const qt3ds::QT3DSVec2 &inValue)
 {
-    UICDM::SFloat2 theFloat2;
+    qt3dsdm::SFloat2 theFloat2;
     theFloat2.m_Floats[0] = inValue.x;
     theFloat2.m_Floats[1] = inValue.y;
-    return (UICDM::SValue(theFloat2));
+    return (qt3dsdm::SValue(theFloat2));
 }
 
-inline UICDM::SValue ConvertToSValue(const qt3ds::QT3DSVec3 &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const qt3ds::QT3DSVec3 &inValue)
 {
-    UICDM::SFloat3 theFloat3;
+    qt3dsdm::SFloat3 theFloat3;
     theFloat3.m_Floats[0] = inValue.x;
     theFloat3.m_Floats[1] = inValue.y;
     theFloat3.m_Floats[2] = inValue.z;
-    return (UICDM::SValue(theFloat3));
+    return (qt3dsdm::SValue(theFloat3));
 }
 
-inline UICDM::SValue ConvertToSValue(const wchar_t *inValue)
+inline qt3dsdm::SValue ConvertToSValue(const wchar_t *inValue)
 {
-    return UICDM::TDataStrPtr(new UICDM::CDataStr(inValue));
+    return qt3dsdm::TDataStrPtr(new qt3dsdm::CDataStr(inValue));
 }
 
-inline UICDM::SValue ConvertToSValue(const std::wstring &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const std::wstring &inValue)
 {
-    return UICDM::TDataStrPtr(new UICDM::CDataStr(inValue.c_str()));
+    return qt3dsdm::TDataStrPtr(new qt3dsdm::CDataStr(inValue.c_str()));
 }
 
-inline UICDM::SValue ConvertToSValue(const char *inValue)
+inline qt3dsdm::SValue ConvertToSValue(const char *inValue)
 {
-    return UICDM::TDataStrPtr(new UICDM::CDataStr(Q3DStudio::CString(inValue)));
+    return qt3dsdm::TDataStrPtr(new qt3dsdm::CDataStr(Q3DStudio::CString(inValue)));
 }
 
-inline UICDM::SValue ConvertToSValue(const Q3DStudio::CString &inValue)
+inline qt3dsdm::SValue ConvertToSValue(const Q3DStudio::CString &inValue)
 {
-    return UICDM::TDataStrPtr(new UICDM::CDataStr(inValue));
+    return qt3dsdm::TDataStrPtr(new qt3dsdm::CDataStr(inValue));
 }
 
-inline UICDM::TMetaDataStringList ConvertToStringList(Q3DStudio::CString inValue)
+inline qt3dsdm::TMetaDataStringList ConvertToStringList(Q3DStudio::CString inValue)
 {
     // Convert the incoming string attribute into a list
-    UICDM::TMetaDataStringList theList;
+    qt3dsdm::TMetaDataStringList theList;
 
-    Q3DStudio::CString theDelimiter(_UIC(","));
+    Q3DStudio::CString theDelimiter(QStringLiteral(","));
     long theStartIndex = 0;
     long theEndIndex = theStartIndex;
     for (;;) {
@@ -134,16 +134,16 @@ inline UICDM::TMetaDataStringList ConvertToStringList(Q3DStudio::CString inValue
     return theList;
 }
 
-inline Q3DStudio::CString ConvertFromStringList(UICDM::TMetaDataStringList inList)
+inline Q3DStudio::CString ConvertFromStringList(qt3dsdm::TMetaDataStringList inList)
 {
     size_t theNumListItems = inList.size();
     Q3DStudio::CString theData = "";
     if (theNumListItems > 0) {
-        for (UICDM::TMetaDataStringList::iterator theIterator = inList.begin();
+        for (qt3dsdm::TMetaDataStringList::iterator theIterator = inList.begin();
              theIterator != inList.end(); ++theIterator) {
             theData += theIterator->c_str();
             if (theIterator + 1 != inList.end())
-                theData += _UIC(",");
+                theData += QStringLiteral(",");
         }
     }
     return theData;
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
index 71fbaf21..0bcbb07c 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.cpp
@@ -47,7 +47,7 @@
 #include <QGuiApplication>
 #include <QMimeData>
 
-CUICFile CStudioClipboard::s_InternalClipObject("");
+Qt3DSFile CStudioClipboard::s_InternalClipObject("");
 qint64 CStudioClipboard::s_InternalContextData = 0;
 EStudioObjectType CStudioClipboard::s_AssetType(OBJTYPE_UNKNOWN);
 qint64 CStudioClipboard::s_CopyProcessID = 0;
@@ -68,7 +68,7 @@ CStudioClipboard::~CStudioClipboard()
  *  @param  outContextData  arbitrary data saved earlier
  *  @return  the object that was retrieved from the respective clipboard.
  */
-CUICFile CStudioClipboard::GetObjectFromClipboard(bool inIsInternal, qint64 &outContextData)
+Qt3DSFile CStudioClipboard::GetObjectFromClipboard(bool inIsInternal, qint64 &outContextData)
 {
     if (inIsInternal)
         return GetObjectFromInternalClipboard(outContextData);
@@ -86,7 +86,7 @@ CUICFile CStudioClipboard::GetObjectFromClipboard(bool inIsInternal, qint64 &out
  *CmdMakeComponent or CmdDuplicateObject
  *  @param  inAssetType    asset type of object
  */
-void CStudioClipboard::CopyObjectToClipboard(CUICFile &inFile, qint64 inContextData,
+void CStudioClipboard::CopyObjectToClipboard(Qt3DSFile &inFile, qint64 inContextData,
                                              bool inIsInternal, EStudioObjectType inObjectType)
 {
     s_AssetType = inObjectType;
@@ -130,9 +130,9 @@ bool CStudioClipboard::CanPasteObject(EStudioObjectType inDestType, bool inIsInt
 /**
  *  Retrieve the object from the internal Clipboard.
  *  @param  outContextData  arbitrary data saved earlier
- *  @return  CUICFile object that was retrieved from the internal Clipboard.
+ *  @return  Qt3DSFile object that was retrieved from the internal Clipboard.
  */
-CUICFile CStudioClipboard::GetObjectFromInternalClipboard(qint64 &outContextData)
+Qt3DSFile CStudioClipboard::GetObjectFromInternalClipboard(qint64 &outContextData)
 {
     // Don't have to delete the InternalClipObject as the CmdPasteObject would delete the file later
     outContextData = s_InternalContextData;
@@ -145,7 +145,7 @@ CUICFile CStudioClipboard::GetObjectFromInternalClipboard(qint64 &outContextData
  *  @param  inFile  The object to copy to the internal clipboard.
  *  @param  inContextData  any arbitrary data to be retrieved later
  */
-void CStudioClipboard::CopyObjectToInternalClipboard(CUICFile &inFile, qint64 inContextData)
+void CStudioClipboard::CopyObjectToInternalClipboard(Qt3DSFile &inFile, qint64 inContextData)
 {
     s_InternalClipObject = inFile;
     s_InternalContextData = inContextData;
@@ -155,12 +155,12 @@ void CStudioClipboard::CopyObjectToInternalClipboard(CUICFile &inFile, qint64 in
 /**
  *  Retrieve the object from the global Clipboard.
  *  @param  outContextData  arbitrary data saved earlier
- *  @return  CUICFile object that was retrieved from the global Clipboard.
+ *  @return  Qt3DSFile object that was retrieved from the global Clipboard.
  */
-CUICFile CStudioClipboard::GetObjectFromGlobalClipboard(qint64 &outContextData,
+Qt3DSFile CStudioClipboard::GetObjectFromGlobalClipboard(qint64 &outContextData,
                                                         const QString &inMimeType)
 {
-    CUICFile theTempAPFile = CUICFile::GetTemporaryFile();
+    Qt3DSFile theTempAPFile = Qt3DSFile::GetTemporaryFile();
     GetObjectFromGlobalClipboard(inMimeType, &theTempAPFile, &outContextData);
     return theTempAPFile;
 }
@@ -171,7 +171,7 @@ CUICFile CStudioClipboard::GetObjectFromGlobalClipboard(qint64 &outContextData,
  *  @param  inFile  The object to copy to the global clipboard.
  *  @param  inContextData  any arbitrary data to be retrieved later
  */
-void CStudioClipboard::CopyObjectToGlobalClipboard(CUICFile &inFile, qint64 inContextData,
+void CStudioClipboard::CopyObjectToGlobalClipboard(Qt3DSFile &inFile, qint64 inContextData,
                                                    const QString &inMimeType)
 {
     QByteArray data;
@@ -243,7 +243,7 @@ void CStudioClipboard::ClearClipboard()
  *  Retrieve a previously stored action from the global clipboard.
  *  @return  the object that was retrieved from the respective clipboard.
  */
-CUICFile CStudioClipboard::GetActionFromClipboard()
+Qt3DSFile CStudioClipboard::GetActionFromClipboard()
 {
     qint64 theContextData = 0;
     return GetObjectFromGlobalClipboard(theContextData, "application/x-qt3dstudio-action"_L1);
@@ -254,7 +254,7 @@ CUICFile CStudioClipboard::GetActionFromClipboard()
  *  Copy an Action to the Clipboard.
  *  @param  inFile  The object to store to clipboard.
  */
-void CStudioClipboard::CopyActionToClipboard(CUICFile &inFile)
+void CStudioClipboard::CopyActionToClipboard(Qt3DSFile &inFile)
 {
     s_CopyProcessID = qApp->applicationPid();
     CopyObjectToGlobalClipboard(inFile, 0, "application/x-qt3dstudio-action"_L1);
@@ -281,7 +281,7 @@ bool CStudioClipboard::CanPasteAction()
  *  @param  outFile      file to write clipboard data to, if any.
  */
 void CStudioClipboard::GetObjectFromGlobalClipboard(const QString &inMimeType,
-                                                    CUICFile *outFile /*= NULL */,
+                                                    Qt3DSFile *outFile /*= NULL */,
                                                     qint64 *outContextData /*= NULL */)
 {
     QClipboard *clipboard = QGuiApplication::clipboard();
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.h b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.h
index 366359e2..2f7b9461 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioClipboard.h
+++ b/src/Authoring/Client/Code/Core/Utility/StudioClipboard.h
@@ -46,17 +46,17 @@ protected:
 public:
     virtual ~CStudioClipboard();
 
-    static CUICFile GetObjectFromClipboard(bool inIsInternal, qint64 &outContextData);
-    static void CopyObjectToClipboard(CUICFile &inFile, qint64 inContextData, bool inIsInternal,
+    static Qt3DSFile GetObjectFromClipboard(bool inIsInternal, qint64 &outContextData);
+    static void CopyObjectToClipboard(Qt3DSFile &inFile, qint64 inContextData, bool inIsInternal,
                                       EStudioObjectType inObjectType);
     static bool CanPasteObject(EStudioObjectType inDestType, bool inIsInternal = false);
     static bool IsPastingAcrossInstances();
 
 protected:
-    static CUICFile GetObjectFromInternalClipboard(qint64 &outContextData);
-    static void CopyObjectToInternalClipboard(CUICFile &inFile, qint64 inContextData);
-    static CUICFile GetObjectFromGlobalClipboard(qint64 &outContextData, const QString &inMimeType);
-    static void CopyObjectToGlobalClipboard(CUICFile &inFile, qint64 inContextData,
+    static Qt3DSFile GetObjectFromInternalClipboard(qint64 &outContextData);
+    static void CopyObjectToInternalClipboard(Qt3DSFile &inFile, qint64 inContextData);
+    static Qt3DSFile GetObjectFromGlobalClipboard(qint64 &outContextData, const QString &inMimeType);
+    static void CopyObjectToGlobalClipboard(Qt3DSFile &inFile, qint64 inContextData,
                                             const QString &inMimeType);
 
 public:
@@ -67,16 +67,16 @@ public:
     static void ClearClipboard(); ///< clears the global clipboard
 
     // Copy/paste Actions
-    static CUICFile GetActionFromClipboard();
-    static void CopyActionToClipboard(CUICFile &inFile);
+    static Qt3DSFile GetActionFromClipboard();
+    static void CopyActionToClipboard(Qt3DSFile &inFile);
     static bool CanPasteAction();
 
 protected:
     static void GetObjectFromGlobalClipboard(const QString &inMimeType,
-                                             CUICFile *outFile = NULL, qint64 *outContextData = NULL);
+                                             Qt3DSFile *outFile = NULL, qint64 *outContextData = NULL);
 
 private:
-    static CUICFile s_InternalClipObject; ///< the cache for internal clipboard operations
+    static Qt3DSFile s_InternalClipObject; ///< the cache for internal clipboard operations
     static qint64 s_InternalContextData; ///< any arbitrary data for internal copy cmds.
     static EStudioObjectType s_AssetType; ///< asset type of the clipobject
     static qint64
diff --git a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
index 1d939b29..f1211c6b 100644
--- a/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/TestCmdUtils.cpp
@@ -79,7 +79,7 @@ qt3dsdm::Qt3DSDMInstanceHandle TestCmdUtilsAddObject(CAsset *inParent, CAsset *i
  *		@return a string representing the property name and other measurable attributes
  */
 //==============================================================================
-// TODO: UICDM Fingerprint
+// TODO: DataModel Fingerprint
 
 //==============================================================================
 /**
diff --git a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.h b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.h
index 9d37e62d..210adebd 100644
--- a/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.h
+++ b/src/Authoring/Client/Code/Core/VirtualAssets/PlaybackClock.h
@@ -89,7 +89,7 @@ protected:
     void UpdateClockProperties();
     void OnReachedUpperBound();
 
-    // UICDM Helper functions.
+    // DataModel Helper functions.
     inline qt3dsdm::IPropertySystem *GetPropertySystem() const;
     inline qt3dsdm::ISlideSystem *GetSlideSystem() const;
     inline CClientDataModelBridge *GetClientDataModelBridge() const;
diff --git a/src/Authoring/Client/Code/Shared/CommonConstants.h b/src/Authoring/Client/Code/Shared/CommonConstants.h
index f153d954..26607db0 100644
--- a/src/Authoring/Client/Code/Shared/CommonConstants.h
+++ b/src/Authoring/Client/Code/Shared/CommonConstants.h
@@ -142,8 +142,8 @@ const unsigned long ACTION_DEBUGGEROUTPUT_BITMASK = 0x00000004; ///< Output to d
 const unsigned long ACTION_DEBUGBREAK_BITMASK = 0x00000008; ///< Break at the spot
 
 // 3D constants
-const float UIC3D_DEGREES_TO_RADIANS = (float)0.0174532925199;
-const float UIC3D_RADIANS_TO_DEGREES = (float)57.2957795131;
+const float QT3DS_DEGREES_TO_RADIANS = (float)0.0174532925199;
+const float QT3DS_RADIANS_TO_DEGREES = (float)57.2957795131;
 
 // Fullscreen anti-aliasing modes
 const long FSAA_OFF = 0x00000000; ///< No fullscreen anti-aliasing
diff --git a/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp b/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp
index f1f47e82..816e036c 100644
--- a/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp
+++ b/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp
@@ -44,7 +44,7 @@
 //	Statics
 //==============================================================================
 
-IUICLog2 *CLogHelper::s_UICLog2;
+IQt3DSLog2 *CLogHelper::s_qt3dsLog2;
 
 //==============================================================================
 //	Methods
@@ -55,7 +55,7 @@ IUICLog2 *CLogHelper::s_UICLog2;
 void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
                      long inCategoryType, const wchar_t *inLogString, ...)
 {
-    if (s_UICLog2 != NULL) {
+    if (s_qt3dsLog2 != NULL) {
         TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
 
         theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
@@ -66,12 +66,12 @@ void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumbe
         wcsncpy(theAddEntryIndirectStruct.m_FileNameString, inFileName,
                 Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inFileName)));
         theAddEntryIndirectStruct.m_LineNumberLong = inLineNumber;
-        theAddEntryIndirectStruct.m_Mask = UICLOG_STRING;
+        theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_STRING;
         theAddEntryIndirectStruct.m_Level = LOGLEVEL_CRITICAL;
         theAddEntryIndirectStruct.m_LogType = inLogType;
         theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
 
-        s_UICLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
+        s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
 
         va_end(theAddEntryIndirectStruct.m_LogParamList);
     }
@@ -80,7 +80,7 @@ void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumbe
 void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
                      long inCategoryType, long inStringId, ...)
 {
-    if (s_UICLog2 != NULL) {
+    if (s_qt3dsLog2 != NULL) {
         TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
 
         theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
@@ -90,12 +90,12 @@ void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumbe
         wcsncpy(theAddEntryIndirectStruct.m_FileNameString, inFileName,
                 Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inFileName)));
         theAddEntryIndirectStruct.m_LineNumberLong = inLineNumber;
-        theAddEntryIndirectStruct.m_Mask = UICLOG_ID;
+        theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_ID;
         theAddEntryIndirectStruct.m_Level = LOGLEVEL_CRITICAL;
         theAddEntryIndirectStruct.m_LogType = inLogType;
         theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
 
-        s_UICLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
+        s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
 
         va_end(theAddEntryIndirectStruct.m_LogParamList);
     }
@@ -104,18 +104,18 @@ void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumbe
 void CLogHelper::Trace(long inCategoryType, const wchar_t *inLogString, ...)
 {
     try {
-        if (s_UICLog2 != NULL) {
+        if (s_qt3dsLog2 != NULL) {
             TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
 
             theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
             wcsncpy(theAddEntryIndirectStruct.m_LogString, inLogString,
                     Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inLogString)));
             va_start(theAddEntryIndirectStruct.m_LogParamList, inLogString);
-            theAddEntryIndirectStruct.m_Mask = UICLOG_STRING;
+            theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_STRING;
             theAddEntryIndirectStruct.m_Level = LOGLEVEL_INFO;
             theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
 
-            s_UICLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
+            s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
 
             va_end(theAddEntryIndirectStruct.m_LogParamList);
         }
@@ -127,8 +127,8 @@ void CLogHelper::Trace(long inCategoryType, const wchar_t *inLogString, ...)
 
 void CLogHelper::AddEntry(long inType, const wchar_t *inMsg)
 {
-    if (s_UICLog2 != NULL) {
-        s_UICLog2->AddEntry(inType, (BYTE *)inMsg);
+    if (s_qt3dsLog2 != NULL) {
+        s_qt3dsLog2->AddEntry(inType, (BYTE *)inMsg);
     }
 }
 
@@ -137,12 +137,12 @@ void CLogHelper::Start()
     ::CoInitialize(NULL);
 
     try {
-        if (s_UICLog2 == NULL) {
+        if (s_qt3dsLog2 == NULL) {
             HRESULT theResult =
-                ::CoCreateInstance(__uuidof(UICLog), NULL, CLSCTX_INPROC_SERVER, __uuidof(IUICLog2),
-                                   reinterpret_cast<void **>(&s_UICLog2));
-            if (!s_UICLog2 || S_OK != theResult) {
-                ::OutputDebugString(L"FAILED to create UICLog2 interface.\n");
+                ::CoCreateInstance(__uuidof(Qt3DSLog), NULL, CLSCTX_INPROC_SERVER, __uuidof(IQt3DSLog2),
+                                   reinterpret_cast<void **>(&s_qt3dsLog2));
+            if (!s_qt3dsLog2 || S_OK != theResult) {
+                ::OutputDebugString(L"FAILED to create Qt3DSLog2 interface.\n");
             }
         }
     }
@@ -154,10 +154,10 @@ void CLogHelper::Start()
 void CLogHelper::Stop()
 {
     try {
-        if (s_UICLog2) {
-            s_UICLog2->Terminate();
-            s_UICLog2->Release();
-            s_UICLog2 = NULL;
+        if (s_qt3dsLog2) {
+            s_qt3dsLog2->Terminate();
+            s_qt3dsLog2->Release();
+            s_qt3dsLog2 = NULL;
         }
 
         ::CoUninitialize();
diff --git a/src/Authoring/Client/Code/Shared/Log/LogHelper.h b/src/Authoring/Client/Code/Shared/Log/LogHelper.h
index f96f130d..b441d36e 100644
--- a/src/Authoring/Client/Code/Shared/Log/LogHelper.h
+++ b/src/Authoring/Client/Code/Shared/Log/LogHelper.h
@@ -27,13 +27,13 @@
 **
 ****************************************************************************/
 
-#ifndef __UICLOGHELPER_H_
-#define __UICLOGHELPER_H_
+#ifndef __QT3DS_LOG_HELPER_H_
+#define __QT3DS_LOG_HELPER_H_
 
 #ifdef WIN32
 #include "LogProject.h"
 #else
-typedef long IUICLog2;
+typedef long IQt3DSLog2;
 #endif
 
 //==============================================================================
@@ -54,7 +54,7 @@ public:
     static void Start();
     static void Stop();
 
-    static IUICLog2 *s_UICLog2;
+    static IQt3DSLog2 *s_qt3dsLog2;
 };
 
-#endif // __UICLOGHELPER_H_
+#endif // __QT3DS_LOG_HELPER_H_
diff --git a/src/Authoring/Client/Code/Shared/Log/LogProject.h b/src/Authoring/Client/Code/Shared/Log/LogProject.h
index b41ea796..e1d21d9b 100644
--- a/src/Authoring/Client/Code/Shared/Log/LogProject.h
+++ b/src/Authoring/Client/Code/Shared/Log/LogProject.h
@@ -59,37 +59,37 @@
 
 /* Forward Declarations */
 
-#ifndef __IUICLog_FWD_DEFINED__
-#define __IUICLog_FWD_DEFINED__
-typedef interface IUICLog IUICLog;
-#endif /* __IUICLog_FWD_DEFINED__ */
+#ifndef __IQt3DSLog_FWD_DEFINED__
+#define __IQt3DSLog_FWD_DEFINED__
+typedef interface IQt3DSLog IQt3DSLog;
+#endif /* __IQt3DSLog_FWD_DEFINED__ */
 
-#ifndef __IUICLog2_FWD_DEFINED__
-#define __IUICLog2_FWD_DEFINED__
-typedef interface IUICLog2 IUICLog2;
-#endif /* __IUICLog2_FWD_DEFINED__ */
+#ifndef __IQt3DSLog2_FWD_DEFINED__
+#define __IQt3DSLog2_FWD_DEFINED__
+typedef interface IQt3DSLog2 IQt3DSLog2;
+#endif /* __IQt3DSLog2_FWD_DEFINED__ */
 
-#ifndef __UICLog_FWD_DEFINED__
-#define __UICLog_FWD_DEFINED__
+#ifndef __QT3DS_Log_FWD_DEFINED__
+#define __QT3DS_Log_FWD_DEFINED__
 
 #ifdef __cplusplus
-typedef class UICLog UICLog;
+typedef class Qt3DSLog Qt3DSLog;
 #else
-typedef struct UICLog UICLog;
+typedef struct Qt3DSLog Qt3DSLog;
 #endif /* __cplusplus */
 
-#endif /* __UICLog_FWD_DEFINED__ */
+#endif /* __QT3DS_Log_FWD_DEFINED__ */
 
-#ifndef __UICLog2_FWD_DEFINED__
-#define __UICLog2_FWD_DEFINED__
+#ifndef __QT3DS_Log2_FWD_DEFINED__
+#define __QT3DS_Log2_FWD_DEFINED__
 
 #ifdef __cplusplus
-typedef class UICLog2 UICLog2;
+typedef class Qt3DSLog2 Qt3DSLog2;
 #else
-typedef struct UICLog2 UICLog2;
+typedef struct Qt3DSLog2 Qt3DSLog2;
 #endif /* __cplusplus */
 
-#endif /* __UICLog2_FWD_DEFINED__ */
+#endif /* __QT3DS_Log2_FWD_DEFINED__ */
 
 /* header files for imported files */
 #include "oaidl.h"
@@ -102,18 +102,18 @@ extern "C" {
 void __RPC_FAR *__RPC_USER MIDL_user_allocate(size_t);
 void __RPC_USER MIDL_user_free(void __RPC_FAR *);
 
-#ifndef __IUICLog_INTERFACE_DEFINED__
-#define __IUICLog_INTERFACE_DEFINED__
+#ifndef __IQt3DSLog_INTERFACE_DEFINED__
+#define __IQt3DSLog_INTERFACE_DEFINED__
 
-/* interface IUICLog */
+/* interface IQt3DSLog */
 /* [unique][helpstring][dual][uuid][object] */
 
-EXTERN_C const IID IID_IUICLog;
+EXTERN_C const IID IID_IQt3DSLog;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
 
 MIDL_INTERFACE("B6F844EB-07AF-4CF1-9350-E4A2A6576E0E")
-IUICLog : public IDispatch
+IQt3DSLog : public IDispatch
 {
 public:
     virtual /* [id] */ HRESULT STDMETHODCALLTYPE AddEntry(
@@ -127,31 +127,31 @@ public:
 
 #else /* C style interface */
 
-typedef struct IUICLogVtbl
+typedef struct IQt3DSLogVtbl
 {
     BEGIN_INTERFACE
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *QueryInterface)
-    (IUICLog __RPC_FAR *This,
+    (IQt3DSLog __RPC_FAR *This,
      /* [in] */ REFIID riid,
      /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
 
-    ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IUICLog __RPC_FAR *This);
+    ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IQt3DSLog __RPC_FAR *This);
 
-    ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IUICLog __RPC_FAR *This);
+    ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IQt3DSLog __RPC_FAR *This);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount)
-    (IUICLog __RPC_FAR *This,
+    (IQt3DSLog __RPC_FAR *This,
      /* [out] */ UINT __RPC_FAR *pctinfo);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo)
-    (IUICLog __RPC_FAR *This,
+    (IQt3DSLog __RPC_FAR *This,
      /* [in] */ UINT iTInfo,
      /* [in] */ LCID lcid,
      /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames)
-    (IUICLog __RPC_FAR *This,
+    (IQt3DSLog __RPC_FAR *This,
      /* [in] */ REFIID riid,
      /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
      /* [in] */ UINT cNames,
@@ -159,7 +159,7 @@ typedef struct IUICLogVtbl
      /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
 
     /* [local] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Invoke)(
-        IUICLog __RPC_FAR *This,
+        IQt3DSLog __RPC_FAR *This,
         /* [in] */ DISPID dispIdMember,
         /* [in] */ REFIID riid,
         /* [in] */ LCID lcid,
@@ -170,87 +170,87 @@ typedef struct IUICLogVtbl
         /* [out] */ UINT __RPC_FAR *puArgErr);
 
     /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntry)(
-        IUICLog __RPC_FAR *This,
+        IQt3DSLog __RPC_FAR *This,
         /* [in] */ DWORD inLogType,
         /* [in] */ BYTE __RPC_FAR *inLogEntry);
 
-    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IUICLog __RPC_FAR *This);
+    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IQt3DSLog __RPC_FAR *This);
 
-    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IUICLog __RPC_FAR *This);
+    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IQt3DSLog __RPC_FAR *This);
 
     END_INTERFACE
-} IUICLogVtbl;
+} IQt3DSLogVtbl;
 
-interface IUICLog
+interface IQt3DSLog
 {
-    CONST_VTBL struct IUICLogVtbl __RPC_FAR *lpVtbl;
+    CONST_VTBL struct IQt3DSLogVtbl __RPC_FAR *lpVtbl;
 };
 
 #ifdef COBJMACROS
 
-#define IUICLog_QueryInterface(This, riid, ppvObject)                                              \
+#define IQt3DSLog_QueryInterface(This, riid, ppvObject)                                              \
     (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
 
-#define IUICLog_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IQt3DSLog_AddRef(This) (This)->lpVtbl->AddRef(This)
 
-#define IUICLog_Release(This) (This)->lpVtbl->Release(This)
+#define IQt3DSLog_Release(This) (This)->lpVtbl->Release(This)
 
-#define IUICLog_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
+#define IQt3DSLog_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
 
-#define IUICLog_GetTypeInfo(This, iTInfo, lcid, ppTInfo)                                           \
+#define IQt3DSLog_GetTypeInfo(This, iTInfo, lcid, ppTInfo)                                           \
     (This)->lpVtbl->GetTypeInfo(This, iTInfo, lcid, ppTInfo)
 
-#define IUICLog_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)                       \
+#define IQt3DSLog_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)                       \
     (This)->lpVtbl->GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)
 
-#define IUICLog_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,            \
+#define IQt3DSLog_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,            \
                        pExcepInfo, puArgErr)                                                       \
     (This)->lpVtbl->Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,        \
                            pExcepInfo, puArgErr)
 
-#define IUICLog_AddEntry(This, inLogType, inLogEntry)                                              \
+#define IQt3DSLog_AddEntry(This, inLogType, inLogEntry)                                              \
     (This)->lpVtbl->AddEntry(This, inLogType, inLogEntry)
 
-#define IUICLog_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
+#define IQt3DSLog_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
 
-#define IUICLog_Terminate(This) (This)->lpVtbl->Terminate(This)
+#define IQt3DSLog_Terminate(This) (This)->lpVtbl->Terminate(This)
 
 #endif /* COBJMACROS */
 
 #endif /* C style interface */
 
-/* [id] */ HRESULT STDMETHODCALLTYPE IUICLog_AddEntry_Proxy(IUICLog __RPC_FAR *This,
+/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_AddEntry_Proxy(IQt3DSLog __RPC_FAR *This,
                                                             /* [in] */ DWORD inLogType,
                                                             /* [in] */ BYTE __RPC_FAR *inLogEntry);
 
-void __RPC_STUB IUICLog_AddEntry_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
+void __RPC_STUB IQt3DSLog_AddEntry_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
                                       PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
 
-/* [id] */ HRESULT STDMETHODCALLTYPE IUICLog_ReloadPreferences_Proxy(IUICLog __RPC_FAR *This);
+/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_ReloadPreferences_Proxy(IQt3DSLog __RPC_FAR *This);
 
-void __RPC_STUB IUICLog_ReloadPreferences_Stub(IRpcStubBuffer *This,
+void __RPC_STUB IQt3DSLog_ReloadPreferences_Stub(IRpcStubBuffer *This,
                                                IRpcChannelBuffer *_pRpcChannelBuffer,
                                                PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
 
-/* [id] */ HRESULT STDMETHODCALLTYPE IUICLog_Terminate_Proxy(IUICLog __RPC_FAR *This);
+/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_Terminate_Proxy(IQt3DSLog __RPC_FAR *This);
 
-void __RPC_STUB IUICLog_Terminate_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
+void __RPC_STUB IQt3DSLog_Terminate_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
                                        PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
 
-#endif /* __IUICLog_INTERFACE_DEFINED__ */
+#endif /* __IQt3DSLog_INTERFACE_DEFINED__ */
 
-#ifndef __IUICLog2_INTERFACE_DEFINED__
-#define __IUICLog2_INTERFACE_DEFINED__
+#ifndef __IQt3DSLog2_INTERFACE_DEFINED__
+#define __IQt3DSLog2_INTERFACE_DEFINED__
 
-/* interface IUICLog2 */
+/* interface IQt3DSLog2 */
 /* [unique][helpstring][dual][uuid][object] */
 
-EXTERN_C const IID IID_IUICLog2;
+EXTERN_C const IID IID_IQt3DSLog2;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
 
 MIDL_INTERFACE("18725949-89C4-460c-A092-75520BFFB542")
-IUICLog2 : public IUICLog
+IQt3DSLog2 : public IQt3DSLog
 {
 public:
     virtual /* [id] */ HRESULT STDMETHODCALLTYPE AddEntryIndirect(
@@ -259,31 +259,31 @@ public:
 
 #else /* C style interface */
 
-typedef struct IUICLog2Vtbl
+typedef struct IQt3DSLog2Vtbl
 {
     BEGIN_INTERFACE
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *QueryInterface)
-    (IUICLog2 __RPC_FAR *This,
+    (IQt3DSLog2 __RPC_FAR *This,
      /* [in] */ REFIID riid,
      /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
 
-    ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IUICLog2 __RPC_FAR *This);
+    ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IQt3DSLog2 __RPC_FAR *This);
 
-    ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IUICLog2 __RPC_FAR *This);
+    ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IQt3DSLog2 __RPC_FAR *This);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount)
-    (IUICLog2 __RPC_FAR *This,
+    (IQt3DSLog2 __RPC_FAR *This,
      /* [out] */ UINT __RPC_FAR *pctinfo);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo)
-    (IUICLog2 __RPC_FAR *This,
+    (IQt3DSLog2 __RPC_FAR *This,
      /* [in] */ UINT iTInfo,
      /* [in] */ LCID lcid,
      /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
 
     HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames)
-    (IUICLog2 __RPC_FAR *This,
+    (IQt3DSLog2 __RPC_FAR *This,
      /* [in] */ REFIID riid,
      /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
      /* [in] */ UINT cNames,
@@ -291,7 +291,7 @@ typedef struct IUICLog2Vtbl
      /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
 
     /* [local] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Invoke)(
-        IUICLog2 __RPC_FAR *This,
+        IQt3DSLog2 __RPC_FAR *This,
         /* [in] */ DISPID dispIdMember,
         /* [in] */ REFIID riid,
         /* [in] */ LCID lcid,
@@ -302,69 +302,69 @@ typedef struct IUICLog2Vtbl
         /* [out] */ UINT __RPC_FAR *puArgErr);
 
     /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntry)(
-        IUICLog2 __RPC_FAR *This,
+        IQt3DSLog2 __RPC_FAR *This,
         /* [in] */ DWORD inLogType,
         /* [in] */ BYTE __RPC_FAR *inLogEntry);
 
-    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IUICLog2 __RPC_FAR *This);
+    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IQt3DSLog2 __RPC_FAR *This);
 
-    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IUICLog2 __RPC_FAR *This);
+    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IQt3DSLog2 __RPC_FAR *This);
 
-    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntryIndirect)(IUICLog2 __RPC_FAR *This,
+    /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntryIndirect)(IQt3DSLog2 __RPC_FAR *This,
                                                                       /* [in] */ LONG inStructPtr);
 
     END_INTERFACE
-} IUICLog2Vtbl;
+} IQt3DSLog2Vtbl;
 
-interface IUICLog2
+interface IQt3DSLog2
 {
-    CONST_VTBL struct IUICLog2Vtbl __RPC_FAR *lpVtbl;
+    CONST_VTBL struct IQt3DSLog2Vtbl __RPC_FAR *lpVtbl;
 };
 
 #ifdef COBJMACROS
 
-#define IUICLog2_QueryInterface(This, riid, ppvObject)                                             \
+#define IQt3DSLog2_QueryInterface(This, riid, ppvObject)                                             \
     (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
 
-#define IUICLog2_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IQt3DSLog2_AddRef(This) (This)->lpVtbl->AddRef(This)
 
-#define IUICLog2_Release(This) (This)->lpVtbl->Release(This)
+#define IQt3DSLog2_Release(This) (This)->lpVtbl->Release(This)
 
-#define IUICLog2_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
+#define IQt3DSLog2_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
 
-#define IUICLog2_GetTypeInfo(This, iTInfo, lcid, ppTInfo)                                          \
+#define IQt3DSLog2_GetTypeInfo(This, iTInfo, lcid, ppTInfo)                                          \
     (This)->lpVtbl->GetTypeInfo(This, iTInfo, lcid, ppTInfo)
 
-#define IUICLog2_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)                      \
+#define IQt3DSLog2_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)                      \
     (This)->lpVtbl->GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)
 
-#define IUICLog2_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,           \
+#define IQt3DSLog2_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,           \
                         pExcepInfo, puArgErr)                                                      \
     (This)->lpVtbl->Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult,        \
                            pExcepInfo, puArgErr)
 
-#define IUICLog2_AddEntry(This, inLogType, inLogEntry)                                             \
+#define IQt3DSLog2_AddEntry(This, inLogType, inLogEntry)                                             \
     (This)->lpVtbl->AddEntry(This, inLogType, inLogEntry)
 
-#define IUICLog2_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
+#define IQt3DSLog2_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
 
-#define IUICLog2_Terminate(This) (This)->lpVtbl->Terminate(This)
+#define IQt3DSLog2_Terminate(This) (This)->lpVtbl->Terminate(This)
 
-#define IUICLog2_AddEntryIndirect(This, inStructPtr)                                               \
+#define IQt3DSLog2_AddEntryIndirect(This, inStructPtr)                                               \
     (This)->lpVtbl->AddEntryIndirect(This, inStructPtr)
 
 #endif /* COBJMACROS */
 
 #endif /* C style interface */
 
-/* [id] */ HRESULT STDMETHODCALLTYPE IUICLog2_AddEntryIndirect_Proxy(IUICLog2 __RPC_FAR *This,
+/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog2_AddEntryIndirect_Proxy(IQt3DSLog2 __RPC_FAR *This,
                                                                      /* [in] */ LONG inStructPtr);
 
-void __RPC_STUB IUICLog2_AddEntryIndirect_Stub(IRpcStubBuffer *This,
+void __RPC_STUB IQt3DSLog2_AddEntryIndirect_Stub(IRpcStubBuffer *This,
                                                IRpcChannelBuffer *_pRpcChannelBuffer,
                                                PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
 
-#endif /* __IUICLog2_INTERFACE_DEFINED__ */
+#endif /* __IQt3DSLog2_INTERFACE_DEFINED__ */
 
 #ifndef __LOGPROJECTLib_LIBRARY_DEFINED__
 #define __LOGPROJECTLib_LIBRARY_DEFINED__
@@ -374,18 +374,18 @@ void __RPC_STUB IUICLog2_AddEntryIndirect_Stub(IRpcStubBuffer *This,
 
 EXTERN_C const IID LIBID_LOGPROJECTLib;
 
-EXTERN_C const CLSID CLSID_UICLog;
+EXTERN_C const CLSID CLSID_Qt3DSLog;
 
 #ifdef __cplusplus
 
-class DECLSPEC_UUID("DE411D6F-2BDA-444C-AC87-9171BAFD9E99") UICLog;
+class DECLSPEC_UUID("DE411D6F-2BDA-444C-AC87-9171BAFD9E99") Qt3DSLog;
 #endif
 
-EXTERN_C const CLSID CLSID_UICLog2;
+EXTERN_C const CLSID CLSID_Qt3DSLog2;
 
 #ifdef __cplusplus
 
-class DECLSPEC_UUID("4691F58A-9856-43c6-9269-7A8987AFC715") UICLog2;
+class DECLSPEC_UUID("4691F58A-9856-43c6-9269-7A8987AFC715") Qt3DSLog2;
 #endif
 #endif /* __LOGPROJECTLib_LIBRARY_DEFINED__ */
 
diff --git a/src/Authoring/Client/Code/Shared/Log/LogTypes.h b/src/Authoring/Client/Code/Shared/Log/LogTypes.h
index fca0a7e0..40aa6d6f 100644
--- a/src/Authoring/Client/Code/Shared/Log/LogTypes.h
+++ b/src/Authoring/Client/Code/Shared/Log/LogTypes.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef __UICLOGTYPES_H_
-#define __UICLOGTYPES_H_
+#ifndef __QT3DS_LOG_TYPES_H_
+#define __QT3DS_LOG_TYPES_H_
 
 #ifndef MAX_PATH
 #define MAX_PATH 1024
@@ -60,8 +60,8 @@ typedef struct _TSAddEntryIndirect
 //	TSAddEntryIndirect mask ids
 //==============================================================================
 
-const unsigned long UICLOG_STRING = 0x00000001; ///<
-const unsigned long UICLOG_ID = 0x00000002; ///<
+const unsigned long QT3DS_LOG_STRING = 0x00000001; ///<
+const unsigned long QT3DS_LOG_ID = 0x00000002; ///<
 
 //==============================================================================
 //	Log Modes
@@ -85,4 +85,4 @@ enum ELogLevel {
     LOGLEVEL_INFO = 3,
 };
 
-#endif // __UICLOGTYPES_H_
+#endif // __QT3DS_LOG_TYPES_H_
diff --git a/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h b/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h
index a2926de2..51901452 100644
--- a/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h
+++ b/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h
@@ -31,8 +31,8 @@
 //    Prefix
 //==============================================================================
 
-#ifndef _UICLOG_H__
-#define _UICLOG_H__
+#ifndef _QT3DS_LOG_H__
+#define _QT3DS_LOG_H__
 
 #pragma once
 
@@ -89,8 +89,8 @@
 
 /*
 #define QT3DS_LOGGLOBAL                             \
-        IUICLog2*    CLogHelper::s_UICLog2 = NULL;  \
-        long        CLogHelper::s_UICLogCount = 0;
+        IQt3DSLog2*    CLogHelper::s_Qt3DSLog2 = NULL;  \
+        long        CLogHelper::s_Qt3DSLogCount = 0;
 */
 
 // Publish global log variable.  Add this to every file, preferably in stdafx.h
@@ -116,4 +116,4 @@
 #define QT3DS_TRACE CLogHelper::Trace
 
 #endif // #ifndef QT3DS_NO_LOGGING
-#endif // #ifndef _UICLOG_H__
+#endif // #ifndef _QT3DS_LOG_H__
diff --git a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.cpp b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.cpp
index 0bc2b053..d612f432 100644
--- a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.cpp
+++ b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.cpp
@@ -35,13 +35,13 @@
 #include "Qt3DSExceptions.h"
 #include "Qt3DSExceptionClass.h"
 
-bool CUICExceptionClass::s_HandlingTypes = true;
+bool Qt3DSExceptionClass::s_HandlingTypes = true;
 
 //==============================================================================
 /**
- *	Constructs a CUICExceptionClass object.
+ *	Constructs a Qt3DSExceptionClass object.
  *
- *	This method creates a CUICExceptionClass object.
+ *	This method creates a Qt3DSExceptionClass object.
  *
  *	@param	<long>			inlong			The long to check for failure
  *	@param	<const char*>	inFileName		The name of the file of the calling function
@@ -52,7 +52,7 @@ bool CUICExceptionClass::s_HandlingTypes = true;
  *	@param	<va_list>		inParameters	A pointer to the optional arugments for
  *string formatting purposes
  */
-CUICExceptionClass::CUICExceptionClass(const wchar_t *inFileName, const unsigned long inLineNumber,
+Qt3DSExceptionClass::Qt3DSExceptionClass(const wchar_t *inFileName, const unsigned long inLineNumber,
                                        const long inErrorCode, const long inlong,
                                        va_list inParameters)
 #ifdef KDAB_TEMPORARILY_REMOVED
@@ -84,10 +84,10 @@ CUICExceptionClass::CUICExceptionClass(const wchar_t *inFileName, const unsigned
 /**
  *	Handles the exception
  */
-void CUICExceptionClass::HandleException()
+void Qt3DSExceptionClass::HandleException()
 {
     // Check registry for changes
-    CUICExceptionClass::Initialize();
+    Qt3DSExceptionClass::Initialize();
 
     // Are we handling this type of exception?
     //
@@ -116,7 +116,7 @@ void CUICExceptionClass::HandleException()
  *
  *	@return bool	TRUE	the description was formatted correctly.
  */
-bool CUICExceptionClass::FormatDescription()
+bool Qt3DSExceptionClass::FormatDescription()
 {
 #ifdef KDAB_TEMPORARILY_REMOVED
     bool theResult = false;
@@ -192,7 +192,7 @@ bool CUICExceptionClass::FormatDescription()
 /**
  *	Breaks immediately in the debugger.
  */
-void CUICExceptionClass::BreakInDebugger()
+void Qt3DSExceptionClass::BreakInDebugger()
 {
 #ifdef _DEBUG
 #ifdef WIN32
@@ -206,7 +206,7 @@ void CUICExceptionClass::BreakInDebugger()
 /**
  *	Displays the exception description in a windows message box.
  */
-void CUICExceptionClass::DisplayMessageBox()
+void Qt3DSExceptionClass::DisplayMessageBox()
 {
 #ifdef KDAB_TEMPORARILY_REMOVED
     // Display the exception in a message box?
@@ -249,7 +249,7 @@ void CUICExceptionClass::DisplayMessageBox()
 /**
  *	Output the exception description to the development environment debug window.
  */
-void CUICExceptionClass::Output2Debugger()
+void Qt3DSExceptionClass::Output2Debugger()
 {
 #ifdef KDAB_TEMPORARILY_REMOVED
 #ifdef _DEBUG
@@ -276,7 +276,7 @@ void CUICExceptionClass::Output2Debugger()
  *	Method opens up the key at HKEY_CURRENT_USER/m_RegistryPreferencePath.
  *	The three DWORD values looked up are: TrackErrorTypes, ReportingLevel and ErrorAction
  */
-void CUICExceptionClass::Initialize()
+void Qt3DSExceptionClass::Initialize()
 {
     /*
     #ifdef WIN32
@@ -336,7 +336,7 @@ void CUICExceptionClass::Initialize()
  *	@param	<...>							Optional arugments for string
  *formatting purposes
  */
-void CUICExceptionClass::Throw(const wchar_t *inFileName, const unsigned long inLineNumber,
+void Qt3DSExceptionClass::Throw(const wchar_t *inFileName, const unsigned long inLineNumber,
                                const long inErrorCode, ...)
 {
     // Define a parameter list
@@ -347,7 +347,7 @@ void CUICExceptionClass::Throw(const wchar_t *inFileName, const unsigned long in
 
 #ifdef KDAB_TEMPORARILY_REMOVED
     // Throw an exception
-    throw CUICExceptionClass(inFileName, inLineNumber, inErrorCode, S_FALSE, theParameters);
+    throw Qt3DSExceptionClass(inFileName, inLineNumber, inErrorCode, S_FALSE, theParameters);
 #endif
 }
 
@@ -370,7 +370,7 @@ void CUICExceptionClass::Throw(const wchar_t *inFileName, const unsigned long in
  *	@param	<...>								Optional arugments for
  *string formatting purposes
  */
-void CUICExceptionClass::ThrowFail(const long inlong, const wchar_t *inFileName,
+void Qt3DSExceptionClass::ThrowFail(const long inlong, const wchar_t *inFileName,
                                    const unsigned long inLineNumber, const long inErrorCode, ...)
 {
     // Define a parameter list
@@ -383,7 +383,7 @@ void CUICExceptionClass::ThrowFail(const long inlong, const wchar_t *inFileName,
 #ifdef KDAB_TEMPORARILY_REMOVED
     if (FAILED(inlong)) {
         // Throw an exception
-        throw CUICExceptionClass(inFileName, inLineNumber, inErrorCode, inlong, theParameters);
+        throw Qt3DSExceptionClass(inFileName, inLineNumber, inErrorCode, inlong, theParameters);
     }
 #endif
 }
@@ -406,7 +406,7 @@ void CUICExceptionClass::ThrowFail(const long inlong, const wchar_t *inFileName,
  *	@param	<...>							Optional arugments for string
  *formatting purposes
  */
-void CUICExceptionClass::ThrowFalse(bool inCondition, const wchar_t *inFileName,
+void Qt3DSExceptionClass::ThrowFalse(bool inCondition, const wchar_t *inFileName,
                                     const unsigned long inLineNumber, const long inErrorCode, ...)
 {
     // Define a parameter list
@@ -419,7 +419,7 @@ void CUICExceptionClass::ThrowFalse(bool inCondition, const wchar_t *inFileName,
     if (!inCondition) {
         // Throw an exception
 #ifdef KDAB_TEMPORARILY_REMOVED
-        throw CUICExceptionClass(inFileName, inLineNumber, inErrorCode, S_FALSE, theParameters);
+        throw Qt3DSExceptionClass(inFileName, inLineNumber, inErrorCode, S_FALSE, theParameters);
 #endif
     }
 }
diff --git a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.h b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.h
index 624baf85..55940f33 100644
--- a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.h
+++ b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionClass.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef __UICEXCEPTIONCLASS_H_
-#define __UICEXCEPTIONCLASS_H_
+#ifndef __QT3DS_EXCEPTION_CLASS_H_
+#define __QT3DS_EXCEPTION_CLASS_H_
 
 //==============================================================================
 //	Includes
@@ -67,7 +67,7 @@ const short MAX_STACKTRACE_LENGTH = 1024;
  *	@class	CExceptionClass
  *	@brief
  */
-class CUICExceptionClass : public CStudioException
+class Qt3DSExceptionClass : public CStudioException
 {
     //==============================================================================
     //	Fields
@@ -92,9 +92,9 @@ protected:
     // Construction
 
 protected:
-    CUICExceptionClass(const wchar_t *inFileName, const unsigned long inLineNumber,
+    Qt3DSExceptionClass(const wchar_t *inFileName, const unsigned long inLineNumber,
                        const long inErrorCode, const long inlong, va_list inParameters);
-    virtual ~CUICExceptionClass() {}
+    virtual ~Qt3DSExceptionClass() {}
 
     // Access
 
@@ -137,4 +137,4 @@ protected:
     static void Initialize();
 };
 
-#endif //__UICEXCEPTIONCLASS_H_
+#endif //__QT3DS_EXCEPTION_CLASS_H_
diff --git a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionConstants.h b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionConstants.h
index b776b39a..48c58e84 100644
--- a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionConstants.h
+++ b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptionConstants.h
@@ -31,8 +31,8 @@
 //	Prefix
 //==============================================================================
 
-#ifndef __UICEXCEPTIONCONSTANTS_H__
-#define __UICEXCEPTIONCONSTANTS_H__
+#ifndef __QT3DS_EXCEPTION_CONSTANTS_H__
+#define __QT3DS_EXCEPTION_CONSTANTS_H__
 
 const unsigned long ERROR_TYPE_PLAYER = 0x00000001;
 const unsigned long ERROR_TYPE_LIBRARY = 0x00000002;
@@ -50,4 +50,4 @@ const unsigned long ERROR_TYPE_UTILITY = 0x00001000;
 const unsigned long ERROR_TYPE_TRANSM = 0x00002000;
 const unsigned long ERROR_TYPE_INSTALLER = 0x00004000;
 
-#endif // #ifndef __UICEXCEPTIONCONSTANTS_H__
-\ No newline at end of file
+#endif // #ifndef __QT3DS_EXCEPTION_CONSTANTS_H__
diff --git a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptions.h b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptions.h
index 8586899b..847004b8 100644
--- a/src/Authoring/Common/Code/Exceptions/Qt3DSExceptions.h
+++ b/src/Authoring/Common/Code/Exceptions/Qt3DSExceptions.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef _UICEXCEPTIONS_H__
-#define _UICEXCEPTIONS_H__
+#ifndef _QT3DS_EXCEPTIONS_H__
+#define _QT3DS_EXCEPTIONS_H__
 
 //==============================================================================
 //	Includes
@@ -55,7 +55,7 @@ const unsigned long LEVEL_ERROR = 0x00000003;
 #define QT3DS_DEFINE_THISFILE static wchar_t QT3DS_THIS_FILE[] = __WFILE__;
 
 // The class
-#define QT3DS_EXCEPTION CUICExceptionClass
+#define QT3DS_EXCEPTION Qt3DSExceptionClass
 
 // An exception with no extra parameters.
 #define QT3DS_THROW(inErrorCode) QT3DS_EXCEPTION::Throw(__WFILE__, __LINE__, inErrorCode);
@@ -141,4 +141,4 @@ const unsigned long LEVEL_ERROR = 0x00000003;
 #define E_FAIL 0x80004005L
 #endif
 
-#endif // #ifndef _UICEXCEPTIONS_H__
+#endif // #ifndef _QT3DS_EXCEPTIONS_H__
diff --git a/src/Authoring/Common/Code/FileIterator.h b/src/Authoring/Common/Code/FileIterator.h
index a3743ac0..aab4fba1 100644
--- a/src/Authoring/Common/Code/FileIterator.h
+++ b/src/Authoring/Common/Code/FileIterator.h
@@ -38,18 +38,18 @@
 #include <vector>
 #include "Qt3DSString.h"
 
-class CUICFile;
+class Qt3DSFile;
 
 class CFileIterator
 {
 public:
-    CFileIterator(const CUICFile *inFile);
+    CFileIterator(const Qt3DSFile *inFile);
     virtual ~CFileIterator();
     virtual bool IsDone();
     virtual void operator++();
 
     virtual void operator+=(const long inNumToInc);
-    virtual CUICFile GetCurrent();
+    virtual Qt3DSFile GetCurrent();
 
     virtual size_t GetTotal();
 
diff --git a/src/Authoring/Common/Code/GUIDUtilities.h b/src/Authoring/Common/Code/GUIDUtilities.h
index f6a8dd2a..7bc3e77f 100644
--- a/src/Authoring/Common/Code/GUIDUtilities.h
+++ b/src/Authoring/Common/Code/GUIDUtilities.h
@@ -182,7 +182,7 @@ public:
     {
         Q3DStudio::CString theGuidStr;
 
-        // theGuidStr.Format( _UIC( "{%08X-%04hX-%04hX-%02X%02X-%02X%02X%02X%02X%02X%02X}" ),
+        // theGuidStr.Format( _LSTR( "{%08X-%04hX-%04hX-%02X%02X-%02X%02X%02X%02X%02X%02X}" ),
         //										inGuid.Data1,
         //										inGuid.Data2,
         //										inGuid.Data3,
diff --git a/src/Authoring/Common/Code/IO/IOStreams.cpp b/src/Authoring/Common/Code/IO/IOStreams.cpp
index 45c7fd50..4f4de6b2 100644
--- a/src/Authoring/Common/Code/IO/IOStreams.cpp
+++ b/src/Authoring/Common/Code/IO/IOStreams.cpp
@@ -116,9 +116,9 @@ void CInStream::GetURL(wchar_t *ioURLString, const long &inSize)
         // the job...
 
         // the stuff that dint work:
-        // theCharCount = _aswprintf( ioURLString, inSize, _UIC( "%s" ), theString );
+        // theCharCount = _aswprintf( ioURLString, inSize, _LSTR( "%s" ), theString );
         // ... that's even when you call the swprintf directly...
-        // theCharCount = swprintf(ioURLString, inSize, _UIC( "%s" ), (unsigned short *)theString );
+        // theCharCount = swprintf(ioURLString, inSize, _LSTR( "%s" ), (unsigned short *)theString );
 
         // the sloppy solution
         for (long theCharCount = 0; theCharCount < theEndCount; ++theCharCount) {
@@ -199,9 +199,9 @@ void COutStream::GetURL(wchar_t *ioURLString, const long &inSize)
 {
     if (inSize >= m_URLString.Length())
 #ifdef WIN32
-        _aswprintf(ioURLString, inSize, _UIC("%ls"), static_cast<const wchar_t *>(m_URLString));
+        _aswprintf(ioURLString, inSize, _LSTR("%ls"), static_cast<const wchar_t *>(m_URLString));
 #else
-        swprintf(ioURLString, inSize, _UIC("%ls"), static_cast<const wchar_t *>(m_URLString));
+        swprintf(ioURLString, inSize, _LSTR("%ls"), static_cast<const wchar_t *>(m_URLString));
 #endif
     else
         throw CIOException();
diff --git a/src/Authoring/Common/Code/MasterP.h b/src/Authoring/Common/Code/MasterP.h
index 9ad0aef9..457b347e 100644
--- a/src/Authoring/Common/Code/MasterP.h
+++ b/src/Authoring/Common/Code/MasterP.h
@@ -35,15 +35,15 @@
 
 /**
 To use it just add to the start of the section you are looking to profile:
-        UICPROFILE( MethodName );
+        QT3DS_PROFILE( MethodName );
 
-UICPROFILE is defined in MasterP.h
+QT3DS_PROFILE is defined in MasterP.h
 
 The profiler uses a stack variable to start and stop, so it will automatically stop when it gets
 destructed.
 To profile sub sections of a method you can do:
 {
-        UICPROFILE( MethodName_Subsection );
+        QT3DS_PROFILE( MethodName_Subsection );
         CodeToBeProfiled( );
 }
 
@@ -132,14 +132,14 @@ protected:
 // function.
 
 #ifdef PERFORM_PROFILE
-#define UICPROFILE(inName)                                                                         \
+#define QT3DS_PROFILE(inName)                                                                         \
     static CMethProf the##inName##StaticProf(Q3DStudio::CString(__FUNCTION__)                      \
                                              + Q3DStudio::CString("::")                            \
                                              + Q3DStudio::CString(#inName));                       \
     CProfiler the##inName##Prof(&the##inName##StaticProf)
 
 #else
-#define UICPROFILE(inName)
+#define QT3DS_PROFILE(inName)
 #endif
 
-#endif // INCLUDED_MASTER_PROF_H
-\ No newline at end of file
+#endif // INCLUDED_MASTER_PROF_H
diff --git a/src/Authoring/Common/Code/MethProf.cpp b/src/Authoring/Common/Code/MethProf.cpp
index 88273488..7cf6a269 100644
--- a/src/Authoring/Common/Code/MethProf.cpp
+++ b/src/Authoring/Common/Code/MethProf.cpp
@@ -149,7 +149,7 @@ float CMethProf::GetMaxMillis()
 Q3DStudio::CString CMethProf::GetDescription()
 {
     Q3DStudio::CString theString;
-    theString.Format(_UIC("%ls      cc: %d      tt: %d      mt: %8.2f      at: %8.2f"),
+    theString.Format(_LSTR("%ls      cc: %d      tt: %d      mt: %8.2f      at: %8.2f"),
                      (const wchar_t *)m_Name, m_CallCount, GetTotalMillis(), GetMaxMillis(),
                      GetAverageMillis());
     return theString;
diff --git a/src/Authoring/Common/Code/Qt3DSFile.h b/src/Authoring/Common/Code/Qt3DSFile.h
index c1736eee..0735faeb 100644
--- a/src/Authoring/Common/Code/Qt3DSFile.h
+++ b/src/Authoring/Common/Code/Qt3DSFile.h
@@ -44,7 +44,7 @@
 typedef std::set<Q3DStudio::CString> TFilePathList;
 typedef TFilePathList::iterator TFilePathListIterator;
 
-class CUICFile
+class Qt3DSFile
 {
 
 public:
@@ -53,17 +53,17 @@ public:
     static const Q3DStudio::CString CURRENT_DIR;
     static const Q3DStudio::CString PARENT_DIR;
 
-    CUICFile(const Q3DStudio::CString &inPathName, bool inIsPosix = false, bool inAddBase = true);
-    CUICFile(const Q3DStudio::CString &inPathName, const Q3DStudio::CString &inName);
-    CUICFile(const CUICFile &inBasePath, const Q3DStudio::CString &inPathname,
+    Qt3DSFile(const Q3DStudio::CString &inPathName, bool inIsPosix = false, bool inAddBase = true);
+    Qt3DSFile(const Q3DStudio::CString &inPathName, const Q3DStudio::CString &inName);
+    Qt3DSFile(const Qt3DSFile &inBasePath, const Q3DStudio::CString &inPathname,
              bool inIsPosix = false);
-    CUICFile(const CUICFile &inFile);
+    Qt3DSFile(const Qt3DSFile &inFile);
 
     CFileIterator GetSubItems() const;
 
-    ~CUICFile();
+    ~Qt3DSFile();
 
-    bool operator==(const CUICFile &inRHS) const;
+    bool operator==(const Qt3DSFile &inRHS) const;
 
     bool CanRead() const;
     bool CanWrite() const;
@@ -81,24 +81,24 @@ public:
     bool IsHidden() const;
     long Length() const;
 
-    OSErr MoveTo(const CUICFile &inDestination);
-    void CopyTo(const CUICFile &inDestination);
+    OSErr MoveTo(const Qt3DSFile &inDestination);
+    void CopyTo(const Qt3DSFile &inDestination);
 
     void Execute() const;
 
     OSErr SetReadOnly(bool inReadOnlyFlag);
 
-    static CUICFile GetApplicationDirectory();
-    static CUICFile GetTemporaryFile(const Q3DStudio::CString &inExtension);
-    static CUICFile GetTemporaryFile();
+    static Qt3DSFile GetApplicationDirectory();
+    static Qt3DSFile GetTemporaryFile(const Q3DStudio::CString &inExtension);
+    static Qt3DSFile GetTemporaryFile();
     static bool IsPathRelative(const Q3DStudio::CString &inPath);
 
     QUrl GetURL() const;
 
-    static CUICFile Combine(const CUICFile &inFile, const Q3DStudio::CString &inRelPath);
+    static Qt3DSFile Combine(const Qt3DSFile &inFile, const Q3DStudio::CString &inRelPath);
     HANDLE OpenFileReadHandle() const;
     HANDLE OpenFileWriteHandle() const;
-    void RenameTo(const CUICFile &inDestination);
+    void RenameTo(const Qt3DSFile &inDestination);
     bool GetFileStat(struct _stat *inStat) const;
 
     static void ClearCurrentTempCache();
diff --git a/src/Authoring/Common/Code/Qt3DSFileToolTypes.h b/src/Authoring/Common/Code/Qt3DSFileToolTypes.h
index 352bee25..fb4329b5 100644
--- a/src/Authoring/Common/Code/Qt3DSFileToolTypes.h
+++ b/src/Authoring/Common/Code/Qt3DSFileToolTypes.h
@@ -31,8 +31,8 @@
 //	Prefix
 //==============================================================================
 #pragma once
-#ifndef INCLUDED_UICFILETOOL_ENUMS_H
-#define INCLUDED_UICFILETOOL_ENUMS_H
+#ifndef INCLUDED_QT3DS_FILETOOL_ENUMS_H
+#define INCLUDED_QT3DS_FILETOOL_ENUMS_H
 #include "foundation/Qt3DS.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/IOStreams.h"
diff --git a/src/Authoring/Common/Code/Qt3DSFileTools.cpp b/src/Authoring/Common/Code/Qt3DSFileTools.cpp
index 1ec3cb40..9b57aa47 100644
--- a/src/Authoring/Common/Code/Qt3DSFileTools.cpp
+++ b/src/Authoring/Common/Code/Qt3DSFileTools.cpp
@@ -231,7 +231,7 @@ void CFilePath::SetIdentifier(unsigned long inIdentifier)
 bool CFilePath::GetTempDirectory()
 {
     CString path = QDir::tempPath().toLatin1().data();
-    UICAssign(path);
+    StrAssign(path);
 
     return TRUE;
 }
@@ -259,7 +259,7 @@ bool CFilePath::GetTemporaryFileName(const CString &inPrefix, const CString &inD
 
 bool CFilePath::GetModuleFilePath(/*HMODULE inModuleHandle*/)
 {
-    UICAssign(CString::fromQString(qApp->applicationFilePath()));
+    StrAssign(CString::fromQString(qApp->applicationFilePath()));
     return true;
 }
 
@@ -354,7 +354,7 @@ bool CFilePath::GetCurrentDir()
 #ifdef KDAB_TEMPORARILY_REMOVED
     wchar_t szPath[_MAX_PATH] = L"\0";
     ::GetCurrentDirectoryW(sizeof(szPath) / sizeof(wchar_t), szPath);
-    UICAssign(szPath);
+    StrAssign(szPath);
 #ifdef _WIN32
     *this += L"\\";
 #else
diff --git a/src/Authoring/Common/Code/Qt3DSFileTools.h b/src/Authoring/Common/Code/Qt3DSFileTools.h
index 766e008d..07c8a6aa 100644
--- a/src/Authoring/Common/Code/Qt3DSFileTools.h
+++ b/src/Authoring/Common/Code/Qt3DSFileTools.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICFILETOOLS_H
-#define INCLUDED_UICFILETOOLS_H 1
+#ifndef INCLUDED_QT3DS_FILETOOLS_H
+#define INCLUDED_QT3DS_FILETOOLS_H 1
 
 #pragma once
 
@@ -485,4 +485,4 @@ struct SFileTools
 
 QDebug operator<<(QDebug stream, const Q3DStudio::CFilePath &s);
 
-#endif // INCLUDED_UICFILETOOLS_H
+#endif // INCLUDED_QT3DS_FILETOOLS_H
diff --git a/src/Authoring/Common/Code/Qt3DSFunctor.h b/src/Authoring/Common/Code/Qt3DSFunctor.h
index f725607c..1d874385 100644
--- a/src/Authoring/Common/Code/Qt3DSFunctor.h
+++ b/src/Authoring/Common/Code/Qt3DSFunctor.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICFUNCTOR
-#define INCLUDED_UICFUNCTOR
+#ifndef _QT3DS_FUNCTOR_
+#define _QT3DS_FUNCTOR_
 
 #include <typeinfo>
 
@@ -428,4 +428,4 @@ protected:
 };
 } // namespace Q3DStudio
 
-#endif // __UICFunctor_H__
-\ No newline at end of file
+#endif // __QT3DS_Functor_H__
diff --git a/src/Authoring/Common/Code/Qt3DSId.cpp b/src/Authoring/Common/Code/Qt3DSId.cpp
index 72cdab1f..6fd32b24 100644
--- a/src/Authoring/Common/Code/Qt3DSId.cpp
+++ b/src/Authoring/Common/Code/Qt3DSId.cpp
@@ -252,7 +252,7 @@ CId &CId::operator=(const CId &inRVal)
 Q3DStudio::CString CId::ToString() const
 {
     Q3DStudio::CString theGuidStr;
-    theGuidStr.Format(_UIC("{%08X-%04hX-%04hX-%02X%02X-%02X%02X%02X%02X%02X%02X}"),
+    theGuidStr.Format(_LSTR("{%08X-%04hX-%04hX-%02X%02X-%02X%02X%02X%02X%02X%02X}"),
                       m_Key.GuidStd.Data1, m_Key.GuidStd.Data2, m_Key.GuidStd.Data3,
                       m_Key.GuidStd.Data4[0], (unsigned long)m_Key.GuidStd.Data4[1],
                       (unsigned long)m_Key.GuidStd.Data4[2], (unsigned long)m_Key.GuidStd.Data4[3],
diff --git a/src/Authoring/Common/Code/Qt3DSId.h b/src/Authoring/Common/Code/Qt3DSId.h
index 2bd547f5..e65553a7 100644
--- a/src/Authoring/Common/Code/Qt3DSId.h
+++ b/src/Authoring/Common/Code/Qt3DSId.h
@@ -31,8 +31,8 @@
 //	Prefix
 //==============================================================================
 
-#ifndef INCLUDEED_UICID
-#define INCLUDEED_UICID
+#ifndef _QT3DS_ID_
+#define _QT3DS_ID_
 
 #pragma once
 
diff --git a/src/Authoring/Common/Code/Qt3DSMacros.h b/src/Authoring/Common/Code/Qt3DSMacros.h
index fa97ca44..ee34e448 100644
--- a/src/Authoring/Common/Code/Qt3DSMacros.h
+++ b/src/Authoring/Common/Code/Qt3DSMacros.h
@@ -62,15 +62,15 @@
 #endif
 
 //==============================================================================
-//	UICTODO Development Macro
+//	QT3DS_TODO Development Macro
 //	Usage:
 //
-//	"#pragma UICTODO(Message)" yields "__FILE__>(__LINE__) : To Do - <Message>"
+//	"#pragma QT3DS_TODO(Message)" yields "__FILE__>(__LINE__) : To Do - <Message>"
 //
 //	in the Build Pane of the Output Window
 //
 //	For example:
-//		#pragma UICTODO(SDJ, 11/12/00, Clean up this code) might result in
+//		#pragma QT3DS_TODO(SDJ, 11/12/00, Clean up this code) might result in
 //		C:\Code\Project\File.cpp(20) : [ 11/12/00 ] SDJ - Clean up this code
 //
 //	Double-clicking this line opens the specified file to the specified line in
@@ -82,7 +82,7 @@
 //==============================================================================
 #define chSTR(x) #x
 #define chSTR2(x) chSTR(x)
-#define UICTODO(author, date, description)                                                         \
+#define QT3DS_TODO(author, date, description)                                                         \
     message(__FILE__ "(" chSTR2(__LINE__) "): [ " #date " ] " #author " - " #description)
 
 template <typename T, size_t N>
diff --git a/src/Authoring/Common/Code/Qt3DSMath.h b/src/Authoring/Common/Code/Qt3DSMath.h
index 3ff65173..aa9b53c3 100644
--- a/src/Authoring/Common/Code/Qt3DSMath.h
+++ b/src/Authoring/Common/Code/Qt3DSMath.h
@@ -26,8 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef __UICMATH_H__
-#define __UICMATH_H__
+#ifndef __QT3DS_MATH_H__
+#define __QT3DS_MATH_H__
 
 //==============================================================================
 //	Includes
@@ -431,4 +431,4 @@ public: // Static common matrices
 
 } // namespace Q3DStudio
 
-#endif //__UICMATH_H_
+#endif //__QT3DS_MATH_H_
diff --git a/src/Authoring/Common/Code/Qt3DSMemory.cpp b/src/Authoring/Common/Code/Qt3DSMemory.cpp
index b2989be3..d82623b0 100644
--- a/src/Authoring/Common/Code/Qt3DSMemory.cpp
+++ b/src/Authoring/Common/Code/Qt3DSMemory.cpp
@@ -148,7 +148,7 @@ void *CSharedMemory::Allocate(long inSize)
     theSharedMemory->m_Size = inSize;
     theSharedMemory->m_RefCount = 1;
 #ifdef DEBUG
-    theSharedMemory->m_Signature = UICMEM_HEADERSIG;
+    theSharedMemory->m_Signature = QT3DS_MEM_HEADERSIG;
 #endif
 
     // NULL terminate manually.  Quantization ensures there is space for it.
diff --git a/src/Authoring/Common/Code/Qt3DSMemory.h b/src/Authoring/Common/Code/Qt3DSMemory.h
index ac714976..97a21c83 100644
--- a/src/Authoring/Common/Code/Qt3DSMemory.h
+++ b/src/Authoring/Common/Code/Qt3DSMemory.h
@@ -27,13 +27,13 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef __UICMEMORY_H__
-#define __UICMEMORY_H__
+#ifndef __QT3DS_MEMORY_H__
+#define __QT3DS_MEMORY_H__
 
 #include "Qt3DSMacros.h"
 
 namespace Q3DStudio {
-#define UICMEM_HEADERSIG 0xF00D
+#define QT3DS_MEM_HEADERSIG 0xF00D
 
 //==============================================================================
 /**
@@ -81,7 +81,7 @@ protected:
     static void Validate(void *inMemory)
     {
         if ((reinterpret_cast<SSharedHeader *>(inMemory) - 1)->m_Size < 0
-            || UICMEM_HEADERSIG != (reinterpret_cast<SSharedHeader *>(inMemory) - 1)->m_Signature)
+            || QT3DS_MEM_HEADERSIG != (reinterpret_cast<SSharedHeader *>(inMemory) - 1)->m_Signature)
             CMemory::Error();
     }
     static SSharedHeader *Header(void *inMemory)
@@ -111,4 +111,4 @@ public:
     static void Free(void *inMemory);
 };
 } // namespace Q3DStudio
-#endif // __UICMEMORY_H__
+#endif // __QT3DS_MEMORY_H__
diff --git a/src/Authoring/Common/Code/Qt3DSMessageBox.cpp b/src/Authoring/Common/Code/Qt3DSMessageBox.cpp
index 0346db3f..7fbecd58 100644
--- a/src/Authoring/Common/Code/Qt3DSMessageBox.cpp
+++ b/src/Authoring/Common/Code/Qt3DSMessageBox.cpp
@@ -46,7 +46,7 @@ using namespace Q3DStudio;
 /**
  * Constructor
  */
-CUICMessageBox::CUICMessageBox()
+Qt3DSMessageBox::Qt3DSMessageBox()
 {
 }
 
@@ -54,7 +54,7 @@ CUICMessageBox::CUICMessageBox()
 /**
  * Destructor
  */
-CUICMessageBox::~CUICMessageBox()
+Qt3DSMessageBox::~Qt3DSMessageBox()
 {
 }
 
@@ -66,10 +66,10 @@ CUICMessageBox::~CUICMessageBox()
  * @param inIcon Icon to be displayed on the message box
  * @param inParentWindow window to attach this dialog to.
  */
-CUICMessageBox::EMessageBoxReturn
-CUICMessageBox::Show(const Q3DStudio::CString &inTitle, const Q3DStudio::CString &inText, EMessageBoxIcon inIcon,
+Qt3DSMessageBox::EMessageBoxReturn
+Qt3DSMessageBox::Show(const Q3DStudio::CString &inTitle, const Q3DStudio::CString &inText, EMessageBoxIcon inIcon,
                      bool inShowCancel /*false*/,
-                     CUICMessageBox::TPlatformWindow inParentWindow /*NULL*/)
+                     Qt3DSMessageBox::TPlatformWindow inParentWindow /*NULL*/)
 {
     QMessageBox box(inParentWindow);
     box.setWindowTitle(inTitle.toQString());
diff --git a/src/Authoring/Common/Code/Qt3DSMessageBox.h b/src/Authoring/Common/Code/Qt3DSMessageBox.h
index 9f856d5e..691ac6e6 100644
--- a/src/Authoring/Common/Code/Qt3DSMessageBox.h
+++ b/src/Authoring/Common/Code/Qt3DSMessageBox.h
@@ -61,7 +61,7 @@ QT_END_NAMESPACE
  * Generic cross-platform class for showing message boxes with an Ok and Cancel
  * button
  */
-class CUICMessageBox
+class Qt3DSMessageBox
 {
 public:
     /// Return codes from the message box
@@ -77,8 +77,8 @@ public:
 
     typedef QWidget* TPlatformWindow;
 
-    CUICMessageBox();
-    virtual ~CUICMessageBox();
+    Qt3DSMessageBox();
+    virtual ~Qt3DSMessageBox();
     static EMessageBoxReturn Show(const Q3DStudio::CString &inTitle, const Q3DStudio::CString &inText,
                                   EMessageBoxIcon inIcon, bool inShowCancel = false,
                                   TPlatformWindow inParentWindow = NULL);
diff --git a/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp b/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp
index 9ba2ac3b..d6eabef6 100644
--- a/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp
+++ b/src/Authoring/Common/Code/Qt3DSObjectCounter.cpp
@@ -37,4 +37,4 @@
 //==============================================================================
 #include "Qt3DSObjectCounter.h"
 
-TObjectCounterTracker UICObjectCounter::s_ObjectVector;
+TObjectCounterTracker Qt3DSObjectCounter::s_ObjectVector;
diff --git a/src/Authoring/Common/Code/Qt3DSObjectCounter.h b/src/Authoring/Common/Code/Qt3DSObjectCounter.h
index d36440bf..cc91076d 100644
--- a/src/Authoring/Common/Code/Qt3DSObjectCounter.h
+++ b/src/Authoring/Common/Code/Qt3DSObjectCounter.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef __UICOBJECTCOUNTER_H__
-#define __UICOBJECTCOUNTER_H__
+#ifndef __QT3DS_OBJECTCOUNTER_H__
+#define __QT3DS_OBJECTCOUNTER_H__
 
 //==============================================================================
 //	Includes
@@ -42,12 +42,12 @@
 //==============================================================================
 //	Forwards
 //==============================================================================
-class UICObjectCounter;
+class Qt3DSObjectCounter;
 
 //==============================================================================
 //	Typedefs
 //==============================================================================
-typedef std::vector<UICObjectCounter *> TObjectCounterTracker;
+typedef std::vector<Qt3DSObjectCounter *> TObjectCounterTracker;
 
 //==============================================================================
 //	Constants
@@ -56,10 +56,10 @@ typedef std::vector<UICObjectCounter *> TObjectCounterTracker;
 // If defined, track the object counts
 #ifdef TRACK_OBJECT_COUNTS
 
-#define DEFINE_OBJECT_COUNTER(classname) static UICObjectCounter s_ObjectCounter##classname;
+#define DEFINE_OBJECT_COUNTER(classname) static Qt3DSObjectCounter s_ObjectCounter##classname;
 
 #define IMPLEMENT_OBJECT_COUNTER(classname)                                                        \
-    UICObjectCounter classname::s_ObjectCounter##classname(#classname, sizeof(classname));
+    Qt3DSObjectCounter classname::s_ObjectCounter##classname(#classname, sizeof(classname));
 
 #define ADDTO_OBJECT_COUNTER(classname) classname::s_ObjectCounter##classname.Add();
 
@@ -101,7 +101,7 @@ typedef std::vector<UICObjectCounter *> TObjectCounterTracker;
 
 //==============================================================================
 /**
- *	@class	UICObjectCounter
+ *	@class	Qt3DSObjectCounter
  *	@brief	This class is used to track that object have been released.
  *
  *	Use the macros to make the feature easy.
@@ -110,7 +110,7 @@ typedef std::vector<UICObjectCounter *> TObjectCounterTracker;
  *	is destructed. When the static variable is destroyed, object counts are
  *	dumped out to the debugger.
  */
-class UICObjectCounter
+class Qt3DSObjectCounter
 {
     //==============================================================================
     //	Enumerations
@@ -133,7 +133,7 @@ private:
     //==============================================================================
 
 public:
-    UICObjectCounter(const char *inName, long inClassSize)
+    Qt3DSObjectCounter(const char *inName, long inClassSize)
         : m_ObjectCount(0)
         , m_ObjectSize(inClassSize)
     {
@@ -143,7 +143,7 @@ public:
         s_ObjectVector.push_back(this);
     }
 
-    ~UICObjectCounter()
+    ~Qt3DSObjectCounter()
     {
         if (m_ObjectCount > 0) {
 #ifdef WIN32
@@ -175,4 +175,4 @@ public:
     void Remove() { m_ObjectCount--; };
 };
 
-#endif // #ifndef __UICOBJECTCOUNTER_H__
+#endif // #ifndef __QT3DS_OBJECTCOUNTER_H__
diff --git a/src/Authoring/Common/Code/Qt3DSPoint.h b/src/Authoring/Common/Code/Qt3DSPoint.h
index ee95b21c..6cc8bcec 100644
--- a/src/Authoring/Common/Code/Qt3DSPoint.h
+++ b/src/Authoring/Common/Code/Qt3DSPoint.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef __UICPOINT_H__
-#define __UICPOINT_H__
+#ifndef __QT3DS_POINT_H__
+#define __QT3DS_POINT_H__
 
 #ifndef __PLATFORMCONVERSION_H__
 #include "PlatformConversion.h"
@@ -52,15 +52,15 @@ public:
     CPoint(int initX, int initY);
     CPoint(const CPoint &initPt);
 #ifndef __PLATFORMCONVERSION_H__
-    CPoint(const UICPoint &initPt);
-    CPoint(const UICPoint *initPt);
+    CPoint(const Qt3DSPoint &initPt);
+    CPoint(const Qt3DSPoint *initPt);
 #endif
 
     // Operations
     void Offset(int xOffset, int yOffset);
     void Offset(CPoint &point);
 #ifndef __PLATFORMCONVERSION_H__
-    void operator=(const UICPoint &srcPt);
+    void operator=(const Qt3DSPoint &srcPt);
 #endif
     bool operator==(CPoint &point) const;
     bool operator!=(CPoint &point) const;
@@ -87,13 +87,13 @@ inline CPoint::CPoint(const CPoint &initPt)
     *(CPoint *)this = initPt;
 }
 #ifndef __PLATFORMCONVERSION_H__
-inline CPoint::CPoint(const UICPoint &initPt)
+inline CPoint::CPoint(const Qt3DSPoint &initPt)
 {
-    CPlatformConversion::UICPointToCPoint(initPt, *this);
+    CPlatformConversion::Qt3DSPointToCPoint(initPt, *this);
 }
-inline CPoint::CPoint(const UICPoint *initPt)
+inline CPoint::CPoint(const Qt3DSPoint *initPt)
 {
-    CPlatformConversion::UICPointToCPoint(*initPt, *this);
+    CPlatformConversion::Qt3DSPointToCPoint(*initPt, *this);
 }
 #endif
 inline void CPoint::Offset(int xOffset, int yOffset)
@@ -107,9 +107,9 @@ inline void CPoint::Offset(CPoint &point)
     y += point.y;
 }
 #ifndef __PLATFORMCONVERSION_H__
-inline void CPoint::operator=(const UICPoint &srcPt)
+inline void CPoint::operator=(const Qt3DSPoint &srcPt)
 {
-    CPlatformConversion::UICPointToCPoint(srcPt, *this);
+    CPlatformConversion::Qt3DSPointToCPoint(srcPt, *this);
 }
 #endif
 inline bool CPoint::operator==(CPoint &point) const
@@ -146,4 +146,4 @@ inline CPoint CPoint::operator+(CPoint &point) const
 
 } // namespace Q3DStudio
 
-#endif // __UICPOINT_H__
+#endif // __QT3DS_POINT_H__
diff --git a/src/Authoring/Common/Code/Qt3DSPointBase.h b/src/Authoring/Common/Code/Qt3DSPointBase.h
index 2d127a3a..edabc535 100644
--- a/src/Authoring/Common/Code/Qt3DSPointBase.h
+++ b/src/Authoring/Common/Code/Qt3DSPointBase.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef __UICPOINTBASE_H__
-#define __UICPOINTBASE_H__
+#ifndef __QT3DS_POINTBASE_H__
+#define __QT3DS_POINTBASE_H__
 
 namespace Q3DStudio {
 
@@ -53,4 +53,4 @@ public:
 
 } // namespace Q3DStudio
 
-#endif // __UICPOINTBASE_H__
+#endif // __QT3DS_POINTBASE_H__
diff --git a/src/Authoring/Common/Code/Qt3DSRect.h b/src/Authoring/Common/Code/Qt3DSRect.h
index eb6419fe..e50559c8 100644
--- a/src/Authoring/Common/Code/Qt3DSRect.h
+++ b/src/Authoring/Common/Code/Qt3DSRect.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef __UICRECT_H__
-#define __UICRECT_H__
+#ifndef __QT3DS_RECT_H__
+#define __QT3DS_RECT_H__
 
 #ifndef __PLATFORMCONVERSION_H__
 #include "PlatformConversion.h"
@@ -55,8 +55,8 @@ public:
     CRect(const CRect &srcRect);
     CRect(const CRect *lpSrcRect);
 #ifndef __PLATFORMCONVERSION_H__
-    CRect(const UICRect &inRect);
-    CRect(const UICRect *inRect);
+    CRect(const Qt3DSRect &inRect);
+    CRect(const Qt3DSRect *inRect);
 #endif
     CRect(CPoint &topLeft, CPoint &bottomRight);
 
@@ -109,7 +109,7 @@ public:
     // Additional Operations
     void operator=(const CRect &srcRect);
 #ifndef __PLATFORMCONVERSION_H__
-    void operator=(const UICRect &srcRect);
+    void operator=(const Qt3DSRect &srcRect);
 #endif
     bool operator==(const CRect &rect) const;
     bool operator!=(const CRect &rect) const;
@@ -149,13 +149,13 @@ inline CRect::CRect(const CRect *lpSrcRect)
     CopyRect(lpSrcRect);
 }
 #ifndef __PLATFORMCONVERSION_H__
-inline CRect::CRect(const UICRect &inRect)
+inline CRect::CRect(const Qt3DSRect &inRect)
 {
-    CPlatformConversion::UICRectToCRect(inRect, *this);
+    CPlatformConversion::Qt3DSRectToCRect(inRect, *this);
 }
-inline CRect::CRect(const UICRect *inRect)
+inline CRect::CRect(const Qt3DSRect *inRect)
 {
-    CPlatformConversion::UICRectToCRect(*inRect, *this);
+    CPlatformConversion::Qt3DSRectToCRect(*inRect, *this);
 }
 #endif
 inline CRect::CRect(CPoint &topLeft, CPoint &bottomRight)
@@ -270,9 +270,9 @@ inline void CRect::operator=(const CRect &srcRect)
     CopyRect(&srcRect);
 }
 #ifndef __PLATFORMCONVERSION_H__
-inline void CRect::operator=(const UICRect &srcRect)
+inline void CRect::operator=(const Qt3DSRect &srcRect)
 {
-    CPlatformConversion::UICRectToCRect(srcRect, *this);
+    CPlatformConversion::Qt3DSRectToCRect(srcRect, *this);
 }
 #endif
 inline bool CRect::operator==(const CRect &rect) const
@@ -414,4 +414,4 @@ inline void CRect::DeflateRect(int l, int t, int r, int b)
 
 } // namespace Q3DStudio
 
-#endif // __UICRECT_H__
+#endif // __QT3DS_RECT_H__
diff --git a/src/Authoring/Common/Code/Qt3DSRectBase.h b/src/Authoring/Common/Code/Qt3DSRectBase.h
index 79b505ce..6f36bbb7 100644
--- a/src/Authoring/Common/Code/Qt3DSRectBase.h
+++ b/src/Authoring/Common/Code/Qt3DSRectBase.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef __UICRECTBASE_H__
-#define __UICRECTBASE_H__
+#ifndef __QT3DS_RECTBASE_H__
+#define __QT3DS_RECTBASE_H__
 
 namespace Q3DStudio {
 //==============================================================================
@@ -55,4 +55,4 @@ public:
 
 } // namespace Q3DStudio
 
-#endif // __UICRECTBASE_H__
+#endif // __QT3DS_RECTBASE_H__
diff --git a/src/Authoring/Common/Code/Qt3DSSharedPtr.h b/src/Authoring/Common/Code/Qt3DSSharedPtr.h
index 2d9a4099..6c7ee7de 100644
--- a/src/Authoring/Common/Code/Qt3DSSharedPtr.h
+++ b/src/Authoring/Common/Code/Qt3DSSharedPtr.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef __UICSHAREDPTR_H__
-#define __UICSHAREDPTR_H__
+#ifndef __QT3DS_SHAREDPTR_H__
+#define __QT3DS_SHAREDPTR_H__
 
 #pragma once
 
@@ -343,4 +343,4 @@ protected:
 
 } // namespace Q3DStudio
 
-#endif // __UICSHAREDPTR_H__
+#endif // __QT3DS_SHAREDPTR_H__
diff --git a/src/Authoring/Common/Code/Qt3DSString.cpp b/src/Authoring/Common/Code/Qt3DSString.cpp
index 228758e3..4be3b291 100644
--- a/src/Authoring/Common/Code/Qt3DSString.cpp
+++ b/src/Authoring/Common/Code/Qt3DSString.cpp
@@ -40,12 +40,12 @@
 namespace Q3DStudio {
 
 #ifdef DEBUG
-SSharedHeader s_EmptyUICStringBuffer[2] = { { UICMEM_HEADERSIG, 0, sizeof(UICChar) }, { 0, 0, 0 } };
+SSharedHeader s_EmptyStringBuffer[2] = { { QT3DS_MEM_HEADERSIG, 0, sizeof(Qt3DSChar) }, { 0, 0, 0 } };
 #else
-SSharedHeader s_EmptyUICStringBuffer[2] = { { 0, sizeof(UICChar) }, { 0, 0 } };
+SSharedHeader s_EmptyStringBuffer[2] = { { 0, sizeof(Qt3DSChar) }, { 0, 0 } };
 #endif
 
-UICChar *s_EmptyUICString = reinterpret_cast<UICChar *>(s_EmptyUICStringBuffer + 1);
+Qt3DSChar *s_EmptyString = reinterpret_cast<Qt3DSChar *>(s_EmptyStringBuffer + 1);
 
 IMPLEMENT_OBJECT_COUNTER(CString)
 
@@ -56,11 +56,11 @@ IMPLEMENT_OBJECT_COUNTER(CString)
  */
 void CString::Allocate(long inLength)
 {
-    m_UICData =
-        reinterpret_cast<UICChar *>(CSharedMemory::Allocate((inLength + 1) * sizeof(UICChar)));
+    m_Data =
+        reinterpret_cast<Qt3DSChar *>(CSharedMemory::Allocate((inLength + 1) * sizeof(Qt3DSChar)));
 
     // NULL terminate string and dirty
-    m_UICData[inLength] = 0;
+    m_Data[inLength] = 0;
     DirtyBuffers();
 }
 
@@ -71,11 +71,11 @@ void CString::Allocate(long inLength)
  */
 void CString::Reallocate(long inLength)
 {
-    m_UICData = reinterpret_cast<UICChar *>(
-        CSharedMemory::Reallocate(m_UICData, (inLength + 1) * sizeof(UICChar)));
+    m_Data = reinterpret_cast<Qt3DSChar *>(
+        CSharedMemory::Reallocate(m_Data, (inLength + 1) * sizeof(Qt3DSChar)));
 
     // NULL terminate string and dirty
-    m_UICData[inLength] = 0;
+    m_Data[inLength] = 0;
     DirtyBuffers();
 }
 
@@ -85,9 +85,9 @@ void CString::Reallocate(long inLength)
  */
 void CString::Free()
 {
-    if (m_UICData != s_EmptyUICString) {
-        CSharedMemory::Free(m_UICData);
-        m_UICData = s_EmptyUICString;
+    if (m_Data != s_EmptyString) {
+        CSharedMemory::Free(m_Data);
+        m_Data = s_EmptyString;
         DirtyBuffers();
     }
 }
@@ -140,8 +140,8 @@ void CString::DirtyBuffers()
   * @param inString2 is the second part of the string
   * @param inLength2 is the length of the second string
   */
-CString::CString(const UICChar *inString1, long inLength1, const UICChar *inString2, long inLength2)
-    : m_UICData(s_EmptyUICString)
+CString::CString(const Qt3DSChar *inString1, long inLength1, const Qt3DSChar *inString2, long inLength2)
+    : m_Data(s_EmptyString)
 {
     ADDTO_OBJECT_COUNTER(CString)
 
@@ -151,20 +151,20 @@ CString::CString(const UICChar *inString1, long inLength1, const UICChar *inStri
         Assign(inString1, inLength1);
     } else {
         Allocate(inLength1 + inLength2);
-        ::memcpy(m_UICData, inString1, inLength1 * sizeof(UICChar));
-        ::memcpy(m_UICData + inLength1, inString2, inLength2 * sizeof(UICChar));
+        ::memcpy(m_Data, inString1, inLength1 * sizeof(Qt3DSChar));
+        ::memcpy(m_Data + inLength1, inString2, inLength2 * sizeof(Qt3DSChar));
     }
     DirtyBuffers();
 }
 
 //====================================================================
 /**
-* Insert an UICChar string into this string.
+* Insert an Qt3DSChar string into this string.
 * @param inPosition is the offset into this string where the char string should be inserted
 * @param inString is the string to be inserted
 * @param inLength is the length of the desired string
 */
-void CString::UICInsert(long inPosition, const UICChar *inCharString, long inLength)
+void CString::StrInsert(long inPosition, const Qt3DSChar *inCharString, long inLength)
 {
     if (ENDOFSTRING == inLength)
         inLength = StrLen(inCharString);
@@ -177,11 +177,11 @@ void CString::UICInsert(long inPosition, const UICChar *inCharString, long inLen
             SetLength(theCurrentLength + inLength);
 
             long t = Length() - inPosition - inLength;
-            UICChar *p = m_UICData + inPosition;
+            Qt3DSChar *p = m_Data + inPosition;
 
             if (t > 0)
-                ::memmove(p + inLength, p, t * sizeof(UICChar));
-            ::memmove(p, inCharString, inLength * sizeof(UICChar));
+                ::memmove(p + inLength, p, t * sizeof(Qt3DSChar));
+            ::memmove(p, inCharString, inLength * sizeof(Qt3DSChar));
         }
     }
     DirtyBuffers();
@@ -189,11 +189,11 @@ void CString::UICInsert(long inPosition, const UICChar *inCharString, long inLen
 
 //====================================================================
 /**
- * Add the given UICChar string at the end of this string.
+ * Add the given Qt3DSChar string at the end of this string.
  * @param inCharString is the pointer to the string to be added
  * @param inLength is the length of the string to be added
  */
-void CString::UICConcat(const UICChar *inCharString, long inLength)
+void CString::StrConcat(const Qt3DSChar *inCharString, long inLength)
 {
     if (ENDOFSTRING == inLength)
         inLength = StrLen(inCharString);
@@ -205,12 +205,12 @@ void CString::UICConcat(const UICChar *inCharString, long inLength)
 
         // We must check this before calling SetLength(), since
         // the buffer pointer may be changed during reallocation
-        if (m_UICData == inCharString) {
+        if (m_Data == inCharString) {
             SetLength(theOldLength + inLength);
-            ::memmove(m_UICData + theOldLength, m_UICData, inLength * sizeof(UICChar));
+            ::memmove(m_Data + theOldLength, m_Data, inLength * sizeof(Qt3DSChar));
         } else {
             SetLength(theOldLength + inLength);
-            ::memmove(m_UICData + theOldLength, inCharString, inLength * sizeof(UICChar));
+            ::memmove(m_Data + theOldLength, inCharString, inLength * sizeof(Qt3DSChar));
         }
     }
     DirtyBuffers();
@@ -226,7 +226,7 @@ void CString::Concat(const CString &inString)
     if (IsEmpty()) {
         Assign(inString);
     } else if (inString.Length() > 0) {
-        UICConcat(inString.m_UICData, inString.Length());
+        StrConcat(inString.m_Data, inString.Length());
     }
     DirtyBuffers();
 }
@@ -242,7 +242,7 @@ void CString::Concat(char inChar) // char = bad
         Assign(&inChar, 1);
     } else {
         SetLength(Length() + 1);
-        m_UICData[Length() - 1] = inChar;
+        m_Data[Length() - 1] = inChar;
     }
     DirtyBuffers();
 }
@@ -252,13 +252,13 @@ void CString::Concat(char inChar) // char = bad
  * Add the given char at the end of this string.
  * @param inChar is the char to be added
  */
-void CString::Concat(UICChar inChar) // char = bad
+void CString::Concat(Qt3DSChar inChar) // char = bad
 {
     if (IsEmpty()) {
         Assign(&inChar, 1);
     } else {
         SetLength(Length() + 1);
-        m_UICData[Length() - 1] = inChar;
+        m_Data[Length() - 1] = inChar;
     }
     DirtyBuffers();
 }
@@ -273,26 +273,26 @@ void CString::Concat(UICChar inChar) // char = bad
  * @param inCharString is the pointer to the string
  * @param inLength is the length of the string
  */
-void CString::UICAssign(const UICChar *inCharString, long inLength)
+void CString::StrAssign(const Qt3DSChar *inCharString, long inLength)
 {
     if (ENDOFSTRING == inLength)
         inLength = StrLen(inCharString);
 
     if (!IsEmpty() && inLength > 0) {
-        if (CSharedMemory::RefCountAddress(m_UICData)[0] > 1) {
-            UICChar *theOldData = m_UICData;
+        if (CSharedMemory::RefCountAddress(m_Data)[0] > 1) {
+            Qt3DSChar *theOldData = m_Data;
             Allocate(inLength);
-            ::memcpy(m_UICData, inCharString, inLength * sizeof(UICChar));
+            ::memcpy(m_Data, inCharString, inLength * sizeof(Qt3DSChar));
             --(CSharedMemory::RefCountAddress(theOldData)[0]);
         } else {
             Reallocate(inLength);
-            ::memmove(m_UICData, inCharString, inLength * sizeof(UICChar));
+            ::memmove(m_Data, inCharString, inLength * sizeof(Qt3DSChar));
         }
     } else {
         Clear();
         if (inLength != 0) {
             Allocate(inLength);
-            ::memmove(m_UICData, inCharString, inLength * sizeof(UICChar));
+            ::memmove(m_Data, inCharString, inLength * sizeof(Qt3DSChar));
         }
     }
     DirtyBuffers();
@@ -305,11 +305,11 @@ void CString::UICAssign(const UICChar *inCharString, long inLength)
  */
 void CString::Assign(const CString &inString)
 {
-    if (m_UICData != inString.m_UICData) {
+    if (m_Data != inString.m_Data) {
         Clear();
-        if (inString.m_UICData != NULL) {
-            m_UICData = inString.m_UICData;
-            CSharedMemory::AddRef(m_UICData);
+        if (inString.m_Data != NULL) {
+            m_Data = inString.m_Data;
+            CSharedMemory::AddRef(m_Data);
             DirtyBuffers();
         }
     }
@@ -325,7 +325,7 @@ void CString::Assign(const CString &inString)
  * @param inCharString is the pointer to the string
  * @param inLength is the length of the string
  */
-bool CString::UICCompare(const UICChar *inCharString, long inLength, bool inCaseSensitive) const
+bool CString::StrCompare(const Qt3DSChar *inCharString, long inLength, bool inCaseSensitive) const
 {
     if (ENDOFSTRING == inLength)
         inLength = StrLen(inCharString);
@@ -342,11 +342,11 @@ bool CString::UICCompare(const UICChar *inCharString, long inLength, bool inCase
         return true;
 
     if (inCaseSensitive) {
-        while (theIndex < theMinLength && inCharString[theIndex] == m_UICData[theIndex])
+        while (theIndex < theMinLength && inCharString[theIndex] == m_Data[theIndex])
             ++theIndex;
     } else {
         while (theIndex < theMinLength
-               && ToLower(inCharString[theIndex]) == ToLower(m_UICData[theIndex]))
+               && ToLower(inCharString[theIndex]) == ToLower(m_Data[theIndex]))
             ++theIndex;
     }
 
@@ -360,7 +360,7 @@ bool CString::UICCompare(const UICChar *inCharString, long inLength, bool inCase
  * @param inString is the length of the string
  */
 CString::CString(const CString &inString)
-    : m_UICData(s_EmptyUICString)
+    : m_Data(s_EmptyString)
 {
     ADDTO_OBJECT_COUNTER(CString)
 
@@ -373,7 +373,7 @@ CString::CString(const CString &inString)
  * @param inString is the length of the string
  */
 CString::CString(char inChar)
-    : m_UICData(s_EmptyUICString)
+    : m_Data(s_EmptyString)
 {
     ADDTO_OBJECT_COUNTER(CString)
 
@@ -385,8 +385,8 @@ CString::CString(char inChar)
  * Copy constructor
  * @param inString is the length of the string
  */
-CString::CString(UICChar inChar)
-    : m_UICData(s_EmptyUICString)
+CString::CString(Qt3DSChar inChar)
+    : m_Data(s_EmptyString)
 {
     ADDTO_OBJECT_COUNTER(CString)
 
@@ -401,7 +401,7 @@ CString::CString(UICChar inChar)
 bool CString::operator<(const CString &inString) const
 {
     long theMinLength = MIN(inString.Length(), Length());
-    return (::memcmp(m_UICData, inString.m_UICData, (theMinLength + 1) * sizeof(UICChar)) < 0);
+    return (::memcmp(m_Data, inString.m_Data, (theMinLength + 1) * sizeof(Qt3DSChar)) < 0);
 }
 
 #ifdef CHECK_BOUNDS
@@ -412,10 +412,10 @@ bool CString::operator<(const CString &inString) const
  * @param inIndex is the location of the desired char
  * @return a char at the indecated index.
  */
-UICChar &CString::operator[](long inIndex)
+Qt3DSChar &CString::operator[](long inIndex)
 {
     Unique();
-    return m_UICData[inIndex];
+    return m_Data[inIndex];
 }
 #endif
 
@@ -426,10 +426,10 @@ UICChar &CString::operator[](long inIndex)
  */
 void CString::Clear()
 {
-    if (!IsEmpty() && 0 == CSharedMemory::SubRef(m_UICData))
+    if (!IsEmpty() && 0 == CSharedMemory::SubRef(m_Data))
         Free();
 
-    m_UICData = s_EmptyUICString;
+    m_Data = s_EmptyString;
     DirtyBuffers();
 }
 
@@ -439,17 +439,17 @@ void CString::Clear()
  * Single-threaded version.
  * @return a pointer to the new buffer
  */
-UICChar *CString::Unique()
+Qt3DSChar *CString::Unique()
 {
-    if (!IsEmpty() && CSharedMemory::RefCountAddress(m_UICData)[0] > 1) {
-        UICChar *theOldData = m_UICData;
+    if (!IsEmpty() && CSharedMemory::RefCountAddress(m_Data)[0] > 1) {
+        Qt3DSChar *theOldData = m_Data;
         Allocate(Length());
-        ::memcpy(m_UICData, theOldData, Length() * sizeof(UICChar));
+        ::memcpy(m_Data, theOldData, Length() * sizeof(Qt3DSChar));
         --(CSharedMemory::RefCountAddress(theOldData)[0]);
     }
 
     DirtyBuffers();
-    return m_UICData;
+    return m_Data;
 }
 
 //====================================================================
@@ -478,10 +478,10 @@ void CString::SetLength(long inNewLength)
         Unique();
 
     else {
-        if (CSharedMemory::RefCountAddress(m_UICData)[0] > 1) {
-            UICChar *theOldData = m_UICData;
+        if (CSharedMemory::RefCountAddress(m_Data)[0] > 1) {
+            Qt3DSChar *theOldData = m_Data;
             Allocate(inNewLength);
-            ::memcpy(m_UICData, theOldData, MIN(theCurrentLength, inNewLength) * sizeof(UICChar));
+            ::memcpy(m_Data, theOldData, MIN(theCurrentLength, inNewLength) * sizeof(Qt3DSChar));
             --(CSharedMemory::RefCountAddress(theOldData)[0]);
         } else {
             Reallocate(inNewLength);
@@ -497,7 +497,7 @@ void CString::SetLength(long inNewLength)
  */
 long CString::Length() const
 {
-    return CSharedMemory::GetSize(m_UICData) / sizeof(UICChar) - 1;
+    return CSharedMemory::GetSize(m_Data) / sizeof(Qt3DSChar) - 1;
 }
 
 //====================================================================
@@ -507,7 +507,7 @@ long CString::Length() const
  */
 long CString::RefCount() const
 {
-    return CSharedMemory::RefCountAddress(m_UICData)[0];
+    return CSharedMemory::RefCountAddress(m_Data)[0];
 }
 
 //====================================================================
@@ -534,8 +534,8 @@ CString CString::Extract(long inStart, long inLength) const
             theReturn.Clear();
             theReturn.SetLength(theMinLength);
             // theReturn.Allocate( theMinLength );
-            ::memmove(theReturn.m_UICData, m_UICData + inStart, theMinLength * sizeof(UICChar));
-            // theReturn.m_UICData[ theMinLength ] = 0;
+            ::memmove(theReturn.m_Data, m_Data + inStart, theMinLength * sizeof(Qt3DSChar));
+            // theReturn.m_Data[ theMinLength ] = 0;
         }
     }
     return theReturn;
@@ -579,8 +579,8 @@ void CString::Delete(long inStart, long inLength)
             inLength = theCurrentLength - inStart;
 
         Unique();
-        ::memmove(m_UICData + inStart, m_UICData + inStart + inLength,
-                  (theCurrentLength - inStart - inLength) * sizeof(UICChar));
+        ::memmove(m_Data + inStart, m_Data + inStart + inLength,
+                  (theCurrentLength - inStart - inLength) * sizeof(Qt3DSChar));
 
         SetLength(theCurrentLength - inLength);
     }
@@ -597,8 +597,8 @@ CString &CString::ToUpper()
 
     long theLength = Length();
     for (long theScanner = 0; theScanner < theLength; ++theScanner)
-        if (m_UICData[theScanner] >= 'a' && m_UICData[theScanner] <= 'z')
-            m_UICData[theScanner] = static_cast<UICChar>(m_UICData[theScanner] + 'A' - 'a');
+        if (m_Data[theScanner] >= 'a' && m_Data[theScanner] <= 'z')
+            m_Data[theScanner] = static_cast<Qt3DSChar>(m_Data[theScanner] + 'A' - 'a');
     DirtyBuffers();
     return *this;
 }
@@ -613,8 +613,8 @@ CString &CString::ToLower()
 
     long theLength = Length();
     for (long theScanner = 0; theScanner < theLength; ++theScanner)
-        if (m_UICData[theScanner] >= 'A' && m_UICData[theScanner] <= 'Z')
-            m_UICData[theScanner] = static_cast<UICChar>(m_UICData[theScanner] + 'a' - 'A');
+        if (m_Data[theScanner] >= 'A' && m_Data[theScanner] <= 'Z')
+            m_Data[theScanner] = static_cast<Qt3DSChar>(m_Data[theScanner] + 'a' - 'A');
     DirtyBuffers();
     return *this;
 }
@@ -670,7 +670,7 @@ void CString::TrimLeft()
  * @param inIndex index of the character to get
  * @return the character located at inIndex
  */
-UICChar CString::GetAt(long inIndex) const
+Qt3DSChar CString::GetAt(long inIndex) const
 {
     // Index must be positive
     if (inIndex < 0)
@@ -692,26 +692,26 @@ UICChar CString::GetAt(long inIndex) const
  */
 long CString::Find(const CString &inString) const
 {
-    UICChar *theSource = m_UICData;
+    Qt3DSChar *theSource = m_Data;
     long theSubLength = inString.Length() - 1;
 
     // Finding an empty string is easy
-    if (0 != *inString.m_UICData) {
+    if (0 != *inString.m_Data) {
         // Spin until the whole string matches
         do {
             // But first spin until first char matches
-            UICChar theSourceChar;
+            Qt3DSChar theSourceChar;
             do {
                 theSourceChar = *theSource++;
                 if (0 == theSourceChar)
                     return ENDOFSTRING;
 
-            } while (theSourceChar != *inString.m_UICData);
-        } while (0 != StrNCmp(theSource, inString.m_UICData + 1, theSubLength));
+            } while (theSourceChar != *inString.m_Data);
+        } while (0 != StrNCmp(theSource, inString.m_Data + 1, theSubLength));
         --theSource;
     }
 
-    return static_cast<long>(theSource - m_UICData);
+    return static_cast<long>(theSource - m_Data);
 }
 
 //====================================================================
@@ -747,7 +747,7 @@ long CString::Find(char inChar) const // char = bad?
     long theLength = Length();
     long theIndex;
 
-    for (theIndex = 0; theIndex < theLength && m_UICData[theIndex] != inChar; ++theIndex) {
+    for (theIndex = 0; theIndex < theLength && m_Data[theIndex] != inChar; ++theIndex) {
         // Empty
     }
 
@@ -761,8 +761,8 @@ long CString::find_first_of(const CString &inString, long inStart) const
 {
     for (long idx = inStart, len = Length(); idx < len; ++idx) {
         for (long strIdx = 0, strLen = inString.Length(); strIdx < strLen; ++strIdx) {
-            UICChar mine(m_UICData[idx]);
-            UICChar theirs(inString.m_UICData[strIdx]);
+            Qt3DSChar mine(m_Data[idx]);
+            Qt3DSChar theirs(inString.m_Data[strIdx]);
             if (mine == theirs)
                 return idx;
         }
@@ -850,7 +850,7 @@ void CString::reserve(long numChars)
 long CString::ReverseFind(char inChar) const
 {
     long theIndex;
-    for (theIndex = Length() - 1; theIndex >= 0 && m_UICData[theIndex] != inChar; --theIndex) {
+    for (theIndex = Length() - 1; theIndex >= 0 && m_Data[theIndex] != inChar; --theIndex) {
         // Empty
     }
 
@@ -932,7 +932,7 @@ long CString::Scan(const char *inFormat, ...) const
     va_list theArgs;
     va_start(theArgs, inFormat);
 
-    AssertChar(m_UICData); // ok?
+    AssertChar(m_Data); // ok?
     SyncCharBuffer();
     return 0; // Bastard Microsoft doesn't implement an sscanf with va_arg...  will have to copy
               // some code over.
@@ -942,7 +942,7 @@ long CString::Scan(const char *inFormat, ...) const
 /**
  * Make sure that no characters are unicode.
  */
-void CString::AssertChar(const UICChar *inString)
+void CString::AssertChar(const Qt3DSChar *inString)
 {
     while (*inString) {
         if (*inString > 255)
diff --git a/src/Authoring/Common/Code/Qt3DSString.h b/src/Authoring/Common/Code/Qt3DSString.h
index abc8cf74..c9fd1927 100644
--- a/src/Authoring/Common/Code/Qt3DSString.h
+++ b/src/Authoring/Common/Code/Qt3DSString.h
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #pragma once
-#ifndef __UICSTRING_H__
-#define __UICSTRING_H__
+#ifndef __QT3DS_STRING_H__
+#define __QT3DS_STRING_H__
 
 #ifdef _WIN32
 #pragma warning(push)
@@ -49,15 +49,15 @@
 #include <QDebug>
 
 namespace Q3DStudio {
-#define _UIC(string) L##string
+#define _LSTR(string) L##string
 
 #if !defined(_MSC_VER) || _MSC_VER >= 1400 // VS2005 = 1400
-typedef wchar_t UICChar;
+typedef wchar_t Qt3DSChar;
 #else
-typedef unsigned short UICChar;
+typedef unsigned short Qt3DSChar;
 #endif
 
-extern UICChar *s_EmptyUICString;
+extern Qt3DSChar *s_EmptyString;
 
 template <class T>
 long StrLen(const T *inChars);
@@ -65,29 +65,29 @@ long StrLen(const T *inChars);
 template <class T, class U>
 void StrToStr(const T *inChars, long inLength, U *outChars);
 
-// Stack based conversion from any array to UICChar*.  Treat like a cast operator.
-// UICChar* memory valid for the duration of scope.
-class CUICStr
+// Stack based conversion from any array to Qt3DSChar*.  Treat like a cast operator.
+// Qt3DSChar* memory valid for the duration of scope.
+class Qt3DSStr
 {
-    UICChar *m_UICBuffer;
+    Qt3DSChar *m_Buffer;
     enum {
         ENDOFSTRING = -2, /// End of String - used in extract and insert. Also returned as position
                           /// when the wanted string was not found
     };
 
 public:
-    operator UICChar *() { return m_UICBuffer; }
-    ~CUICStr() { delete[] m_UICBuffer; }
+    operator Qt3DSChar *() { return m_Buffer; }
+    ~Qt3DSStr() { delete[] m_Buffer; }
     template <class T>
-    CUICStr(const T *inString, long inLength = ENDOFSTRING)
-        : m_UICBuffer(NULL)
+    Qt3DSStr(const T *inString, long inLength = ENDOFSTRING)
+        : m_Buffer(NULL)
     {
         if (ENDOFSTRING == inLength)
             inLength = StrLen(inString);
 
-        m_UICBuffer = new UICChar[inLength + 1];
-        m_UICBuffer[inLength] = 0;
-        StrToStr(inString, inLength, m_UICBuffer);
+        m_Buffer = new Qt3DSChar[inLength + 1];
+        m_Buffer[inLength] = 0;
+        StrToStr(inString, inLength, m_Buffer);
     }
 };
 
@@ -106,7 +106,7 @@ public:
 
 protected:
     // Fields
-    UICChar *m_UICData;
+    Qt3DSChar *m_Data;
     mutable CAutoArrayPtr<wchar_t> m_WideData; ///< Mutable to allow const buffer access operators
     mutable CAutoArrayPtr<char> m_CharData;
 #ifdef WIN32
@@ -125,10 +125,10 @@ protected:
     void DirtyBuffers();
 
     // Implementation of operators and templates
-    void UICInsert(long inPosition, const UICChar *inChars, long inLength = ENDOFSTRING);
-    void UICConcat(const UICChar *inChars, long inLength = ENDOFSTRING);
-    void UICAssign(const UICChar *inChars, long inLength = ENDOFSTRING);
-    bool UICCompare(const UICChar *inChars, long inLength = ENDOFSTRING,
+    void StrInsert(long inPosition, const Qt3DSChar *inChars, long inLength = ENDOFSTRING);
+    void StrConcat(const Qt3DSChar *inChars, long inLength = ENDOFSTRING);
+    void StrAssign(const Qt3DSChar *inChars, long inLength = ENDOFSTRING);
+    bool StrCompare(const Qt3DSChar *inChars, long inLength = ENDOFSTRING,
                     bool inCaseSensitive = true) const;
 
 public:
@@ -146,25 +146,25 @@ public:
     template <class T>
     void Insert(long inPosition, const T *inChars, long inLength = ENDOFSTRING)
     {
-        UICInsert(inPosition, CUICStr(inChars, inLength), inLength);
+        StrInsert(inPosition, Qt3DSStr(inChars, inLength), inLength);
     }
     void Insert(long inPosition, const CString &inString)
     {
-        UICInsert(inPosition, inString.m_UICData, inString.Length());
+        StrInsert(inPosition, inString.m_Data, inString.Length());
     }
 
     template <class T>
     void Concat(const T *inChars, long inLength = ENDOFSTRING)
     {
-        UICConcat(CUICStr(inChars, inLength), inLength);
+        StrConcat(Qt3DSStr(inChars, inLength), inLength);
     }
     void Concat(const CString &inString);
     void Concat(char inChar);
-    void Concat(UICChar inChar);
+    void Concat(Qt3DSChar inChar);
     void append(const CString &inString) { Concat(inString); }
     void append(char inChar) { Concat(inChar); }
-    void append(UICChar inChar) { Concat(inChar); }
-    void append(const UICChar *inChars, long inLength) { Concat<UICChar>(inChars, inLength); }
+    void append(Qt3DSChar inChar) { Concat(inChar); }
+    void append(const Qt3DSChar *inChars, long inLength) { Concat<Qt3DSChar>(inChars, inLength); }
     void append(const CString &inString, long inOffset, long inLength)
     {
         append(inString.Extract(inOffset, inLength));
@@ -179,11 +179,11 @@ public:
     template <class T>
     bool Compare(const T *inChars, long inLength = ENDOFSTRING, bool inCaseSensitive = true) const
     {
-        return UICCompare(CUICStr(inChars, inLength), inLength, inCaseSensitive);
+        return StrCompare(Qt3DSStr(inChars, inLength), inLength, inCaseSensitive);
     }
     bool Compare(const CString &inString, bool inCaseSensitive = true) const
     {
-        return UICCompare(inString.m_UICData, inString.Length(), inCaseSensitive);
+        return StrCompare(inString.m_Data, inString.Length(), inCaseSensitive);
     }
 
 private:
@@ -196,15 +196,15 @@ public:
     // Construction
     CString(char inChar);
     CString(const CString &inString);
-    CString(UICChar inChar);
+    CString(Qt3DSChar inChar);
     CString(void)
-        : m_UICData(s_EmptyUICString)
+        : m_Data(s_EmptyString)
     {
         ADDTO_OBJECT_COUNTER(CString);
     }
     template <class T>
     CString(const T *inChars, long inLength = ENDOFSTRING)
-        : m_UICData(s_EmptyUICString)
+        : m_Data(s_EmptyString)
     {
         ADDTO_OBJECT_COUNTER(CString);
         Assign(inChars, inLength);
@@ -217,7 +217,7 @@ public:
     }
 
 protected:
-    CString(const UICChar *inString1, long inLength1, const UICChar *inString2, long inLength2);
+    CString(const Qt3DSChar *inString1, long inLength1, const Qt3DSChar *inString2, long inLength2);
 
 public:
     // Operators
@@ -231,7 +231,7 @@ public:
         Assign(inChar);
         return *this;
     }
-    CString &operator=(const UICChar inChar)
+    CString &operator=(const Qt3DSChar inChar)
     {
         Assign(inChar);
         return *this;
@@ -278,25 +278,25 @@ public:
 
     CString operator+(const CString &inString) const
     {
-        return CString(m_UICData, Length(), inString.m_UICData, inString.Length());
+        return CString(m_Data, Length(), inString.m_Data, inString.Length());
     }
     CString operator+(char inChar) const
     {
-        UICChar theChar = inChar;
-        return CString(m_UICData, Length(), &theChar, 1);
+        Qt3DSChar theChar = inChar;
+        return CString(m_Data, Length(), &theChar, 1);
     }
     template <class T>
     CString operator+(const T *inChars) const
     {
-        return CString(m_UICData, Length(), CUICStr(inChars), StrLen(inChars));
+        return CString(m_Data, Length(), Qt3DSStr(inChars), StrLen(inChars));
     }
 
     bool operator==(const CString &inString) const { return Compare(inString); }
-    bool operator==(char inChar) const { return (1 == Length()) && (m_UICData[0] == inChar); }
+    bool operator==(char inChar) const { return (1 == Length()) && (m_Data[0] == inChar); }
     template <class T>
     bool operator==(const T *inChars) const
     {
-        return UICCompare(CUICStr(inChars));
+        return StrCompare(Qt3DSStr(inChars));
     }
 
     bool operator!=(const CString &inString) const { return !(*this == inString); }
@@ -310,15 +310,15 @@ public:
     bool operator<(const CString &inString) const;
 
     // this also covers wchar_t on 2 byte wchar_t systems (win)
-    operator const UICChar *() const { return m_UICData; }
+    operator const Qt3DSChar *() const { return m_Data; }
 //			operator long( ) const;
 
 #ifdef CHECK_BOUNDS
-    UICChar &operator[](long inIndex);
+    Qt3DSChar &operator[](long inIndex);
 #else
-    inline UICChar &operator[](long inIndex) { return Unique()[inIndex]; }
+    inline Qt3DSChar &operator[](long inIndex) { return Unique()[inIndex]; }
 #endif
-    inline UICChar &operator[](int inIndex) { return this->operator[]((long)inIndex); }
+    inline Qt3DSChar &operator[](int inIndex) { return this->operator[]((long)inIndex); }
 
     /// IMPORTANT NOTE! the char* cast operator is intentionally unimplemented.
     /// this has been done so that the caller must explicitly call GetCharStar( ) (which flattens
@@ -340,7 +340,7 @@ public:
 public:
     // Utililty
     void Clear();
-    UICChar *Unique();
+    Qt3DSChar *Unique();
     void SetLength(long inLength);
     long RefCount() const;
     bool IsEmpty() const { return 0 == Length(); }
@@ -359,8 +359,8 @@ public:
     CString Right(int nCount) const;
 
     // Searching
-    UICChar GetAt(long inIndex) const;
-    UICChar at(long inIndex) const { return GetAt(inIndex); }
+    Qt3DSChar GetAt(long inIndex) const;
+    Qt3DSChar at(long inIndex) const { return GetAt(inIndex); }
     long Find(const CString &inString) const;
     long Find(const CString &inString, long inStart) const;
     long Find(char inChar) const;
@@ -387,17 +387,17 @@ public:
 
     long Replace(const CString &inString, const CString &inReplacement);
 
-    const UICChar *c_str() const { return (const wchar_t *)*this; }
+    const Qt3DSChar *c_str() const { return (const wchar_t *)*this; }
 
     // Format and Scan
     void Format(const wchar_t *inFormat, ...);
     long Scan(const char *inFormat, ...) const;
 
     // Static utilities
-    static void AssertChar(const UICChar *inString); ///< Throw if any UICChar is greater than 255
-    static UICChar ToLower(UICChar inChar)
+    static void AssertChar(const Qt3DSChar *inString); ///< Throw if any Qt3DSChar is greater than 255
+    static Qt3DSChar ToLower(Qt3DSChar inChar)
     {
-        return inChar >= 'A' && inChar <= 'Z' ? static_cast<UICChar>(inChar + 'a' - 'A') : inChar;
+        return inChar >= 'A' && inChar <= 'Z' ? static_cast<Qt3DSChar>(inChar + 'a' - 'A') : inChar;
     }
 
     /// Everything below this line (within the same class) is handlers for os or library specific
@@ -414,7 +414,7 @@ public:
     /// Methods and operators for MFC CStrings
 public:
     CString(::CString inString)
-        : m_UICData(s_EmptyUICString)
+        : m_Data(s_EmptyString)
     {
         ADDTO_OBJECT_COUNTER(CString);
         Assign(inString.GetBuffer(0));
@@ -490,10 +490,10 @@ void CString::Assign(const T *inChars, long inLength)
     if (ENDOFSTRING == inLength)
         inLength = StrLen(inChars);
 
-    if (reinterpret_cast<const UICChar *>(inChars) != m_UICData) {
+    if (reinterpret_cast<const Qt3DSChar *>(inChars) != m_Data) {
         SetLength(inLength);
-        StrToStr(inChars, inLength, m_UICData);
-        m_UICData[inLength] = 0;
+        StrToStr(inChars, inLength, m_Data);
+        m_Data[inLength] = 0;
     }
 
     DirtyBuffers();
@@ -508,7 +508,7 @@ T *CString::CreateBuffer() const
     T *outBuffer = new T[theLength + 1];
 
     outBuffer[theLength] = 0;
-    StrToStr(m_UICData, theLength, outBuffer);
+    StrToStr(m_Data, theLength, outBuffer);
 
     return outBuffer;
 }
@@ -522,4 +522,4 @@ void AppendString(eastl::string &str, const char *delim, const char *string);
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
-#endif // __UICSTRING_H__
+#endif // __QT3DS_STRING_H__
diff --git a/src/Authoring/Common/Code/Qt3DSSynch.h b/src/Authoring/Common/Code/Qt3DSSynch.h
index 4903ac49..2271a663 100644
--- a/src/Authoring/Common/Code/Qt3DSSynch.h
+++ b/src/Authoring/Common/Code/Qt3DSSynch.h
@@ -55,8 +55,8 @@ C++ Portable Types Library (PTypes)
 */
 
 #pragma once
-#ifndef __UICSYNC_H__
-#define __UICSYNC_H__
+#ifndef __QT3DS_SYNC_H__
+#define __QT3DS_SYNC_H__
 
 #ifdef WIN32
 #define _WINSOCKAPI_ // prevent inclusion of winsock.h in windows.h
@@ -427,4 +427,4 @@ public:
     long send(long id, long param = 0);
 };
 
-#endif // __UICSYNC_H__
+#endif // __QT3DS_SYNC_H__
diff --git a/src/Authoring/Common/Code/Qt3DSTime.h b/src/Authoring/Common/Code/Qt3DSTime.h
index cd3ed697..639c9acc 100644
--- a/src/Authoring/Common/Code/Qt3DSTime.h
+++ b/src/Authoring/Common/Code/Qt3DSTime.h
@@ -28,8 +28,8 @@
 ****************************************************************************/
 
 #pragma once
-#ifndef __UICTIME_H__
-#define __UICTIME_H__
+#ifndef __QT3DS_TIME_H__
+#define __QT3DS_TIME_H__
 
 #include "Qt3DSLargeInteger.h"
 
@@ -153,4 +153,4 @@ protected:
 };
 }
 
-#endif // __UICTIME_H__
+#endif // __QT3DS_TIME_H__
diff --git a/src/Authoring/Common/Code/Report/CrashInfo.cpp b/src/Authoring/Common/Code/Report/CrashInfo.cpp
index 915178c9..2dea53db 100644
--- a/src/Authoring/Common/Code/Report/CrashInfo.cpp
+++ b/src/Authoring/Common/Code/Report/CrashInfo.cpp
@@ -138,12 +138,12 @@ Q3DStudio::CString CCrashInfo::GetXMLifiedInfo()
     Q3DStudio::CString theInfo = "<crashreport>\n";
 
     Q3DStudio::CString theEmailAddress;
-    theEmailAddress.Format(_UIC("\t<contact emailAddress=\"%ls\"/>\n"),
+    theEmailAddress.Format(_LSTR("\t<contact emailAddress=\"%ls\"/>\n"),
                            static_cast<const wchar_t *>(m_EmailAddress));
 
     Q3DStudio::CString theDescription;
     theDescription.Format(
-        _UIC("\t<description errorString=\"%ls\">\n\t\t<![CDATA[\n%ls\n\t\t]]>\n\t</description>\n"),
+        _LSTR("\t<description errorString=\"%ls\">\n\t\t<![CDATA[\n%ls\n\t\t]]>\n\t</description>\n"),
         static_cast<const wchar_t *>(m_ErrorString), static_cast<const wchar_t *>(m_Description));
 
     Q3DStudio::CString theProductInstance;
@@ -171,7 +171,7 @@ Q3DStudio::CString CCrashInfo::GetXMLifiedInfo()
     }
 
     Q3DStudio::CString theStackTrace;
-    theStackTrace.Format(_UIC("\t<stacktrace>\n\t\t<![CDATA[\n%ls\n\t\t]]>\n\t</stacktrace>\n"),
+    theStackTrace.Format(_LSTR("\t<stacktrace>\n\t\t<![CDATA[\n%ls\n\t\t]]>\n\t</stacktrace>\n"),
                          static_cast<const wchar_t *>(m_StackTrace));
 
     theInfo += theEmailAddress;
diff --git a/src/Authoring/Common/Code/Report/StackOps.cpp b/src/Authoring/Common/Code/Report/StackOps.cpp
index cbcdcdc9..1d958b58 100644
--- a/src/Authoring/Common/Code/Report/StackOps.cpp
+++ b/src/Authoring/Common/Code/Report/StackOps.cpp
@@ -177,7 +177,7 @@ Q3DStudio::CString CStackOps::GetExceptionDescription(EXCEPTION_POINTERS *pExPtr
         theException = "a Stack Overflow";
         break;
     default:
-        theException.Format(_UIC("an Error:0x%X"), pExPtrs->ExceptionRecord->ExceptionCode);
+        theException.Format(_LSTR("an Error:0x%X"), pExPtrs->ExceptionRecord->ExceptionCode);
         break;
     }
     return GetExceptionDescription(theException, pExPtrs);
@@ -202,7 +202,7 @@ Q3DStudio::CString CStackOps::GetExceptionDescription(Q3DStudio::CString theExce
     theDescription += " Caused ";
     theDescription += theException;
 
-    theException.Format(_UIC(" at 0x%X"), pExPtrs->ExceptionRecord->ExceptionAddress);
+    theException.Format(_LSTR(" at 0x%X"), pExPtrs->ExceptionRecord->ExceptionAddress);
 
     theDescription += theException;
 
diff --git a/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp b/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp
index fb13a5fa..45425adb 100644
--- a/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp
+++ b/src/Authoring/Common/Code/Serialize/FormattedInputStream.cpp
@@ -104,13 +104,13 @@ CFormattedInputStream &CFormattedInputStream::operator>>(short &inShort)
     return *this;
 }
 
-CFormattedInputStream &CFormattedInputStream::operator>>(Q3DStudio::UICChar &inUICChar)
+CFormattedInputStream &CFormattedInputStream::operator>>(Q3DStudio::Qt3DSChar &inChar)
 {
-    m_Count += sizeof(Q3DStudio::UICChar);
+    m_Count += sizeof(Q3DStudio::Qt3DSChar);
 
-    m_InputStream->Read(&inUICChar, sizeof(Q3DStudio::UICChar));
-    BTOH2(inUICChar, inUICChar);
-    SWAP2BYTES(inUICChar, inUICChar);
+    m_InputStream->Read(&inChar, sizeof(Q3DStudio::Qt3DSChar));
+    BTOH2(inChar, inChar);
+    SWAP2BYTES(inChar, inChar);
     return *this;
 }
 
@@ -143,7 +143,7 @@ unsigned short CFormattedInputStream::ReadUnsignedShort()
     return theShort;
 }
 
-void CFormattedInputStream::CopyToFile(const CUICFile &inFile, long inLength,
+void CFormattedInputStream::CopyToFile(const Qt3DSFile &inFile, long inLength,
                                        bool inCloseStream /*= true */)
 {
     Q3DStudio::CString thePath = inFile.GetAbsolutePosixPath();
@@ -173,4 +173,4 @@ void CFormattedInputStream::CopyToFile(const CUICFile &inFile, long inLength,
     if (inCloseStream)
         theFileStream.Close();
     delete[] theBuffer;
-}
-\ No newline at end of file
+}
diff --git a/src/Authoring/Common/Code/Serialize/FormattedInputStream.h b/src/Authoring/Common/Code/Serialize/FormattedInputStream.h
index 1c700b85..84a34a73 100644
--- a/src/Authoring/Common/Code/Serialize/FormattedInputStream.h
+++ b/src/Authoring/Common/Code/Serialize/FormattedInputStream.h
@@ -54,13 +54,13 @@ public:
     CFormattedInputStream &operator>>(unsigned long &);
     CFormattedInputStream &operator>>(float &);
     CFormattedInputStream &operator>>(short &);
-    CFormattedInputStream &operator>>(Q3DStudio::UICChar &);
+    CFormattedInputStream &operator>>(Q3DStudio::Qt3DSChar &);
     CFormattedInputStream &operator>>(bool &);
 
     unsigned char ReadUnsignedChar();
     unsigned short ReadUnsignedShort();
 
-    void CopyToFile(const CUICFile &inFilename, long inLength, bool inCloseStream = true);
+    void CopyToFile(const Qt3DSFile &inFilename, long inLength, bool inCloseStream = true);
 
 protected:
     CInputStream *m_InputStream;
diff --git a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp
index 5e0b4a5c..9f19490e 100644
--- a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp
+++ b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.cpp
@@ -92,13 +92,13 @@ CFormattedOutputStream &CFormattedOutputStream::operator<<(short inValue)
     return *this;
 }
 
-CFormattedOutputStream &CFormattedOutputStream::operator<<(Q3DStudio::UICChar inValue)
+CFormattedOutputStream &CFormattedOutputStream::operator<<(Q3DStudio::Qt3DSChar inValue)
 {
 #ifdef WIN32
-    m_OutputStream->Write(&inValue, sizeof(Q3DStudio::UICChar));
+    m_OutputStream->Write(&inValue, sizeof(Q3DStudio::Qt3DSChar));
 #else
     SWAP2BYTES(inValue, inValue);
-    m_OutputStream->Write(&inValue, sizeof(Q3DStudio::UICChar));
+    m_OutputStream->Write(&inValue, sizeof(Q3DStudio::Qt3DSChar));
 #endif
 
     return *this;
diff --git a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.h b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.h
index 43866122..be8513d3 100644
--- a/src/Authoring/Common/Code/Serialize/FormattedOutputStream.h
+++ b/src/Authoring/Common/Code/Serialize/FormattedOutputStream.h
@@ -57,7 +57,7 @@ public:
     CFormattedOutputStream &operator<<(long inValue);
     CFormattedOutputStream &operator<<(bool inValue);
     CFormattedOutputStream &operator<<(short inValue);
-    CFormattedOutputStream &operator<<(Q3DStudio::UICChar inValue);
+    CFormattedOutputStream &operator<<(Q3DStudio::Qt3DSChar inValue);
 
 protected:
     CSeekOutputStream *m_OutputStream;
diff --git a/src/Authoring/Common/Code/StackTokenizer.cpp b/src/Authoring/Common/Code/StackTokenizer.cpp
index 1143b7a1..3e37fac9 100644
--- a/src/Authoring/Common/Code/StackTokenizer.cpp
+++ b/src/Authoring/Common/Code/StackTokenizer.cpp
@@ -46,8 +46,8 @@ using namespace Q3DStudio;
  *		@param inToken single char token
  *		@param	inEscapeChar single char escape char
  */
-CStackTokenizer::CStackTokenizer(const Q3DStudio::CString &inString, Q3DStudio::UICChar inDelimiter,
-                                 Q3DStudio::UICChar inEscapeChar)
+CStackTokenizer::CStackTokenizer(const Q3DStudio::CString &inString, Q3DStudio::Qt3DSChar inDelimiter,
+                                 Q3DStudio::Qt3DSChar inEscapeChar)
     : m_String(inString)
     , m_Delimiter(inDelimiter)
     , m_EscapeChar(inEscapeChar)
@@ -87,7 +87,7 @@ bool CStackTokenizer::HasNextPartition()
 Q3DStudio::CString CStackTokenizer::GetCurrentPartition()
 
 {
-    std::deque<Q3DStudio::UICChar> theStack;
+    std::deque<Q3DStudio::Qt3DSChar> theStack;
     bool theIgnoreEscapeChar = false;
     bool theFoundToken = false;
     long theCurrentIndex = m_Index;
@@ -96,7 +96,7 @@ Q3DStudio::CString CStackTokenizer::GetCurrentPartition()
     if (!m_String.IsEmpty()) {
         while (!theFoundToken) {
             // get the char at this index
-            Q3DStudio::UICChar theChar = m_String.GetAt(theCurrentIndex++);
+            Q3DStudio::Qt3DSChar theChar = m_String.GetAt(theCurrentIndex++);
 
             if (theChar == m_Delimiter) {
                 if (theStack.size() != 0) {
diff --git a/src/Authoring/Common/Code/StackTokenizer.h b/src/Authoring/Common/Code/StackTokenizer.h
index c570fa2f..ee00e5fa 100644
--- a/src/Authoring/Common/Code/StackTokenizer.h
+++ b/src/Authoring/Common/Code/StackTokenizer.h
@@ -46,14 +46,14 @@
  *	@class CStackTokenizer seperates a string out using a delimiter; Difference
  *						   between it and CStringTokenizer is that the
  *delimiter
- *						   is a single UICChar and there is an escape char as
+ *						   is a single Qt3DSChar and there is an escape char as
  *well.
  */
 class CStackTokenizer
 {
 public:
-    CStackTokenizer(const Q3DStudio::CString &inString, Q3DStudio::UICChar inDelimiter,
-                    Q3DStudio::UICChar inEscapeChar);
+    CStackTokenizer(const Q3DStudio::CString &inString, Q3DStudio::Qt3DSChar inDelimiter,
+                    Q3DStudio::Qt3DSChar inEscapeChar);
     virtual ~CStackTokenizer();
 
     bool HasNextPartition();
@@ -62,8 +62,8 @@ public:
 
 protected:
     Q3DStudio::CString m_String; ///< contains the string to tokenize
-    Q3DStudio::UICChar m_Delimiter; ///< single char delimiter
-    Q3DStudio::UICChar m_EscapeChar; ///< single char escape char
+    Q3DStudio::Qt3DSChar m_Delimiter; ///< single char delimiter
+    Q3DStudio::Qt3DSChar m_EscapeChar; ///< single char escape char
     long m_Index; ///< index to begin tokenizing the string from
     long m_LastIndex; ///< index of the string since last tokenize operation
     const long m_StringLength; ///< length of the string to tokenize
diff --git a/src/Authoring/Common/Code/_Qt/QtUICFile.cpp b/src/Authoring/Common/Code/_Qt/QtUICFile.cpp
index 85088a96..6758c79d 100644
--- a/src/Authoring/Common/Code/_Qt/QtUICFile.cpp
+++ b/src/Authoring/Common/Code/_Qt/QtUICFile.cpp
@@ -51,14 +51,14 @@
 //==============================================================================
 // Static variables
 //==============================================================================
-TFilePathList CUICFile::s_TempFilePathList;
+TFilePathList Qt3DSFile::s_TempFilePathList;
 
 //==============================================================================
 // Constants
 //==============================================================================
 
-const Q3DStudio::CString CUICFile::CURRENT_DIR(".\\");
-const Q3DStudio::CString CUICFile::PARENT_DIR("..\\");
+const Q3DStudio::CString Qt3DSFile::CURRENT_DIR(".\\");
+const Q3DStudio::CString Qt3DSFile::PARENT_DIR("..\\");
 
 //=============================================================================
 /**
@@ -66,7 +66,7 @@ const Q3DStudio::CString CUICFile::PARENT_DIR("..\\");
  * @param inIsPosix ignored.
  * @param inAddBase ignored.
  */
-CUICFile::CUICFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool inAddBase)
+Qt3DSFile::Qt3DSFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool inAddBase)
 {
     Q_UNUSED(inIsPosix);
     Q_UNUSED(inAddBase);
@@ -82,10 +82,10 @@ CUICFile::CUICFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool in
 /**
  * Create a file by combining the two paths.
  */
-CUICFile::CUICFile(const Q3DStudio::CString &inPathName, const Q3DStudio::CString &inName)
+Qt3DSFile::Qt3DSFile(const Q3DStudio::CString &inPathName, const Q3DStudio::CString &inName)
 {
-    CUICFile theBasePath(inPathName);
-    CUICFile theFile = Combine(theBasePath, inName);
+    Qt3DSFile theBasePath(inPathName);
+    Qt3DSFile theFile = Combine(theBasePath, inName);
     m_Path = theFile.GetPath();
 }
 
@@ -93,15 +93,15 @@ CUICFile::CUICFile(const Q3DStudio::CString &inPathName, const Q3DStudio::CStrin
 /**
  * Create a file by combining the base path with a relative path.
  */
-CUICFile::CUICFile(const CUICFile &inBasePath, const Q3DStudio::CString &inPathname, bool inIsPosix)
+Qt3DSFile::Qt3DSFile(const Qt3DSFile &inBasePath, const Q3DStudio::CString &inPathname, bool inIsPosix)
 {
     Q_UNUSED(inIsPosix);
 
-    CUICFile theFile(Combine(inBasePath, inPathname));
+    Qt3DSFile theFile(Combine(inBasePath, inPathname));
     m_Path = theFile.GetPath();
 }
 
-CUICFile::CUICFile(const CUICFile &inFile)
+Qt3DSFile::Qt3DSFile(const Qt3DSFile &inFile)
 {
     m_Path = inFile.m_Path;
 }
@@ -110,7 +110,7 @@ CUICFile::CUICFile(const CUICFile &inFile)
 /**
  * Get an iterator for all the sub-files of this directory.
  */
-CFileIterator CUICFile::GetSubItems() const
+CFileIterator Qt3DSFile::GetSubItems() const
 {
     return CFileIterator(this);
 }
@@ -119,11 +119,11 @@ CFileIterator CUICFile::GetSubItems() const
 /**
  * Destructor
  */
-CUICFile::~CUICFile()
+Qt3DSFile::~Qt3DSFile()
 {
 }
 
-bool CUICFile::operator==(const CUICFile &inRHS) const
+bool Qt3DSFile::operator==(const Qt3DSFile &inRHS) const
 {
 #ifdef _WIN32
     return GetAbsolutePath().CompareNoCase(inRHS.GetAbsolutePath());
@@ -136,7 +136,7 @@ bool CUICFile::operator==(const CUICFile &inRHS) const
 /**
  * Returns true if this is a file and can be read.
  */
-bool CUICFile::CanRead() const
+bool Qt3DSFile::CanRead() const
 {
     return IsFile();
 }
@@ -145,7 +145,7 @@ bool CUICFile::CanRead() const
 /**
  * Returns true if this is a file and can be written to.
  */
-bool CUICFile::CanWrite() const
+bool Qt3DSFile::CanWrite() const
 {
     QFileInfo info(m_Path.toQString());
     return info.isWritable();
@@ -158,7 +158,7 @@ bool CUICFile::CanWrite() const
  *
  * @return true if the deletion of file/folder is successful, else false
  */
-bool CUICFile::DeleteFile() const
+bool Qt3DSFile::DeleteFile() const
 {
     BOOL theFileDeleted = FALSE;
 
@@ -181,7 +181,7 @@ bool CUICFile::DeleteFile() const
 /**
  * Check to see if this file or directory exists.
  */
-bool CUICFile::Exists() const
+bool Qt3DSFile::Exists() const
 {
     QFileInfo info(m_Path.toQString());
     return info.exists();
@@ -192,7 +192,7 @@ bool CUICFile::Exists() const
  * Get the fully qualified absolute path.
  * This should resolve all relative parts of the path.
  */
-Q3DStudio::CString CUICFile::GetAbsolutePath() const
+Q3DStudio::CString Qt3DSFile::GetAbsolutePath() const
 {
     const QFileInfo fi(m_Path.toQString());
     if (fi.isDir())
@@ -204,7 +204,7 @@ Q3DStudio::CString CUICFile::GetAbsolutePath() const
 /**
  * @see GetAbsolutePath.
  */
-Q3DStudio::CString CUICFile::GetAbsolutePosixPath() const
+Q3DStudio::CString Qt3DSFile::GetAbsolutePosixPath() const
 {
     return GetAbsolutePath();
 }
@@ -213,7 +213,7 @@ Q3DStudio::CString CUICFile::GetAbsolutePosixPath() const
 /**
  * Get the filename section of this file, ignoring all drives and directories.
  */
-Q3DStudio::CString CUICFile::GetName() const
+Q3DStudio::CString Qt3DSFile::GetName() const
 {
     QFileInfo info(m_Path.toQString());
     return Q3DStudio::CString::fromQString(info.fileName());
@@ -223,7 +223,7 @@ Q3DStudio::CString CUICFile::GetName() const
 /**
  * Get the file extension, without the period.
  */
-Q3DStudio::CString CUICFile::GetExtension() const
+Q3DStudio::CString Qt3DSFile::GetExtension() const
 {
     QFileInfo info(m_Path.toQString());
     return Q3DStudio::CString::fromQString(info.suffix());
@@ -233,7 +233,7 @@ Q3DStudio::CString CUICFile::GetExtension() const
 /**
  * Get the underlying path for this file, this may include relativity.
  */
-Q3DStudio::CString CUICFile::GetPath() const
+Q3DStudio::CString Qt3DSFile::GetPath() const
 {
     return m_Path;
 }
@@ -243,7 +243,7 @@ Q3DStudio::CString CUICFile::GetPath() const
  * Returns true if this file exists and is not a directory.
  * The param inCheckForAlias is not used in Windows
  */
-bool CUICFile::IsFile(bool inCheckForAlias /*true*/) const
+bool Qt3DSFile::IsFile(bool inCheckForAlias /*true*/) const
 {
     Q_UNUSED(inCheckForAlias);
     QFileInfo info(m_Path.toQString());
@@ -254,7 +254,7 @@ bool CUICFile::IsFile(bool inCheckForAlias /*true*/) const
 /**
  * Check to see if this file or directory is hidden.
  */
-bool CUICFile::IsHidden() const
+bool Qt3DSFile::IsHidden() const
 {
     QFileInfo info(m_Path.toQString());
     return info.isHidden();
@@ -264,7 +264,7 @@ bool CUICFile::IsHidden() const
 /**
  * Get the size of this file in bytes.
  */
-long CUICFile::Length() const
+long Qt3DSFile::Length() const
 {
     QFileInfo info(m_Path.toQString());
     return info.size();
@@ -274,7 +274,7 @@ long CUICFile::Length() const
 /**
  * Rename (or move) this file to the other file.
  */
-void CUICFile::RenameTo(const CUICFile &inDestination)
+void Qt3DSFile::RenameTo(const Qt3DSFile &inDestination)
 {
     if (!QFile::rename(m_Path.toQString(), inDestination.GetAbsolutePath().toQString())) {
         throw CIOException();
@@ -285,7 +285,7 @@ void CUICFile::RenameTo(const CUICFile &inDestination)
 /**
  * Copy this file to the other file, leaving this file intact.
  */
-void CUICFile::CopyTo(const CUICFile &inDestination)
+void Qt3DSFile::CopyTo(const Qt3DSFile &inDestination)
 {
     const QString destination(inDestination.GetAbsolutePath().toQString());
     if (QFile::exists(destination))
@@ -298,7 +298,7 @@ void CUICFile::CopyTo(const CUICFile &inDestination)
 /**
  * Make this file read only. or unmark the read only
  */
-void CUICFile::SetReadOnly(bool inReadOnlyFlag)
+void Qt3DSFile::SetReadOnly(bool inReadOnlyFlag)
 {
     const QString qpath(m_Path.toQString());
     QFile::Permissions perm = QFile::permissions(qpath);
@@ -314,7 +314,7 @@ void CUICFile::SetReadOnly(bool inReadOnlyFlag)
 /**
  * Get the location of where this application resides.
  */
-CUICFile CUICFile::GetApplicationDirectory()
+Qt3DSFile Qt3DSFile::GetApplicationDirectory()
 {
 #ifdef Q_OS_MACOS
     QDir appDir(qApp->applicationDirPath());
@@ -322,9 +322,9 @@ CUICFile CUICFile::GetApplicationDirectory()
         appDir.cdUp();
         appDir.cd("Resources");
     }
-    return CUICFile(Q3DStudio::CString::fromQString(appDir.absolutePath()));
+    return Qt3DSFile(Q3DStudio::CString::fromQString(appDir.absolutePath()));
 #else
-    return CUICFile(Q3DStudio::CString::fromQString(qApp->applicationDirPath()));
+    return Qt3DSFile(Q3DStudio::CString::fromQString(qApp->applicationDirPath()));
 #endif
 }
 
@@ -333,27 +333,27 @@ CUICFile CUICFile::GetApplicationDirectory()
  * Create a temporary file from where the system holds it's temp files.
  * @param inExtension the file extension that should be used.
  */
-CUICFile CUICFile::GetTemporaryFile(const Q3DStudio::CString &inExtension)
+Qt3DSFile Qt3DSFile::GetTemporaryFile(const Q3DStudio::CString &inExtension)
 {
     QTemporaryFile tempFile(QDir::tempPath() + "/~uiXXXXXX" + inExtension.toQString());
     tempFile.setAutoRemove(false);
     tempFile.open(); // force creation of the actual file name
-    return CUICFile(Q3DStudio::CString::fromQString(tempFile.fileName()));
+    return Qt3DSFile(Q3DStudio::CString::fromQString(tempFile.fileName()));
 }
 
-CUICFile CUICFile::GetTemporaryFile()
+Qt3DSFile Qt3DSFile::GetTemporaryFile()
 {
     QTemporaryFile tempFile(QDir::tempPath() + "/~uiXXXXXX");
     tempFile.setAutoRemove(false);
     tempFile.open(); // force creation of the actual file name
-    return CUICFile(Q3DStudio::CString::fromQString(tempFile.fileName()));
+    return Qt3DSFile(Q3DStudio::CString::fromQString(tempFile.fileName()));
 }
 
 //=============================================================================
 /**
  * Get the URL representing this file.
  */
-QUrl CUICFile::GetURL() const
+QUrl Qt3DSFile::GetURL() const
 {
     return QUrl::fromLocalFile(m_Path.toQString());
 }
@@ -363,7 +363,7 @@ QUrl CUICFile::GetURL() const
  * Request the filesystem to open this file in whatever manner it chooses with
  * the associated application.
  */
-void CUICFile::Execute() const
+void Qt3DSFile::Execute() const
 {
     Q3DStudio::CString sFile = GetAbsolutePath();
     QUrl url = QUrl::fromLocalFile(sFile.toQString());
@@ -374,11 +374,11 @@ void CUICFile::Execute() const
 /**
  * Combine the file and relative path together into another file.
  */
-CUICFile CUICFile::Combine(const CUICFile &inBasePath, const Q3DStudio::CString &inRelativePath)
+Qt3DSFile Qt3DSFile::Combine(const Qt3DSFile &inBasePath, const Q3DStudio::CString &inRelativePath)
 {
     QDir basePath(inBasePath.GetAbsolutePath().toQString());
     QString rel = basePath.absoluteFilePath(inRelativePath.toQString());
-    return CUICFile(Q3DStudio::CString::fromQString(rel));
+    return Qt3DSFile(Q3DStudio::CString::fromQString(rel));
 }
 
 //=============================================================================
@@ -386,7 +386,7 @@ CUICFile CUICFile::Combine(const CUICFile &inBasePath, const Q3DStudio::CString
  * Get a file handle for this file that can be used for reading.
  * The handle must be closed with CloseHandle when finished.
  */
-HANDLE CUICFile::OpenFileReadHandle() const
+HANDLE Qt3DSFile::OpenFileReadHandle() const
 {
     qFatal("implement me");
     return nullptr;
@@ -397,7 +397,7 @@ HANDLE CUICFile::OpenFileReadHandle() const
  * Get a file handle for this file that can be used for writing.
  * The handle must be closed with CloseHandle when finished.
  */
-HANDLE CUICFile::OpenFileWriteHandle() const
+HANDLE Qt3DSFile::OpenFileWriteHandle() const
 {
     qFatal("implement me");
     return nullptr;
@@ -409,7 +409,7 @@ HANDLE CUICFile::OpenFileWriteHandle() const
  * This would only clear the temp files that were created during the current program session,
  * and not any previous files created by anything prior to this session.
  */
-void CUICFile::ClearCurrentTempCache()
+void Qt3DSFile::ClearCurrentTempCache()
 {
     if (!s_TempFilePathList.empty()) {
         // Delete all temp files created so far
@@ -421,7 +421,7 @@ void CUICFile::ClearCurrentTempCache()
     }
 }
 
-void CUICFile::AddTempFile(const Q3DStudio::CString &inFile)
+void Qt3DSFile::AddTempFile(const Q3DStudio::CString &inFile)
 {
     s_TempFilePathList.insert(inFile);
 }
@@ -433,7 +433,7 @@ void CUICFile::AddTempFile(const Q3DStudio::CString &inFile)
  * @param inPath path to check
  * @return bool true to indicate this is a relative path
  */
-bool CUICFile::IsPathRelative(const Q3DStudio::CString &inPath)
+bool Qt3DSFile::IsPathRelative(const Q3DStudio::CString &inPath)
 {
     QFileInfo info(inPath.toQString());
     return info.isRelative();
@@ -445,7 +445,7 @@ bool CUICFile::IsPathRelative(const Q3DStudio::CString &inPath)
  * @param inStat stat struct to fill
  * @return true if file stats are successfully obtained
  */
-bool CUICFile::GetFileStat(struct _stat *inStat) const
+bool Qt3DSFile::GetFileStat(struct _stat *inStat) const
 {
 #ifdef KDAB_TEMPORARILY_REMOVED
     return ::_wstat(m_Path, inStat) == 0;
diff --git a/src/Authoring/Common/Code/_Win32/FileIterator.cpp b/src/Authoring/Common/Code/_Win32/FileIterator.cpp
index 653f3fc2..3084b9f4 100644
--- a/src/Authoring/Common/Code/_Win32/FileIterator.cpp
+++ b/src/Authoring/Common/Code/_Win32/FileIterator.cpp
@@ -48,7 +48,7 @@ using namespace Q3DStudio;
  * iterations refer to this snapshot.
  * @param inFile directory to iterate through
  */
-CFileIterator::CFileIterator(const CUICFile *inFile)
+CFileIterator::CFileIterator(const Qt3DSFile *inFile)
 {
     m_File = inFile->GetAbsolutePath();
 
@@ -106,9 +106,9 @@ void CFileIterator::operator+=(const long inNumToInc)
 /**
  * @return the file or directory currently pointed to by this iterator
  */
-CUICFile CFileIterator::GetCurrent()
+Qt3DSFile CFileIterator::GetCurrent()
 {
-    return CUICFile(m_FileNames[m_Index]);
+    return Qt3DSFile(m_FileNames[m_Index]);
 }
 
 //=============================================================================
diff --git a/src/Authoring/Common/Code/_Win32/Include/PlatformConversion.h b/src/Authoring/Common/Code/_Win32/Include/PlatformConversion.h
index 80a3c76a..d891cc1a 100644
--- a/src/Authoring/Common/Code/_Win32/Include/PlatformConversion.h
+++ b/src/Authoring/Common/Code/_Win32/Include/PlatformConversion.h
@@ -67,10 +67,10 @@ class CPlatformConversion
 public:
     //==============================================================================
     /**
-     *	Convert an UICRect to a Q3DStudio::CRect
+     *	Convert an Qt3DSRect to a Q3DStudio::CRect
      */
     //==============================================================================
-    static void UICRectToCRect(const UICRect &inPlatform, Q3DStudio::CRectBase &outRect)
+    static void Qt3DSRectToCRect(const Qt3DSRect &inPlatform, Q3DStudio::CRectBase &outRect)
     {
         outRect.left = inPlatform.left;
         outRect.top = inPlatform.top;
@@ -80,10 +80,10 @@ public:
 
     //==============================================================================
     /**
-     *	Convert a Q3DStudio::CRect to an UICRect
+     *	Convert a Q3DStudio::CRect to an Qt3DSRect
      */
     //==============================================================================
-    static void CRectToUICRect(const Q3DStudio::CRectBase &inRect, UICRect &outPlatform)
+    static void CRectToQt3DSRect(const Q3DStudio::CRectBase &inRect, Qt3DSRect &outPlatform)
     {
         outPlatform.left = inRect.left;
         outPlatform.top = inRect.top;
@@ -93,10 +93,10 @@ public:
 
     //==============================================================================
     /**
-     *	Convert an UICPoint to an Q3DStudio::CPoint
+     *	Convert an Qt3DSPoint to an Q3DStudio::CPoint
      */
     //==============================================================================
-    static void UICPointToCPoint(const UICPoint &inPlatform, Q3DStudio::CPointBase &outPoint)
+    static void Qt3DSPointToCPoint(const Qt3DSPoint &inPlatform, Q3DStudio::CPointBase &outPoint)
     {
         outPoint.x = inPlatform.x;
         outPoint.y = inPlatform.y;
@@ -104,10 +104,10 @@ public:
 
     //==============================================================================
     /**
-     *	Convert a Q3DStudio::CPoint to an UICPoint
+     *	Convert a Q3DStudio::CPoint to an Qt3DSPoint
      */
     //==============================================================================
-    static void CPointToUICPoint(const Q3DStudio::CPointBase &inPoint, UICPoint &outPlatform)
+    static void CPointToQt3DSPoint(const Q3DStudio::CPointBase &inPoint, Qt3DSPoint &outPlatform)
     {
         outPlatform.x = inPoint.x;
         outPlatform.y = inPoint.y;
diff --git a/src/Authoring/Common/Code/_Win32/Include/PlatformTypes.h b/src/Authoring/Common/Code/_Win32/Include/PlatformTypes.h
index b0c81c97..569b4cab 100644
--- a/src/Authoring/Common/Code/_Win32/Include/PlatformTypes.h
+++ b/src/Authoring/Common/Code/_Win32/Include/PlatformTypes.h
@@ -46,11 +46,11 @@
 #include <winsock2.h>
 #include <windows.h>
 
-typedef RECT UICRect;
-typedef POINT UICPoint;
-typedef void *UICWindow;
-typedef HWND UICRenderDevice;
-typedef HCURSOR UICCursor;
+typedef RECT Qt3DSRect;
+typedef POINT Qt3DSPoint;
+typedef void *Qt3DSWindow;
+typedef HWND Qt3DSRenderDevice;
+typedef HCURSOR Qt3DSCursor;
 
 typedef unsigned __int64 __uint64;
 typedef unsigned long __uint32;
@@ -91,8 +91,8 @@ struct GUID
 };
 typedef const GUID& REFGUID;
 
-typedef void* UICWindow;
-typedef void* UICRenderDevice;
+typedef void* Qt3DSWindow;
+typedef void* Qt3DSRenderDevice;
 
 typedef union _LARGE_INTEGER {
   struct {
diff --git a/src/Authoring/Common/Code/_Win32/Preferences.cpp b/src/Authoring/Common/Code/_Win32/Preferences.cpp
index 9fe5bba9..35558b75 100644
--- a/src/Authoring/Common/Code/_Win32/Preferences.cpp
+++ b/src/Authoring/Common/Code/_Win32/Preferences.cpp
@@ -138,7 +138,7 @@ void CPreferences::SetLongValue(const Q3DStudio::CString &inKey, long inValue)
     s_PreferencesSerializer.Revert();
     s_PreferencesSerializer.Begin(m_TagPath);
     Q3DStudio::CString theStrValue;
-    theStrValue.Format(_UIC("%ld"), inValue);
+    theStrValue.Format(_LSTR("%ld"), inValue);
 
     s_PreferencesSerializer.SetSubElemValue(inKey, theStrValue);
 }
@@ -202,7 +202,7 @@ void CPreferences::SetValue(const Q3DStudio::CString &inKey, double inValue)
     s_PreferencesSerializer.Revert();
     s_PreferencesSerializer.Begin(m_TagPath);
     Q3DStudio::CString theStrValue;
-    theStrValue.Format(_UIC("%20.2f"), inValue);
+    theStrValue.Format(_LSTR("%20.2f"), inValue);
 
     s_PreferencesSerializer.SetSubElemValue(inKey, theStrValue);
 }
@@ -263,7 +263,7 @@ void CPreferences::SetColorValue(const Q3DStudio::CString &inKey, CColor inValue
     s_PreferencesSerializer.Revert();
     s_PreferencesSerializer.Begin(m_TagPath);
     Q3DStudio::CString theStrValue;
-    theStrValue.Format(_UIC("%i %i %i"), inValue.GetRed(), inValue.GetGreen(), inValue.GetBlue());
+    theStrValue.Format(_LSTR("%i %i %i"), inValue.GetRed(), inValue.GetGreen(), inValue.GetBlue());
     s_PreferencesSerializer.SetSubElemValue(inKey, theStrValue);
 }
 
@@ -302,4 +302,4 @@ bool CPreferences::Exists(const Q3DStudio::CString &inKeyName)
     s_PreferencesSerializer.Revert();
     s_PreferencesSerializer.Begin(m_TagPath);
     return s_PreferencesSerializer.ExistElem(inKeyName);
-}
-\ No newline at end of file
+}
diff --git a/src/Authoring/Common/Code/_Win32/Qt3DSFile.cpp b/src/Authoring/Common/Code/_Win32/Qt3DSFile.cpp
index adea0ca8..cb67bbfe 100644
--- a/src/Authoring/Common/Code/_Win32/Qt3DSFile.cpp
+++ b/src/Authoring/Common/Code/_Win32/Qt3DSFile.cpp
@@ -43,7 +43,7 @@
 #include "IOLibraryException.h"
 #include <sys/stat.h> // _stat
 
-// CUICFile originally uses ***W for file ops
+// Qt3DSFile originally uses ***W for file ops
 // but this only works for win2k and above (Bug2994)
 // if using plain version is giving too much problem, uncomment the line below
 //#define USE_WIDE_VERSION
@@ -51,14 +51,14 @@
 //==============================================================================
 //	Static variables
 //==============================================================================
-TFilePathList CUICFile::s_TempFilePathList;
+TFilePathList Qt3DSFile::s_TempFilePathList;
 
 //==============================================================================
 //	Constants
 //==============================================================================
 #ifdef KDAB_TEMPORARILY_REMOVED
-const Q3DStudio::CString CUICFile::CURRENT_DIR(".\\");
-const Q3DStudio::CString CUICFile::PARENT_DIR("..\\");
+const Q3DStudio::CString Qt3DSFile::CURRENT_DIR(".\\");
+const Q3DStudio::CString Qt3DSFile::PARENT_DIR("..\\");
 
 //=============================================================================
 /**
@@ -66,7 +66,7 @@ const Q3DStudio::CString CUICFile::PARENT_DIR("..\\");
  * @param inIsPosix ignored.
  * @param inAddBase ignored.
  */
-CUICFile::CUICFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool inAddBase)
+Qt3DSFile::Qt3DSFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool inAddBase)
 {
     Q_UNUSED(inIsPosix);
     Q_UNUSED(inAddBase);
@@ -78,10 +78,10 @@ CUICFile::CUICFile(const Q3DStudio::CString &inPathName, bool inIsPosix, bool in
 /**
  * Create a file by combining the two paths.
  */
-CUICFile::CUICFile(Q3DStudio::CString inPathName, Q3DStudio::CString inName)
+Qt3DSFile::Qt3DSFile(Q3DStudio::CString inPathName, Q3DStudio::CString inName)
 {
-    CUICFile theBasePath(inPathName);
-    CUICFile theFile = Combine(theBasePath, inName);
+    Qt3DSFile theBasePath(inPathName);
+    Qt3DSFile theFile = Combine(theBasePath, inName);
     m_Path = theFile.GetPath();
 }
 
@@ -89,15 +89,15 @@ CUICFile::CUICFile(Q3DStudio::CString inPathName, Q3DStudio::CString inName)
 /**
  * Create a file by combining the base path with a relative path.
  */
-CUICFile::CUICFile(const CUICFile &inBasePath, const Q3DStudio::CString &inPathname, bool inIsPosix)
+Qt3DSFile::Qt3DSFile(const Qt3DSFile &inBasePath, const Q3DStudio::CString &inPathname, bool inIsPosix)
 {
     Q_UNUSED(inIsPosix);
 
-    CUICFile theFile(Combine(inBasePath, inPathname));
+    Qt3DSFile theFile(Combine(inBasePath, inPathname));
     m_Path = theFile.GetPath();
 }
 
-CUICFile::CUICFile(const CUICFile &inFile)
+Qt3DSFile::Qt3DSFile(const Qt3DSFile &inFile)
 {
     m_Path = inFile.m_Path;
 }
@@ -106,7 +106,7 @@ CUICFile::CUICFile(const CUICFile &inFile)
 /**
  * Get an iterator for all the sub-files of this directory.
  */
-CFileIterator CUICFile::GetSubItems() const
+CFileIterator Qt3DSFile::GetSubItems() const
 {
     return CFileIterator(this);
 }
@@ -115,11 +115,11 @@ CFileIterator CUICFile::GetSubItems() const
 /**
  * Destructor
  */
-CUICFile::~CUICFile()
+Qt3DSFile::~Qt3DSFile()
 {
 }
 
-bool CUICFile::operator==(const CUICFile &inRHS) const
+bool Qt3DSFile::operator==(const Qt3DSFile &inRHS) const
 {
 #ifdef _WIN32
     return GetAbsolutePath().CompareNoCase(inRHS.GetAbsolutePath());
@@ -132,7 +132,7 @@ bool CUICFile::operator==(const CUICFile &inRHS) const
 /**
  * Returns true if this is a file and can be read.
  */
-bool CUICFile::CanRead() const
+bool Qt3DSFile::CanRead() const
 {
     return IsFile();
 }
@@ -141,7 +141,7 @@ bool CUICFile::CanRead() const
 /**
  * Returns true if this is a file and can be written to.
  */
-bool CUICFile::CanWrite() const
+bool Qt3DSFile::CanWrite() const
 {
     long theAttributes = ::GetFileAttributesW(GetAbsolutePath());
     return (theAttributes != INVALID_FILE_ATTRIBUTES) && !(theAttributes & FILE_ATTRIBUTE_READONLY);
@@ -154,7 +154,7 @@ bool CUICFile::CanWrite() const
  *
  *	@return	true if the deletion of file/folder is successful, else false
  */
-bool CUICFile::DeleteFile() const
+bool Qt3DSFile::DeleteFile() const
 {
     BOOL theFileDeleted = FALSE;
 
@@ -164,7 +164,7 @@ bool CUICFile::DeleteFile() const
         CFileIterator theIterator = GetSubItems();
 
         for (; !theIterator.IsDone(); ++theIterator) {
-            CUICFile theFile = theIterator.GetCurrent();
+            Qt3DSFile theFile = theIterator.GetCurrent();
             theFile.DeleteFile();
         }
         theFileDeleted = ::RemoveDirectory(m_Path);
@@ -183,7 +183,7 @@ bool CUICFile::DeleteFile() const
 /**
  * Check to see if this file or directory exists.
  */
-bool CUICFile::Exists() const
+bool Qt3DSFile::Exists() const
 {
 #ifdef USE_WIDE_VERSION
     long theAttributes = ::GetFileAttributesW(GetAbsolutePath());
@@ -198,7 +198,7 @@ bool CUICFile::Exists() const
  * Get the fully qualified absolute path.
  * This should resolve all relative parts of the path.
  */
-Q3DStudio::CString CUICFile::GetAbsolutePath() const
+Q3DStudio::CString Qt3DSFile::GetAbsolutePath() const
 {
     return m_Path;
 }
@@ -207,7 +207,7 @@ Q3DStudio::CString CUICFile::GetAbsolutePath() const
 /**
  * @see GetAbsolutePath.
  */
-Q3DStudio::CString CUICFile::GetAbsolutePosixPath() const
+Q3DStudio::CString Qt3DSFile::GetAbsolutePosixPath() const
 {
     return GetAbsolutePath();
 }
@@ -216,7 +216,7 @@ Q3DStudio::CString CUICFile::GetAbsolutePosixPath() const
 /**
  * Get the filename section of this file, ignoring all drives and directories.
  */
-Q3DStudio::CString CUICFile::GetName() const
+Q3DStudio::CString Qt3DSFile::GetName() const
 {
     // back/forward slashes counts in a file path (a badly formed, but still acceptable in win32)
     // apparently, m_Path.ReverseFind( "\\/" ); doesnt work as required
@@ -260,7 +260,7 @@ Q3DStudio::CString CUICFile::GetName() const
 /**
  * Get the file extension, without the period.
  */
-Q3DStudio::CString CUICFile::GetExtension() const
+Q3DStudio::CString Qt3DSFile::GetExtension() const
 {
     long theIdx = m_Path.ReverseFind('.');
     if (theIdx != Q3DStudio::CString::ENDOFSTRING)
@@ -273,7 +273,7 @@ Q3DStudio::CString CUICFile::GetExtension() const
 /**
  * Get the underlying path for this file, this may include relativity.
  */
-Q3DStudio::CString CUICFile::GetPath() const
+Q3DStudio::CString Qt3DSFile::GetPath() const
 {
     return m_Path;
 }
@@ -283,7 +283,7 @@ Q3DStudio::CString CUICFile::GetPath() const
  * Returns true if this file exists and is not a directory.
  * The param inCheckForAlias is not used in Windows
  */
-bool CUICFile::IsFile(bool inCheckForAlias /*true*/) const
+bool Qt3DSFile::IsFile(bool inCheckForAlias /*true*/) const
 {
     Q_UNUSED(inCheckForAlias);
 #ifdef USE_WIDE_VERSION
@@ -299,7 +299,7 @@ bool CUICFile::IsFile(bool inCheckForAlias /*true*/) const
 /**
  * Check to see if this file or directory is hidden.
  */
-bool CUICFile::IsHidden() const
+bool Qt3DSFile::IsHidden() const
 {
 #ifdef USE_WIDE_VERSION
     long theAttributes = ::GetFileAttributesW(GetAbsolutePath());
@@ -313,7 +313,7 @@ bool CUICFile::IsHidden() const
 /**
  * Get the size of this file in bytes.
  */
-long CUICFile::Length() const
+long Qt3DSFile::Length() const
 {
     HANDLE theFile = OpenFileReadHandle();
     long theFilesize = ::GetFileSize(theFile, NULL);
@@ -326,7 +326,7 @@ long CUICFile::Length() const
 /**
  * Rename (or move) this file to the other file.
  */
-void CUICFile::RenameTo(const CUICFile &inDestination)
+void Qt3DSFile::RenameTo(const Qt3DSFile &inDestination)
 {
 #ifdef USE_WIDE_VERSION
 
@@ -343,7 +343,7 @@ void CUICFile::RenameTo(const CUICFile &inDestination)
 /**
  * Copy this file to the other file, leaving this file intact.
  */
-void CUICFile::CopyTo(const CUICFile &inDestination)
+void Qt3DSFile::CopyTo(const Qt3DSFile &inDestination)
 {
 #ifdef USE_WIDE_VERSION
     if (!::CopyFileW(GetAbsolutePath(), inDestination.GetAbsolutePath(), FALSE))
@@ -357,7 +357,7 @@ void CUICFile::CopyTo(const CUICFile &inDestination)
 /**
  * Make this file read only. or unmark the read only
  */
-void CUICFile::SetReadOnly(bool inReadOnlyFlag)
+void Qt3DSFile::SetReadOnly(bool inReadOnlyFlag)
 {
 #ifdef USE_WIDE_VERSION
 
@@ -384,7 +384,7 @@ void CUICFile::SetReadOnly(bool inReadOnlyFlag)
 /**
  * Get the location of where this application resides.
  */
-CUICFile CUICFile::GetApplicationDirectory()
+Qt3DSFile Qt3DSFile::GetApplicationDirectory()
 {
     Q3DStudio::CString theModuleDir;
     wchar_t theModulePath[MAX_PATH] = { '\0' };
@@ -406,7 +406,7 @@ CUICFile CUICFile::GetApplicationDirectory()
  * Create a temporary file from where the system holds it's temp files.
  * @param inExtension the file extension that should be used.
  */
-CUICFile CUICFile::GetTemporaryFile(const Q3DStudio::CString &inExtension)
+Qt3DSFile Qt3DSFile::GetTemporaryFile(const Q3DStudio::CString &inExtension)
 {
     wchar_t theTempPath[MAX_PATH] = { '\0' };
     // char theTempFileName[MAX_PATH] = {'\0'};
@@ -430,10 +430,10 @@ CUICFile CUICFile::GetTemporaryFile(const Q3DStudio::CString &inExtension)
 
     s_TempFilePathList.insert(theTempFile);
 
-    return CUICFile(theTempFile);
+    return Qt3DSFile(theTempFile);
 }
 
-CUICFile CUICFile::GetTemporaryFile()
+Qt3DSFile Qt3DSFile::GetTemporaryFile()
 {
     wchar_t theTempPath[MAX_PATH] = { '\0' };
     wchar_t theTempFileName[MAX_PATH] = { '\0' };
@@ -445,17 +445,17 @@ CUICFile CUICFile::GetTemporaryFile()
     if (::GetTempFileName(theTempPath, L"~ui", 0, theTempFileName) != 0) {
         Q3DStudio::CString theTempFile(theTempFileName);
         s_TempFilePathList.insert(theTempFile);
-        return CUICFile(theTempFile);
+        return Qt3DSFile(theTempFile);
     }
     // return "" if the system fails us.
-    return CUICFile("");
+    return Qt3DSFile("");
 }
 
 //=============================================================================
 /**
  * Get the URL representing this file.
  */
-CURL CUICFile::GetURL() const
+CURL Qt3DSFile::GetURL() const
 {
     Q3DStudio::CString thePath(m_Path);
 
@@ -464,7 +464,7 @@ CURL CUICFile::GetURL() const
         if (thePath.Find(CURRENT_DIR) == 0)
             thePath.Delete(0, CURRENT_DIR.Length());
 
-        thePath.Insert(0, CUICFile::GetApplicationDirectory().GetAbsolutePosixPath());
+        thePath.Insert(0, Qt3DSFile::GetApplicationDirectory().GetAbsolutePosixPath());
     }
 
     return CURL(thePath);
@@ -475,7 +475,7 @@ CURL CUICFile::GetURL() const
  * Request the filesystem to open this file in whatever manner it chooses with
  * the associated application.
  */
-void CUICFile::Execute() const
+void Qt3DSFile::Execute() const
 {
     Q3DStudio::CString sFile = GetAbsolutePath();
 
@@ -493,7 +493,7 @@ void CUICFile::Execute() const
 /**
  * Combine the file and relative path together into another file.
  */
-CUICFile CUICFile::Combine(const CUICFile &inBasePath, const Q3DStudio::CString &inRelativePath)
+Qt3DSFile Qt3DSFile::Combine(const Qt3DSFile &inBasePath, const Q3DStudio::CString &inRelativePath)
 {
     Q3DStudio::CString theFullPath;
 
@@ -530,7 +530,7 @@ CUICFile CUICFile::Combine(const CUICFile &inBasePath, const Q3DStudio::CString
  * Get a file handle for this file that can be used for reading.
  * The handle must be closed with CloseHandle when finished.
  */
-HANDLE CUICFile::OpenFileReadHandle() const
+HANDLE Qt3DSFile::OpenFileReadHandle() const
 {
 #ifdef USE_WIDE_VERSION
 
@@ -550,7 +550,7 @@ HANDLE CUICFile::OpenFileReadHandle() const
  * Get a file handle for this file that can be used for writing.
  * The handle must be closed with CloseHandle when finished.
  */
-HANDLE CUICFile::OpenFileWriteHandle() const
+HANDLE Qt3DSFile::OpenFileWriteHandle() const
 {
 #ifdef USE_WIDE_VERSION
 
@@ -571,7 +571,7 @@ HANDLE CUICFile::OpenFileWriteHandle() const
  *	This would only clear the temp files that were created during the current program session,
  *	and not any previous files created by anything prior to this session.
  */
-void CUICFile::ClearCurrentTempCache()
+void Qt3DSFile::ClearCurrentTempCache()
 {
     TFilePathListIterator theTempFileIterator;
 
@@ -585,7 +585,7 @@ void CUICFile::ClearCurrentTempCache()
     }
 }
 
-void CUICFile::AddTempFile(const Q3DStudio::CString &inFile)
+void Qt3DSFile::AddTempFile(const Q3DStudio::CString &inFile)
 {
     s_TempFilePathList.insert(inFile);
 }
@@ -597,7 +597,7 @@ void CUICFile::AddTempFile(const Q3DStudio::CString &inFile)
  *  @param inPath path to check
  *  @return bool true to indicate this is a relative path
  */
-bool CUICFile::IsPathRelative(const Q3DStudio::CString &inPath)
+bool Qt3DSFile::IsPathRelative(const Q3DStudio::CString &inPath)
 {
     bool theIsRelative = false;
 
@@ -616,7 +616,7 @@ bool CUICFile::IsPathRelative(const Q3DStudio::CString &inPath)
  * @param inStat stat struct to fill
  * @return true if file stats are successfully obtained
  */
-bool CUICFile::GetFileStat(struct _stat *inStat) const
+bool Qt3DSFile::GetFileStat(struct _stat *inStat) const
 {
     return ::_wstat(m_Path, inStat) == 0;
 }
diff --git a/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.cpp b/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.cpp
index 01fe61d1..b6b00635 100644
--- a/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.cpp
+++ b/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.cpp
@@ -34,11 +34,11 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-CUICRegistry::CUICRegistry()
+Qt3DSRegistry::Qt3DSRegistry()
 {
 }
 
-CUICRegistry::~CUICRegistry()
+Qt3DSRegistry::~Qt3DSRegistry()
 {
 }
 
@@ -62,7 +62,7 @@ CUICRegistry::~CUICRegistry()
  */
 #ifdef KDAB_TEMPORARILY_REMOVED
 //==============================================================================
-BOOL CUICRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
+BOOL Qt3DSRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
                                const Q3DStudio::CString &inValueName,
                                Q3DStudio::CString &outValueString, HKEY inKeyRoot)
 {
@@ -108,7 +108,7 @@ BOOL CUICRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
  *		@return HRESULT
  */
 //==============================================================================
-BOOL CUICRegistry::SetValueKey(const Q3DStudio::CString &inKeyName,
+BOOL Qt3DSRegistry::SetValueKey(const Q3DStudio::CString &inKeyName,
                                const Q3DStudio::CString &inValueName,
                                const Q3DStudio::CString &inValueString, HKEY inKeyRoot)
 {
@@ -145,7 +145,7 @@ BOOL CUICRegistry::SetValueKey(const Q3DStudio::CString &inKeyName,
  *		@return HRESULT
  */
 //==============================================================================
-BOOL CUICRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
+BOOL Qt3DSRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
                                const Q3DStudio::CString &inValueName, long &outValue,
                                HKEY inKeyRoot)
 {
@@ -184,7 +184,7 @@ BOOL CUICRegistry::GetValueKey(const Q3DStudio::CString &inKeyName,
  *		@return HRESULT
  */
 //==============================================================================
-BOOL CUICRegistry::SetValueKey(const Q3DStudio::CString &inKeyName,
+BOOL Qt3DSRegistry::SetValueKey(const Q3DStudio::CString &inKeyName,
                                const Q3DStudio::CString &inValueName, long inValue, HKEY inKeyRoot)
 {
     BOOL theResult = FALSE;
diff --git a/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.h b/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.h
index 0b72b5b6..4eef82c3 100644
--- a/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.h
+++ b/src/Authoring/Common/Code/_Win32/Qt3DSRegistry.h
@@ -38,18 +38,18 @@
 
 //==============================================================================
 /**
- *		@class	CUICRegistry
+ *		@class	Qt3DSRegistry
  *		@brief	Studio Client Registry Functions.
  *
  *		Registry entries:
  *		-	Stores the latest installed version.
  */
 //==============================================================================
-class CUICRegistry
+class Qt3DSRegistry
 {
 public:
-    CUICRegistry();
-    virtual ~CUICRegistry();
+    Qt3DSRegistry();
+    virtual ~Qt3DSRegistry();
 
 #ifdef KDAB_TEMPORARILY_REMOVED
     static BOOL GetValueKey(const Q3DStudio::CString &inKeyName,
diff --git a/src/Authoring/MeshOptimizer/Source/MeshOptimizer.cpp b/src/Authoring/MeshOptimizer/Source/MeshOptimizer.cpp
index c7a215e5..980d513f 100644
--- a/src/Authoring/MeshOptimizer/Source/MeshOptimizer.cpp
+++ b/src/Authoring/MeshOptimizer/Source/MeshOptimizer.cpp
@@ -57,13 +57,13 @@ bool IsNotUIPFile(const CFilePath &inFile)
     return false;
 }
 
-using namespace UICDM;
+using namespace qt3dsdm;
 typedef map<Q3DStudio::CFilePath, vector<QT3DSU32>> TMeshFileToIdMap;
 
-void ScanChildrenForSourcepath(UICDM::IDOMReader &inReader, TMeshFileToIdMap &inMap,
+void ScanChildrenForSourcepath(qt3dsdm::IDOMReader &inReader, TMeshFileToIdMap &inMap,
                                const CFilePath &inProjectDirectory)
 {
-    UICDM::IDOMReader::Scope elemScope(inReader);
+    qt3dsdm::IDOMReader::Scope elemScope(inReader);
     const wchar_t *sourcePathAtt = NULL;
     if (inReader.UnregisteredAtt(L"sourcepath", sourcePathAtt)) {
         if (sourcePathAtt && *sourcePathAtt) {
@@ -94,28 +94,28 @@ void FindMeshFiles(const CFilePath &inUIPPath, TMeshFileToIdMap &inMeshMap,
                    const CFilePath &inProjectDirectory)
 {
     qCInfo(qt3ds::TRACE_INFO) << "Scanning file " << inUIPPath.GetCharStar() << " for mesh files";
-    std::shared_ptr<UICDM::IStringTable> theTable(UICDM::IStringTable::CreateStringTable());
-    std::shared_ptr<UICDM::IDOMFactory> theFactory(
-        UICDM::IDOMFactory::CreateDOMFactory(theTable));
+    std::shared_ptr<qt3dsdm::IStringTable> theTable(qt3dsdm::IStringTable::CreateStringTable());
+    std::shared_ptr<qt3dsdm::IDOMFactory> theFactory(
+        qt3dsdm::IDOMFactory::CreateDOMFactory(theTable));
     CFileSeekableIOStream theStream(inUIPPath, FileOpenFlagValues::Open);
     if (!theStream.IsOpen()) {
         QT3DS_ASSERT(false);
         return;
     }
 
-    UICDM::SDOMElement *theElement = CDOMSerializer::Read(*theFactory, theStream);
+    qt3dsdm::SDOMElement *theElement = CDOMSerializer::Read(*theFactory, theStream);
     if (!theElement) {
         QT3DS_ASSERT(false);
         return;
     }
-    std::shared_ptr<UICDM::IDOMReader> theReader(
-        UICDM::IDOMReader::CreateDOMReader(*theElement, theTable, theFactory));
+    std::shared_ptr<qt3dsdm::IDOMReader> theReader(
+        qt3dsdm::IDOMReader::CreateDOMReader(*theElement, theTable, theFactory));
     if (!theReader->MoveToFirstChild(L"Project")) {
         QT3DS_ASSERT(false);
         return;
     }
     {
-        UICDM::IDOMReader::Scope projectScope(*theReader);
+        qt3dsdm::IDOMReader::Scope projectScope(*theReader);
         if (!theReader->MoveToFirstChild(L"Graph")) {
             QT3DS_ASSERT(false);
             return;
@@ -123,7 +123,7 @@ void FindMeshFiles(const CFilePath &inUIPPath, TMeshFileToIdMap &inMeshMap,
         ScanChildrenForSourcepath(*theReader, inMeshMap, inProjectDirectory);
     }
     {
-        UICDM::IDOMReader::Scope projectScope(*theReader);
+        qt3dsdm::IDOMReader::Scope projectScope(*theReader);
         if (theReader->MoveToFirstChild(L"Logic"))
             ScanChildrenForSourcepath(*theReader, inMeshMap, inProjectDirectory);
     }
diff --git a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp b/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp
index cf0181b1..a665c033 100644
--- a/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp
+++ b/src/Authoring/QT3DSDM/Qt3DSDMPrefix.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 // stdafx.cpp : source file that includes just the standard includes
-// UICDM.pch will be the pre-compiled header
+// DataModel.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information
 
 #include "Qt3DSDMPrefix.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp
index 51194105..5c3cc924 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.cpp
@@ -44,14 +44,14 @@ Qt3DSDMInstanceHandle CDataCoreProducer::CreateInstance(Qt3DSDMInstanceHandle in
     return retval;
 }
 
-inline tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>
+inline tuple<Qt3DSDMPropertyHandle, Qt3DSDMPropertyDefinition>
 TransformProperty(Qt3DSDMPropertyHandle inProperty, CSimpleDataCore &inData)
 {
     return make_tuple(inProperty, inData.GetProperty(inProperty));
 }
 
 inline void SignalPropertyRemoved(Qt3DSDMInstanceHandle inInstance,
-                                  tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition> inData,
+                                  tuple<Qt3DSDMPropertyHandle, Qt3DSDMPropertyDefinition> inData,
                                   IDataCoreSignalSender *inSender)
 {
     inSender->SignalPropertyRemoved(inInstance, get<0>(inData), get<1>(inData).m_Name.wide_str(),
@@ -77,10 +77,10 @@ void CDataCoreProducer::DeleteInstance(Qt3DSDMInstanceHandle inInstance)
                                         std::ref(m_Data->m_Objects), m_Consumer));
     }
 
-    vector<tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>> theDefinitionList;
+    vector<tuple<Qt3DSDMPropertyHandle, Qt3DSDMPropertyDefinition>> theDefinitionList;
     theDefinitionList.resize(theProperties.size());
 
-    function<tuple<Qt3DSDMPropertyHandle, SUICDMPropertyDefinition>(Qt3DSDMPropertyHandle)>
+    function<tuple<Qt3DSDMPropertyHandle, Qt3DSDMPropertyDefinition>(Qt3DSDMPropertyHandle)>
         thePropertyTransform(bind(TransformProperty, std::placeholders::_1, ref(*m_Data)));
     transform(theProperties.begin(), theProperties.end(), theDefinitionList.begin(),
               thePropertyTransform);
@@ -166,7 +166,7 @@ void CDataCoreProducer::GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
     m_Data->GetInstanceProperties(inInstance, outProperties);
 }
 
-const SUICDMPropertyDefinition &
+const Qt3DSDMPropertyDefinition &
 CDataCoreProducer::GetProperty(Qt3DSDMPropertyHandle inProperty) const
 {
     return m_Data->GetProperty(inProperty);
@@ -174,7 +174,7 @@ CDataCoreProducer::GetProperty(Qt3DSDMPropertyHandle inProperty) const
 
 void CDataCoreProducer::RemoveProperty(Qt3DSDMPropertyHandle inProperty)
 {
-    SUICDMPropertyDefinition theDef = GetProperty(inProperty);
+    Qt3DSDMPropertyDefinition theDef = GetProperty(inProperty);
     TDataModelInstancePtr theInstance =
         CSimpleDataCore::GetInstanceNF(theDef.m_Instance, m_Data->m_Objects);
     if (find_if<TIntList::iterator>(theInstance->m_Properties,
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h b/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h
index 0b4e697a..8d89bfab 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/DataCoreProducer.h
@@ -107,7 +107,7 @@ public:
                                              DataModelDataType::Value inPropType) override;
     void GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                        TPropertyHandleList &outProperties) const override;
-    const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
+    const Qt3DSDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
     void RemoveProperty(Qt3DSDMPropertyHandle inProperty) override;
     void CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
                                         Qt3DSDMInstanceHandle inDestInstance) override;
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
index b401d83c..d6a1470b 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.cpp
@@ -30,7 +30,7 @@
 #include "SimpleDataCore.h"
 
 namespace qt3dsdm {
-TUICDMDebugLogFunction g_UICDMDebugLogger = NULL;
+Qt3DSDMDebugLogFunction g_DataModelDebugLogger = NULL;
 // Instances
 Qt3DSDMInstanceHandle CSimpleDataCore::CreateInstance(Qt3DSDMInstanceHandle hdl)
 {
@@ -97,15 +97,15 @@ void CSimpleDataCore::AddInstanceIfDerivedFrom(const std::pair<int, THandleObjec
 // Derivation
 void CSimpleDataCore::DeriveInstance(Qt3DSDMInstanceHandle inInstance, Qt3DSDMInstanceHandle inParent)
 {
-    if (g_UICDMDebugLogger)
-        g_UICDMDebugLogger("CSimpleDataCore::DeriveInstance Enter");
+    if (g_DataModelDebugLogger)
+        g_DataModelDebugLogger("CSimpleDataCore::DeriveInstance Enter");
     TDataModelInstancePtr theInstance = CSimpleDataCore::GetInstanceNF(inInstance, m_Objects);
     if (theInstance->m_Parents.find(inParent) == theInstance->m_Parents.end()) {
         std::shared_ptr<CDataModelInstance> theParent(GetInstanceNF(inParent, m_Objects));
         theInstance->m_Parents.insert(make_pair(inParent, theParent));
     }
-    if (g_UICDMDebugLogger)
-        g_UICDMDebugLogger("CSimpleDataCore::DeriveInstance Leave");
+    if (g_DataModelDebugLogger)
+        g_DataModelDebugLogger("CSimpleDataCore::DeriveInstance Leave");
 }
 
 void CSimpleDataCore::GetInstanceParents(Qt3DSDMInstanceHandle inHandle,
@@ -136,8 +136,8 @@ inline const wchar_t *SafeStrPtr(const wchar_t *inData)
 Qt3DSDMPropertyHandle CSimpleDataCore::AddProperty(Qt3DSDMInstanceHandle inInstance, TCharPtr inName,
                                                   DataModelDataType::Value inPropType)
 {
-    UICDM_LOG_FUNCTION("CSimpleDataCore::AddProperty");
-    UICDM_DEBUG_LOG(m_StringTable->GetNarrowStr(inName));
+    QT3DSDM_LOG_FUNCTION("CSimpleDataCore::AddProperty");
+    QT3DSDM_DEBUG_LOG(m_StringTable->GetNarrowStr(inName));
     TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
     TCharStr theName(inName);
     if (find_if<TIntList::iterator>(
@@ -145,7 +145,7 @@ Qt3DSDMPropertyHandle CSimpleDataCore::AddProperty(Qt3DSDMInstanceHandle inInsta
             std::bind(ComparePropertyNames, std::ref(theName),
                       std::placeholders::_1, std::ref(m_Objects)))
         != theInstance->m_Properties.end()) {
-        UICDM_DEBUG_LOG("Property Exists!!");
+        QT3DSDM_DEBUG_LOG("Property Exists!!");
         throw PropertyExists(L"");
     }
 
@@ -159,7 +159,7 @@ void CSimpleDataCore::GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
     transformv_all(GetInstanceNF(inInstance, m_Objects)->m_Properties, outProperties);
 }
 
-const SUICDMPropertyDefinition &CSimpleDataCore::GetProperty(Qt3DSDMPropertyHandle inProperty) const
+const Qt3DSDMPropertyDefinition &CSimpleDataCore::GetProperty(Qt3DSDMPropertyHandle inProperty) const
 {
     const CDataModelPropertyDefinitionObject *theProp =
         GetPropertyDefinitionNF(inProperty, m_Objects);
@@ -203,7 +203,7 @@ inline void CopyInstanceProperty(Qt3DSDMPropertyHandle inSrcPropertyHandle,
                                  Qt3DSDMInstanceHandle inInstanceHandle, CSimpleDataCore &inDataCore)
 {
     // create the property definition that matches the source
-    const SUICDMPropertyDefinition &theProperty = inDataCore.GetProperty(inSrcPropertyHandle);
+    const Qt3DSDMPropertyDefinition &theProperty = inDataCore.GetProperty(inSrcPropertyHandle);
     Qt3DSDMPropertyHandle theNewProperty =
         inDataCore.AddProperty(inInstanceHandle, theProperty.m_Name.wide_str(), theProperty.m_Type);
     // copy the value if one exists on the src.
@@ -442,14 +442,14 @@ bool CSimpleDataCore::IsProperty(int inHandle) const
 
 Qt3DSDMInstanceHandle CSimpleDataCore::CreateInstanceWithHandle(int inHandle)
 {
-    if (g_UICDMDebugLogger)
-        g_UICDMDebugLogger("CSimpleDataCore::CreateInstance Enter");
+    if (g_DataModelDebugLogger)
+        g_DataModelDebugLogger("CSimpleDataCore::CreateInstance Enter");
     if (HandleValid(inHandle)) {
-        if (g_UICDMDebugLogger) {
-            g_UICDMDebugLogger("CSimpleDataCore::CreateInstance Handle Exists!!");
+        if (g_DataModelDebugLogger) {
+            g_DataModelDebugLogger("CSimpleDataCore::CreateInstance Handle Exists!!");
             char buf[32];
             sprintf(buf, "%d", inHandle);
-            g_UICDMDebugLogger(buf);
+            g_DataModelDebugLogger(buf);
         }
         throw HandleExists(L"");
     }
@@ -458,8 +458,8 @@ Qt3DSDMInstanceHandle CSimpleDataCore::CreateInstanceWithHandle(int inHandle)
     const pair<int, THandleObjectPtr> thePair(std::make_pair(inHandle, theHandleObjectPtr));
     m_Objects.insert(thePair);
 
-    if (g_UICDMDebugLogger)
-        g_UICDMDebugLogger("CSimpleDataCore::CreateInstance Leave");
+    if (g_DataModelDebugLogger)
+        g_DataModelDebugLogger("CSimpleDataCore::CreateInstance Leave");
 
     return inHandle;
 }
@@ -469,14 +469,14 @@ Qt3DSDMPropertyHandle CSimpleDataCore::AddPropertyWithHandle(int inHandle,
                                                             TCharPtr inName,
                                                             DataModelDataType::Value inPropType)
 {
-    UICDM_DEBUG_LOG("CSimpleDataCore::AddPropertyWithHandle Enter");
-    UICDM_DEBUG_LOG(m_StringTable->GetNarrowStr(inName));
+    QT3DSDM_DEBUG_LOG("CSimpleDataCore::AddPropertyWithHandle Enter");
+    QT3DSDM_DEBUG_LOG(m_StringTable->GetNarrowStr(inName));
     if (HandleValid(inHandle)) {
-        if (g_UICDMDebugLogger) {
-            g_UICDMDebugLogger("CSimpleDataCore::AddPropertyWithHandle Handle Exists!!");
+        if (g_DataModelDebugLogger) {
+            g_DataModelDebugLogger("CSimpleDataCore::AddPropertyWithHandle Handle Exists!!");
             char buf[32];
             sprintf(buf, "%d", inHandle);
-            g_UICDMDebugLogger(buf);
+            g_DataModelDebugLogger(buf);
         }
 
         throw HandleExists(L"");
@@ -484,13 +484,13 @@ Qt3DSDMPropertyHandle CSimpleDataCore::AddPropertyWithHandle(int inHandle,
 
     TDataModelInstancePtr theInstance = GetInstanceNF(inInstance, m_Objects);
 
-    SUICDMPropertyDefinition theDefinition(inInstance, SafeStrPtr(inName), inPropType);
+    Qt3DSDMPropertyDefinition theDefinition(inInstance, SafeStrPtr(inName), inPropType);
     THandleObjectPtr theHandleObjectPtr(
         new CDataModelPropertyDefinitionObject(inHandle, theDefinition));
     const pair<int, THandleObjectPtr> thePair(std::make_pair(inHandle, theHandleObjectPtr));
     m_Objects.insert(thePair);
     theInstance->m_Properties.push_back(inHandle);
-    UICDM_DEBUG_LOG("CSimpleDataCore::AddPropertyWithHandle Leave");
+    QT3DSDM_DEBUG_LOG("CSimpleDataCore::AddPropertyWithHandle Leave");
     return inHandle;
 }
 
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h b/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h
index 2f216d1a..2664dab4 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleDataCore.h
@@ -77,9 +77,9 @@ typedef std::vector<TPropertyPair> TPropertyPairList;
 class CDataModelPropertyDefinitionObject : public CHandleObject
 {
 public:
-    SUICDMPropertyDefinition m_Definition;
+    Qt3DSDMPropertyDefinition m_Definition;
 
-    CDataModelPropertyDefinitionObject(int inHandle, const SUICDMPropertyDefinition &inDefinition)
+    CDataModelPropertyDefinitionObject(int inHandle, const Qt3DSDMPropertyDefinition &inDefinition)
         : CHandleObject(inHandle)
         , m_Definition(inDefinition)
     {
@@ -243,7 +243,7 @@ public:
 
     Qt3DSDMPropertyHandle AddProperty(Qt3DSDMInstanceHandle inClass, TCharPtr inName,
                                              DataModelDataType::Value inPropType) override;
-    const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
+    const Qt3DSDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const override;
     void GetInstanceProperties(Qt3DSDMInstanceHandle inInstance,
                                        TPropertyHandleList &outProperties) const override;
     void RemoveProperty(Qt3DSDMPropertyHandle inProperty) override;
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
index 79c7fdc5..410df7a7 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SlideCoreProducer.cpp
@@ -233,7 +233,7 @@ inline void CSlideCoreProducer::DoForceSetInstancePropertyValue(Qt3DSDMSlideHand
         iter->second->Update(theNewValue);
         if (GetValueType(theTempValue) == DataModelDataType::String) {
             TDataStrPtr theStrPtr = qt3dsdm::get<TDataStrPtr>(theTempValue);
-            UICDM_DEBUG_LOG(m_Data->GetStringTable().GetNarrowStr(theStrPtr->GetData()));
+            QT3DSDM_DEBUG_LOG(m_Data->GetStringTable().GetNarrowStr(theStrPtr->GetData()));
         }
         return; // don't signal
     } else {
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
index 477d887c..a9201462 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionCore.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMACTIONCOREH
-#define UICDMACTIONCOREH
+#ifndef QT3DSDM_ACTION_CORE_H
+#define QT3DSDM_ACTION_CORE_H
 
 #include "Qt3DSDMHandles.h"
 #include "HandleSystemBase.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
index 52556640..0c77b9c4 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionInfo.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMACTIONINFOH
-#define UICDMACTIONINFOH
+#ifndef QT3DSDM_ACTION_INFO_H
+#define QT3DSDM_ACTION_INFO_H
 
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMMetaDataTypes.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
index d335d92c..8713729a 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMActionSystem.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMACTIONSYSTEMH
-#define UICDMACTIONSYSTEMH
+#ifndef QT3DSDM_ACTION_SYSTEM_H
+#define QT3DSDM_ACTION_SYSTEM_H
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMActionCore.h"
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
index 964c248b..588e06b3 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMANIMATIONH
-#define UICDMANIMATIONH
+#ifndef QT3DSDM_ANIMATION_H
+#define QT3DSDM_ANIMATION_H
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMValue.h"
@@ -172,7 +172,7 @@ typedef qt3ds::foundation::
         TKeyframe;
 
 template <>
-struct SUICDMGetter<TKeyframe>
+struct Qt3DSDMGetter<TKeyframe>
 {
     template <typename TRetType>
     TRetType doGet(const TKeyframe &inValue)
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
index 4e528112..4f0918d9 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h
@@ -345,7 +345,7 @@ struct DataTypeToTypeMap
     bool force_compile_error;
 };
 
-#define UICDM_DEFINE_TYPE_TO_DATA_TYPE(enumName, type)                                             \
+#define QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(enumName, type)                                             \
     template <>                                                                                    \
     struct TypeToDataTypeMap<type>                                                                 \
     {                                                                                              \
@@ -357,19 +357,19 @@ struct DataTypeToTypeMap
         typedef type TDataType;                                                                    \
     };
 
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float, float)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float2, SFloat2)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float3, SFloat3)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Long, qt3ds::QT3DSI32)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::String, TDataStrPtr)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Bool, bool)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Long4, SLong4)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::StringRef, SStringRef)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::StringOrInt, SStringOrInt)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::ObjectRef, SObjectRefType)
-UICDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::FloatList, TFloatList)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float, float)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float2, SFloat2)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Float3, SFloat3)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Long, qt3ds::QT3DSI32)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::String, TDataStrPtr)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Bool, bool)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::Long4, SLong4)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::StringRef, SStringRef)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::StringOrInt, SStringOrInt)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::ObjectRef, SObjectRefType)
+QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE(DataModelDataType::FloatList, TFloatList)
 
-#undef UICDM_DEFINE_TYPE_TO_DATA_TYPE
+#undef QT3DSDM_DEFINE_TYPE_TO_DATA_TYPE
 
 template <typename TDataType>
 inline DataModelDataType::Value TypeToDataType()
@@ -386,7 +386,7 @@ struct SComposerPropertyDefinition
                                 const TDataType &inDefault)
         : m_DefaultValue(inDefault)
     {
-        UICDM_LOG_FUNCTION("SComposerPropertyDefinition-1");
+        QT3DSDM_LOG_FUNCTION("SComposerPropertyDefinition-1");
         m_Property = inDataCore.AddProperty(inInstance, ComposerPropertyNames::Convert(TPropName),
                                             TypeToDataType<TDataType>());
         if (m_DefaultValue.hasValue())
@@ -394,7 +394,7 @@ struct SComposerPropertyDefinition
     }
     SComposerPropertyDefinition(IDataCore &inDataCore, Qt3DSDMInstanceHandle inInstance)
     {
-        UICDM_LOG_FUNCTION("SComposerPropertyDefinition-2");
+        QT3DSDM_LOG_FUNCTION("SComposerPropertyDefinition-2");
         m_Property = inDataCore.AddProperty(inInstance, ComposerPropertyNames::Convert(TPropName),
                                             TypeToDataType<TDataType>());
     }
@@ -454,27 +454,27 @@ struct SComposerBaseObjectDefinition : public SComposerTypePropertyDefinition<TE
         : SComposerTypePropertyDefinition<TEnumType>(inCore, inInstance)
         , m_Instance(inInstance)
     {
-        UICDM_LOG_FUNCTION("SComposerBaseObjectDefinition");
+        QT3DSDM_LOG_FUNCTION("SComposerBaseObjectDefinition");
         ComposerTypeDefinitionsHelper::SetInstanceAsCanonical(inMetaData, inInstance, TEnumType);
     }
 
     template <ComposerObjectTypes::Enum TBaseType>
     void Derive(IDataCore &inCore, const SComposerBaseObjectDefinition<TBaseType> &inParent)
     {
-        UICDM_LOG_FUNCTION("SComposerBaseObjectDefinition::Derive");
+        QT3DSDM_LOG_FUNCTION("SComposerBaseObjectDefinition::Derive");
         ComposerTypeDefinitionsHelper::DeriveInstance(inCore, m_Instance, inParent.m_Instance);
     }
     void SetType(IDataCore &inCore,
                  const SComposerBaseObjectDefinition<ComposerObjectTypes::Typed> &inParent)
     {
-        UICDM_LOG_FUNCTION("SComposerBaseObjectDefinition::SetInstancePropertyValue");
+        QT3DSDM_LOG_FUNCTION("SComposerBaseObjectDefinition::SetInstancePropertyValue");
         ComposerTypeDefinitionsHelper::SetInstancePropertyValue(
             inCore, m_Instance, inParent.m_TypeProp, ComposerObjectTypes::Convert(TEnumType));
     }
     void TypedDerive(IDataCore &inCore,
                      const SComposerBaseObjectDefinition<ComposerObjectTypes::Typed> &inParent)
     {
-        UICDM_LOG_FUNCTION("SComposerBaseObjectDefinition::TypedDerive");
+        QT3DSDM_LOG_FUNCTION("SComposerBaseObjectDefinition::TypedDerive");
         Derive(inCore, inParent);
         SetType(inCore, inParent);
     }
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h
index 607e43b1..37aebd88 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataCore.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMDATACOREH
-#define UICDMDATACOREH
+#ifndef QT3DSDM_DATACORE_H
+#define QT3DSDM_DATACORE_H
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMPropertyDefinition.h"
 #include "HandleSystemBase.h"
@@ -182,7 +182,7 @@ public:
     /**
      *	Return the property definition that corresponds to a given property value.
      */
-    virtual const SUICDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const = 0;
+    virtual const Qt3DSDMPropertyDefinition &GetProperty(Qt3DSDMPropertyHandle inProperty) const = 0;
     /**
      *	Return the properties specific to this instance, not including properties
      *	gained by derivation
@@ -202,7 +202,7 @@ public:
     virtual void CopyInstanceProperties(Qt3DSDMInstanceHandle inSrcInstance,
                                         Qt3DSDMInstanceHandle inDestInstance) = 0;
     /**
-     *	Removed cached intermediate values from the instance.  UICDM pull properties from the
+     *	Removed cached intermediate values from the instance.  DataModel pull properties from the
      *inheritance hierarchy chain
      *  up to the current instance when someone requests a property in order to make the next
      *request quicker.  This breaks
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h
index 797b2945..9a0bedf7 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMDataTypes.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMDATAH
-#define UICDMDATAH
+#ifndef QT3DSDM_DATA_H
+#define QT3DSDM_DATA_H
 
 #include <memory>
 #include <functional>
@@ -51,23 +51,23 @@
 namespace qt3dsdm {
 
 typedef const wchar_t *TCharPtr;
-struct SUICDMStr : public eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType>
+struct Qt3DSDMStr : public eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType>
 {
     typedef qt3ds::foundation::TWCharEASTLConverter::TCharType TCharType;
     typedef eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType> TStrType;
-    SUICDMStr() {}
-    SUICDMStr(const wchar_t *inStr)
+    Qt3DSDMStr() {}
+    Qt3DSDMStr(const wchar_t *inStr)
         : TStrType(qt3ds::NVUnionCast<const TCharType *>(inStr))
     {
     }
-    SUICDMStr(const TStrType &inOther)
+    Qt3DSDMStr(const TStrType &inOther)
         : TStrType(inOther)
     {
     }
 
     const wchar_t *wide_str() const { return reinterpret_cast<const wchar_t *>(c_str()); }
-    bool operator==(const SUICDMStr &inOther) const { return TStrType::compare(inOther) == 0; }
-    bool operator!=(const SUICDMStr &inOther) const { return TStrType::compare(inOther) != 0; }
+    bool operator==(const Qt3DSDMStr &inOther) const { return TStrType::compare(inOther) == 0; }
+    bool operator!=(const Qt3DSDMStr &inOther) const { return TStrType::compare(inOther) != 0; }
     bool operator==(const wchar_t *inOther) const
     {
         return TStrType::compare(reinterpret_cast<const TCharType *>(inOther)) == 0;
@@ -106,7 +106,7 @@ struct SUICDMStr : public eastl::basic_string<qt3ds::foundation::TWCharEASTLConv
     {
         return TStrType::rfind(p, position);
     }
-    SUICDMStr replace(size_type position, size_type length, const wchar_t *inNewStr)
+    Qt3DSDMStr replace(size_type position, size_type length, const wchar_t *inNewStr)
     {
         return TStrType::replace(position, length, reinterpret_cast<const TCharType *>(inNewStr));
     }
@@ -116,11 +116,11 @@ struct SUICDMStr : public eastl::basic_string<qt3ds::foundation::TWCharEASTLConv
     {
         TStrType::append(reinterpret_cast<const TCharType *>(p), position, n);
     }
-    void append(const SUICDMStr &p) { TStrType::append(p); }
+    void append(const Qt3DSDMStr &p) { TStrType::append(p); }
     void assign(const wchar_t *p) { TStrType::assign(reinterpret_cast<const TCharType *>(p)); }
-    void assign(const SUICDMStr &p) { TStrType::assign(p); }
+    void assign(const Qt3DSDMStr &p) { TStrType::assign(p); }
 };
-typedef SUICDMStr TCharStr;
+typedef Qt3DSDMStr TCharStr;
 typedef std::vector<wchar_t> TCharList;
 typedef eastl::vector<TCharStr> TCharStrList;
 typedef std::map<TCharStr, int> TCharStrIntMap;
@@ -578,18 +578,18 @@ typedef qt3ds::foundation::
         TObjRefUnionType;
 
 template <typename TDataType>
-struct SUICDMGetter
+struct Qt3DSDMGetter
 {
 };
 
 template <typename TRetType, typename TDataType>
 TRetType get(const TDataType &inType)
 {
-    return SUICDMGetter<TDataType>().template doGet<TRetType>(inType);
+    return Qt3DSDMGetter<TDataType>().template doGet<TRetType>(inType);
 }
 
 template <>
-struct SUICDMGetter<TObjRefUnionType>
+struct Qt3DSDMGetter<TObjRefUnionType>
 {
     template <typename TRetType>
     TRetType doGet(const TObjRefUnionType &inValue)
@@ -714,7 +714,7 @@ typedef qt3ds::foundation::
         TStringOrIntUnionType;
 
 template <>
-struct SUICDMGetter<TStringOrIntUnionType>
+struct Qt3DSDMGetter<TStringOrIntUnionType>
 {
     template <typename TRetType>
     TRetType doGet(const TStringOrIntUnionType &inValue)
@@ -792,14 +792,14 @@ struct DataModelDataType {
 class IStringTable;
 
 template <typename TDataType>
-struct SUICDMValueTyper
+struct Qt3DSDMValueTyper
 {
 };
 
 template <typename TDataType>
 inline DataModelDataType::Value GetValueType(const TDataType &inValue)
 {
-    return SUICDMValueTyper<TDataType>().Get(inValue);
+    return Qt3DSDMValueTyper<TDataType>().Get(inValue);
 }
 
 template <typename TDataType>
@@ -813,28 +813,28 @@ inline bool SetDefault(DataModelDataType::Value inDataType, TDataType &outValue)
     return SDefaulter<TDataType>().SetDefault(inDataType, outValue);
 }
 
-typedef void (*TUICDMDebugLogFunction)(const char *message);
+typedef void (*Qt3DSDMDebugLogFunction)(const char *message);
 // UICDMSimpleDataCore.cpp
-extern TUICDMDebugLogFunction g_UICDMDebugLogger;
+extern Qt3DSDMDebugLogFunction g_DataModelDebugLogger;
 
-#define UICDM_DEBUG_LOG(msg)                                                                       \
+#define QT3DSDM_DEBUG_LOG(msg)                                                                       \
     {                                                                                              \
-        if (g_UICDMDebugLogger) {                                                                  \
-            g_UICDMDebugLogger(msg);                                                               \
+        if (g_DataModelDebugLogger) {                                                                  \
+            g_DataModelDebugLogger(msg);                                                               \
         }                                                                                          \
     }
-struct SUICDMLogScope
+struct Qt3DSDMLogScope
 {
     const char *m_EndMessage;
-    SUICDMLogScope(const char *inStartMessage, const char *inEndMessage)
+    Qt3DSDMLogScope(const char *inStartMessage, const char *inEndMessage)
         : m_EndMessage(inEndMessage)
     {
-        UICDM_DEBUG_LOG(inStartMessage);
+        QT3DSDM_DEBUG_LOG(inStartMessage);
     }
-    ~SUICDMLogScope() { UICDM_DEBUG_LOG(m_EndMessage); }
+    ~Qt3DSDMLogScope() { QT3DSDM_DEBUG_LOG(m_EndMessage); }
 };
 
-#define UICDM_LOG_FUNCTION(fnname) SUICDMLogScope __fn_scope(fnname " Enter", fnname " Leave");
+#define QT3DSDM_LOG_FUNCTION(fnname) Qt3DSDMLogScope __fn_scope(fnname " Enter", fnname " Leave");
 }
 
 #endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h
index 7534595f..77ea7bf7 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMErrors.h
@@ -27,15 +27,15 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMERRORSH
-#define UICDMERRORSH
+#ifndef QT3DSDM_ERRORS_H
+#define QT3DSDM_ERRORS_H
 #include "Qt3DSDMWindowsCompatibility.h"
 
 namespace qt3dsdm {
-class UICDMError : public std::exception
+class Qt3DSDMError : public std::exception
 {
 public:
-    UICDMError(const wchar_t *inMessage)
+    Qt3DSDMError(const wchar_t *inMessage)
         : std::exception()
     {
         wcscpy_s(m_Message, inMessage);
@@ -43,266 +43,266 @@ public:
     wchar_t m_Message[1024];
 };
 
-class HandleExists : public UICDMError
+class HandleExists : public Qt3DSDMError
 {
 public:
     HandleExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class PropertyNotFound : public UICDMError
+class PropertyNotFound : public Qt3DSDMError
 {
 public:
     PropertyNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class PropertyExists : public UICDMError
+class PropertyExists : public Qt3DSDMError
 {
 public:
     PropertyExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class DuplicateInstanceName : public UICDMError
+class DuplicateInstanceName : public Qt3DSDMError
 {
 public:
     DuplicateInstanceName(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class InstanceNotFound : public UICDMError
+class InstanceNotFound : public Qt3DSDMError
 {
 public:
     InstanceNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class ValueTypeError : public UICDMError
+class ValueTypeError : public Qt3DSDMError
 {
 public:
     ValueTypeError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SerializationError : public UICDMError
+class SerializationError : public Qt3DSDMError
 {
 public:
     SerializationError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideNotFound : public UICDMError
+class SlideNotFound : public Qt3DSDMError
 {
 public:
     SlideNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideExists : public UICDMError
+class SlideExists : public Qt3DSDMError
 {
 public:
     SlideExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideDerivationError : public UICDMError
+class SlideDerivationError : public Qt3DSDMError
 {
 public:
     SlideDerivationError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideChildNotFoundError : public UICDMError
+class SlideChildNotFoundError : public Qt3DSDMError
 {
 public:
     SlideChildNotFoundError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideGraphNotFound : public UICDMError
+class SlideGraphNotFound : public Qt3DSDMError
 {
 public:
     SlideGraphNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class SlideGraphExists : public UICDMError
+class SlideGraphExists : public Qt3DSDMError
 {
 public:
     SlideGraphExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class PropertyLinkError : public UICDMError
+class PropertyLinkError : public Qt3DSDMError
 {
 public:
     PropertyLinkError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class RearrangeSlideArgumentsMustNotBeZero : public UICDMError
+class RearrangeSlideArgumentsMustNotBeZero : public Qt3DSDMError
 {
 public:
     RearrangeSlideArgumentsMustNotBeZero(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AnimationNotFound : public UICDMError
+class AnimationNotFound : public Qt3DSDMError
 {
 public:
     AnimationNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AnimationExists : public UICDMError
+class AnimationExists : public Qt3DSDMError
 {
 public:
     AnimationExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AnimationKeyframeTypeError : public UICDMError
+class AnimationKeyframeTypeError : public Qt3DSDMError
 {
 public:
     AnimationKeyframeTypeError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AnimationKeyframeNotFound : public UICDMError
+class AnimationKeyframeNotFound : public Qt3DSDMError
 {
 public:
     AnimationKeyframeNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AnimationEvaluationError : public UICDMError
+class AnimationEvaluationError : public Qt3DSDMError
 {
 public:
     AnimationEvaluationError(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class ActionNotFound : public UICDMError
+class ActionNotFound : public Qt3DSDMError
 {
 public:
     ActionNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class ActionExists : public UICDMError
+class ActionExists : public Qt3DSDMError
 {
 public:
     ActionExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class HandlerArgumentNotFound : public UICDMError
+class HandlerArgumentNotFound : public Qt3DSDMError
 {
 public:
     HandlerArgumentNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class HandlerArgumentExists : public UICDMError
+class HandlerArgumentExists : public Qt3DSDMError
 {
 public:
     HandlerArgumentExists(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class CustomPropertyNotFound : public UICDMError
+class CustomPropertyNotFound : public Qt3DSDMError
 {
 public:
     CustomPropertyNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class CustomEventNotFound : public UICDMError
+class CustomEventNotFound : public Qt3DSDMError
 {
 public:
     CustomEventNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class CustomHandlerNotFound : public UICDMError
+class CustomHandlerNotFound : public Qt3DSDMError
 {
 public:
     CustomHandlerNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class CustomHandlerParamNotFound : public UICDMError
+class CustomHandlerParamNotFound : public Qt3DSDMError
 {
 public:
     CustomHandlerParamNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 
-class AttributeTypeNotFound : public UICDMError
+class AttributeTypeNotFound : public Qt3DSDMError
 {
 public:
     AttributeTypeNotFound(const wchar_t *inMessage)
-        : UICDMError(inMessage)
+        : Qt3DSDMError(inMessage)
     {
     }
 };
 }
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp
index 86e78dc0..f6430914 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.cpp
@@ -135,7 +135,7 @@ struct SGuideSystem : public IGuideSystem
                     std::bind(&SGuideSystem::SignalGuideModified, this, theHdlValue, oldValue));
             }
         }
-        if (AreUICDMSignalsEnabled())
+        if (AreDataModelSignalsEnabled())
             m_GuideModifiedImmediate(theHdlValue, info);
     }
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h
index 116e6041..0362abff 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMGuides.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMGUIDESH
-#define UICDMGUIDESH
+#ifndef QT3DSDM_GUIDES_H
+#define QT3DSDM_GUIDES_H
 #include "Qt3DSDMDataTypes.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "Qt3DSDMSignals.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
index 3d95915e..05867a14 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMHANDLESH
-#define UICDMHANDLESH
+#ifndef QT3DSDM_HANDLES_H
+#define QT3DSDM_HANDLES_H
 
 #include <QMetaType>
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
index 7f840686..8b0ff267 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
@@ -193,49 +193,49 @@ bool WStrOps<HandlerArgumentType::Value>::StrTo(const wchar_t *buffer, HandlerAr
 #define QT3DS_WCHAR_T_StringListOrInt L"StringListOrInt"
 #define QT3DS_WCHAR_T_Scale L"Scale"
 
-#define ITERATE_UICDM_COMPLETE_TYPES                                                               \
-    HANDLE_UIDM_COMPLETE_NONE_TYPE                                                                 \
-    HANDLE_UIDM_COMPLETE_TYPE(StringList, StringList, DataModelDataType::String)                                      \
-    HANDLE_UIDM_COMPLETE_TYPE(FloatRange, Range, DataModelDataType::Float)                                            \
-    HANDLE_UIDM_COMPLETE_TYPE(LongRange, Range, DataModelDataType::Long)                                              \
-    HANDLE_UIDM_COMPLETE_TYPE(Float, None, DataModelDataType::Float)                                                  \
-    HANDLE_UIDM_COMPLETE_TYPE(Long, None, DataModelDataType::Long)                                                    \
-    HANDLE_UIDM_COMPLETE_TYPE(Float2, None, DataModelDataType::Float2)                                                \
-    HANDLE_UIDM_COMPLETE_TYPE(Vector, None, DataModelDataType::Float3)                                                \
-    HANDLE_UIDM_COMPLETE_TYPE(Scale, None, DataModelDataType::Float3)                                                 \
-    HANDLE_UIDM_COMPLETE_TYPE(Rotation, Rotation, DataModelDataType::Float3)                                          \
-    HANDLE_UIDM_COMPLETE_TYPE(Color, Color, DataModelDataType::Float3)                                                \
-    HANDLE_UIDM_COMPLETE_TYPE(Boolean, None, DataModelDataType::Bool)                                                 \
-    HANDLE_UIDM_COMPLETE_TYPE(Slide, None, DataModelDataType::String)                                                 \
-    HANDLE_UIDM_COMPLETE_TYPE(Font, Font, DataModelDataType::String)                                                  \
-    HANDLE_UIDM_COMPLETE_TYPE(FontSize, FontSize, DataModelDataType::Float)                                           \
-    HANDLE_UIDM_COMPLETE_TYPE(String, None, DataModelDataType::String)                                                \
-    HANDLE_UIDM_COMPLETE_TYPE(MultiLineString, MultiLine, DataModelDataType::String)                                  \
-    HANDLE_UIDM_COMPLETE_TYPE(ObjectRef, ObjectRef, DataModelDataType::ObjectRef)                                     \
-    HANDLE_UIDM_COMPLETE_TYPE(Image, Image, DataModelDataType::Long4)                                                 \
-    HANDLE_UIDM_COMPLETE_TYPE(Mesh, Mesh, DataModelDataType::String)                                                  \
-    HANDLE_UIDM_COMPLETE_TYPE(Import, Import, DataModelDataType::String)                                              \
-    HANDLE_UIDM_COMPLETE_TYPE(Texture, Texture, DataModelDataType::String)                                            \
-    HANDLE_UIDM_COMPLETE_TYPE(Image2D, Texture, DataModelDataType::String)                                            \
-    HANDLE_UIDM_COMPLETE_TYPE(Buffer, Texture, DataModelDataType::String)                                             \
-    HANDLE_UIDM_COMPLETE_TYPE(Guid, None, DataModelDataType::Long4)                                                   \
-    HANDLE_UIDM_COMPLETE_TYPE(StringListOrInt, StringList, DataModelDataType::StringOrInt)                            \
-    HANDLE_UIDM_COMPLETE_TYPE(Renderable, Renderable, DataModelDataType::String)                                      \
-    HANDLE_UIDM_COMPLETE_TYPE(PathBuffer, PathBuffer, DataModelDataType::String)                                      \
-    HANDLE_UIDM_COMPLETE_TYPE(ShadowMapResolution, ShadowMapResolution, DataModelDataType::Long)
+#define ITERATE_QT3DSDM_COMPLETE_TYPES                                                               \
+    HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                                 \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(StringList, StringList, DataModelDataType::String)                                      \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(FloatRange, Range, DataModelDataType::Float)                                            \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(LongRange, Range, DataModelDataType::Long)                                              \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Float, None, DataModelDataType::Float)                                                  \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Long, None, DataModelDataType::Long)                                                    \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Float2, None, DataModelDataType::Float2)                                                \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Vector, None, DataModelDataType::Float3)                                                \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Scale, None, DataModelDataType::Float3)                                                 \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Rotation, Rotation, DataModelDataType::Float3)                                          \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Color, Color, DataModelDataType::Float3)                                                \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Boolean, None, DataModelDataType::Bool)                                                 \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Slide, None, DataModelDataType::String)                                                 \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Font, Font, DataModelDataType::String)                                                  \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(FontSize, FontSize, DataModelDataType::Float)                                           \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(String, None, DataModelDataType::String)                                                \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(MultiLineString, MultiLine, DataModelDataType::String)                                  \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(ObjectRef, ObjectRef, DataModelDataType::ObjectRef)                                     \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Image, Image, DataModelDataType::Long4)                                                 \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Mesh, Mesh, DataModelDataType::String)                                                  \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Import, Import, DataModelDataType::String)                                              \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Texture, Texture, DataModelDataType::String)                                            \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Image2D, Texture, DataModelDataType::String)                                            \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Buffer, Texture, DataModelDataType::String)                                             \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Guid, None, DataModelDataType::Long4)                                                   \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(StringListOrInt, StringList, DataModelDataType::StringOrInt)                            \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(Renderable, Renderable, DataModelDataType::String)                                      \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(PathBuffer, PathBuffer, DataModelDataType::String)                                      \
+    HANDLE_QT3DSDM_COMPLETE_TYPE(ShadowMapResolution, ShadowMapResolution, DataModelDataType::Long)
 
 DataModelDataType::Value CompleteMetaDataType::ToDataType(CompleteMetaDataType::Enum inCompleteType)
 {
     switch (inCompleteType) {
-#define HANDLE_UIDM_COMPLETE_NONE_TYPE                                                             \
+#define HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                             \
     case Unknown:                                                                                  \
     return DataModelDataType::None;
-#define HANDLE_UIDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
+#define HANDLE_QT3DSDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
     case name:                                                                                     \
     return dtype;
-    ITERATE_UICDM_COMPLETE_TYPES
-        #undef HANDLE_UIDM_COMPLETE_NONE_TYPE
-        #undef HANDLE_UIDM_COMPLETE_TYPE
+    ITERATE_QT3DSDM_COMPLETE_TYPES
+        #undef HANDLE_QT3DSDM_COMPLETE_NONE_TYPE
+        #undef HANDLE_QT3DSDM_COMPLETE_TYPE
     }
     QT3DS_ASSERT(false);
     return DataModelDataType::None;
@@ -245,15 +245,15 @@ AdditionalMetaDataType::Value
 CompleteMetaDataType::ToAdditionalType(CompleteMetaDataType::Enum inCompleteType)
 {
     switch (inCompleteType) {
-#define HANDLE_UIDM_COMPLETE_NONE_TYPE                                                             \
+#define HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                             \
     case Unknown:                                                                                  \
     return AdditionalMetaDataType::None;
-#define HANDLE_UIDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
+#define HANDLE_QT3DSDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
     case name:                                                                                     \
     return AdditionalMetaDataType::addtype;
-    ITERATE_UICDM_COMPLETE_TYPES
-        #undef HANDLE_UIDM_COMPLETE_NONE_TYPE
-        #undef HANDLE_UIDM_COMPLETE_TYPE
+    ITERATE_QT3DSDM_COMPLETE_TYPES
+        #undef HANDLE_QT3DSDM_COMPLETE_NONE_TYPE
+        #undef HANDLE_QT3DSDM_COMPLETE_TYPE
     }
     QT3DS_ASSERT(false);
     return AdditionalMetaDataType::None;
@@ -263,17 +263,17 @@ CompleteMetaDataType::Enum
 CompleteMetaDataType::ToCompleteType(DataModelDataType::Value inDataType,
                                      AdditionalMetaDataType::Value inAdditionalType)
 {
-#define HANDLE_UIDM_COMPLETE_NONE_TYPE                                                             \
+#define HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                             \
     if (inDataType == DataModelDataType::None)                                                      \
     return CompleteMetaDataType::Unknown;
-#define HANDLE_UIDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
+#define HANDLE_QT3DSDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
     if (inDataType == dtype                                                    \
     && inAdditionalType == AdditionalMetaDataType::addtype)                                    \
     return CompleteMetaDataType::name;
 
-    ITERATE_UICDM_COMPLETE_TYPES
-        #undef HANDLE_UIDM_COMPLETE_NONE_TYPE
-        #undef HANDLE_UIDM_COMPLETE_TYPE
+    ITERATE_QT3DSDM_COMPLETE_TYPES
+        #undef HANDLE_QT3DSDM_COMPLETE_NONE_TYPE
+        #undef HANDLE_QT3DSDM_COMPLETE_TYPE
             QT3DS_ASSERT(false);
     return CompleteMetaDataType::Unknown;
 }
@@ -282,18 +282,18 @@ QT3DSU32 WStrOps<CompleteMetaDataType::Enum>::ToStr(CompleteMetaDataType::Enum i
                                                     NVDataRef<wchar_t> buffer)
 {
     switch (item) {
-#define HANDLE_UIDM_COMPLETE_NONE_TYPE                                                             \
+#define HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                             \
     case CompleteMetaDataType::Unknown:                                                            \
     wcscpy_s(buffer.begin(), buffer.size(), L"None");                                          \
     return 1;
-#define HANDLE_UIDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
+#define HANDLE_QT3DSDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
     case CompleteMetaDataType::name:                                                               \
     wcscpy_s(buffer.begin(), buffer.size(), QT3DS_WCHAR_T_##name);                               \
     return 1;
 
-    ITERATE_UICDM_COMPLETE_TYPES
-        #undef HANDLE_UIDM_COMPLETE_NONE_TYPE
-        #undef HANDLE_UIDM_COMPLETE_TYPE
+    ITERATE_QT3DSDM_COMPLETE_TYPES
+        #undef HANDLE_QT3DSDM_COMPLETE_NONE_TYPE
+        #undef HANDLE_QT3DSDM_COMPLETE_TYPE
     }
     QT3DS_ASSERT(false);
     return 0;
@@ -302,20 +302,20 @@ bool WStrOps<CompleteMetaDataType::Enum>::StrTo(const wchar_t *buffer,
                                                 CompleteMetaDataType::Enum &item)
 {
 
-#define HANDLE_UIDM_COMPLETE_NONE_TYPE                                                             \
+#define HANDLE_QT3DSDM_COMPLETE_NONE_TYPE                                                             \
     if (AreEqual(buffer, L"None")) {                                                               \
     item = CompleteMetaDataType::Unknown;                                                      \
     return true;                                                                               \
 }
-#define HANDLE_UIDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
+#define HANDLE_QT3DSDM_COMPLETE_TYPE(name, addtype, dtype)                                            \
     if (AreEqual(buffer, QT3DS_WCHAR_T_##name)) {                                                    \
     item = CompleteMetaDataType::name;                                                         \
     return true;                                                                               \
 }
 
-    ITERATE_UICDM_COMPLETE_TYPES
-        #undef HANDLE_UIDM_COMPLETE_NONE_TYPE
-        #undef HANDLE_UIDM_COMPLETE_TYPE
+    ITERATE_QT3DSDM_COMPLETE_TYPES
+        #undef HANDLE_QT3DSDM_COMPLETE_NONE_TYPE
+        #undef HANDLE_QT3DSDM_COMPLETE_TYPE
             return false;
 }
 }
@@ -1096,10 +1096,10 @@ struct SNewMetaDataImpl : public IMetaData
     void SetInstanceAsCanonical(Qt3DSDMInstanceHandle inInstance, TStrType inTypename) override
     {
         const wchar_t *theTypename(Intern(inTypename));
-        if (g_UICDMDebugLogger)
-            g_UICDMDebugLogger("IMetaData::SetInstanceAsCanonical Enter");
-        if (g_UICDMDebugLogger)
-            g_UICDMDebugLogger(GetStringTable().GetNarrowStr(inTypename.wide_str()));
+        if (g_DataModelDebugLogger)
+            g_DataModelDebugLogger("IMetaData::SetInstanceAsCanonical Enter");
+        if (g_DataModelDebugLogger)
+            g_DataModelDebugLogger(GetStringTable().GetNarrowStr(inTypename.wide_str()));
         m_CanonicalTypeToInstances.insert(make_pair(theTypename, inInstance));
         m_InstancesToCanonicalType.insert(make_pair(inInstance, theTypename));
         CreateHashMapInsertTransaction(__FILE__, __LINE__, m_Consumer,
@@ -1108,8 +1108,8 @@ struct SNewMetaDataImpl : public IMetaData
         CreateHashMapInsertTransaction(__FILE__, __LINE__, m_Consumer,
                                        make_pair(inInstance, theTypename),
                                        m_InstancesToCanonicalType);
-        if (g_UICDMDebugLogger)
-            g_UICDMDebugLogger("IMetaData::SetInstanceAsCanonical Leave");
+        if (g_DataModelDebugLogger)
+            g_DataModelDebugLogger("IMetaData::SetInstanceAsCanonical Leave");
     }
 
     Qt3DSDMInstanceHandle GetCanonicalInstanceForType(TStrType inTypename) override
@@ -1311,7 +1311,7 @@ struct SNewMetaDataImpl : public IMetaData
                 m_DataCore->GetAggregateInstancePropertyByName(newInfo.m_Instance, newInfo.m_Name);
         // Ensure the types match.
         if (theExistingProperty.Valid()) {
-            SUICDMPropertyDefinition theDefinition(m_DataCore->GetProperty(theExistingProperty));
+            Qt3DSDMPropertyDefinition theDefinition(m_DataCore->GetProperty(theExistingProperty));
             if (theDefinition.m_Name != newInfo.m_Name
                     || theDefinition.m_Type != newInfo.GetDataType()) {
                 m_DataCore->RemoveProperty(theExistingProperty);
@@ -1433,7 +1433,7 @@ struct SNewMetaDataImpl : public IMetaData
     Qt3DSDMMetaDataPropertyHandle GetMetaDataProperty(Qt3DSDMInstanceHandle inInstance,
                                                              Qt3DSDMPropertyHandle inProperty) override
     {
-        SUICDMPropertyDefinition propDef(m_DataCore->GetProperty(inProperty));
+        Qt3DSDMPropertyDefinition propDef(m_DataCore->GetProperty(inProperty));
         return GetMetaDataProperty(inInstance, propDef.m_Name);
     }
     // Sets the value in the data core
@@ -1540,7 +1540,7 @@ struct SNewMetaDataImpl : public IMetaData
             return false;
         }
 
-        SUICDMPropertyDefinition theProp(m_DataCore->GetProperty(inFilter.m_FilterProperty));
+        Qt3DSDMPropertyDefinition theProp(m_DataCore->GetProperty(inFilter.m_FilterProperty));
         Qt3DSDMPropertyHandle propCheck =
                 m_DataCore->GetAggregateInstancePropertyByName(infoPtr->m_Instance, theProp.m_Name);
         if (propCheck != inFilter.m_FilterProperty) {
@@ -2278,7 +2278,7 @@ struct SNewMetaDataImpl : public IMetaData
         NVConstDataRef<SPropertyFilterInfo> theInfos = GetMetaDataPropertyFilters(inHandle);
         for (QT3DSU32 idx = 0, end = theInfos.size(); idx < end; ++idx) {
             const SPropertyFilterInfo &theInfo(theInfos[idx]);
-            SUICDMPropertyDefinition thePropertyInfo(
+            Qt3DSDMPropertyDefinition thePropertyInfo(
                         m_DataCore->GetProperty(theInfo.m_FilterProperty));
 
             const wchar_t *theFilterName;
@@ -2321,7 +2321,7 @@ struct SNewMetaDataImpl : public IMetaData
                     QT3DS_ASSERT(false);
                     return;
                 }
-                SUICDMPropertyDefinition thePropDef(m_DataCore->GetProperty(theProperty));
+                Qt3DSDMPropertyDefinition thePropDef(m_DataCore->GetProperty(theProperty));
 
                 SPropertyFilterInfo theInfo;
                 theInfo.m_FilterType = PropertyFilterTypes::ShowIfEqual;
@@ -2337,7 +2337,7 @@ struct SNewMetaDataImpl : public IMetaData
                     QT3DS_ASSERT(false);
                     return;
                 }
-                SUICDMPropertyDefinition thePropDef(m_DataCore->GetProperty(theProperty));
+                Qt3DSDMPropertyDefinition thePropDef(m_DataCore->GetProperty(theProperty));
 
                 SPropertyFilterInfo theInfo;
                 theInfo.m_FilterType = PropertyFilterTypes::HideIfEqual;
@@ -3039,7 +3039,7 @@ struct SNewMetaDataImpl : public IMetaData
         shaderPrefix.append(";\n");
     }
     static inline void AppendShaderCode(
-            const char8_t *inCode, SUICDMStr &ioStr,
+            const char8_t *inCode, Qt3DSDMStr &ioStr,
             eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType> &inConvertBuffer)
     {
         qt3ds::foundation::ConvertUTF(inCode, 0, inConvertBuffer);
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h
index e83f9fd5..3d5d0828 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.h
@@ -98,8 +98,8 @@ struct SMetaDataLoadWarning
 };
 
 /**
- *	Meta data class to hold meta data descriptions of the objects used in UICDM.
- *	A user-visible type in UICDM (things in the timeline) has a specific set of metadata,
+ *	Meta data class to hold meta data descriptions of the objects used in DataModel.
+ *	A user-visible type in DataModel (things in the timeline) has a specific set of metadata,
  *	the type can have properties, events, handlers, and references.
  *
  *	Properties are exactly what they sound like.  Events are messages the object can send,
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h
index c917647b..a699f843 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaDataValue.h
@@ -172,13 +172,13 @@ struct SMetaDataData
     : public qt3ds::foundation::
           DiscriminatedUnion<qt3ds::foundation::
                                  DiscriminatedUnionGenericBase<SMetaDataValueTraits,
-                                                               SUICDMDataTypeUnionTraits::
+                                                               Qt3DSDMDataTypeUnionTraits::
                                                                    TBufferSize>,
                              SMetaDataValueTraits::TBufferSize>
 {
     typedef qt3ds::foundation::
         DiscriminatedUnion<qt3ds::foundation::DiscriminatedUnionGenericBase<SMetaDataValueTraits,
-                                                                         SUICDMDataTypeUnionTraits::
+                                                                         Qt3DSDMDataTypeUnionTraits::
                                                                              TBufferSize>,
                            SMetaDataValueTraits::TBufferSize>
             TBase;
@@ -214,7 +214,7 @@ struct SMetaDataData
 };
 
 template <>
-struct SUICDMGetter<SMetaDataData>
+struct Qt3DSDMGetter<SMetaDataData>
 {
     template <typename TRetType>
     TRetType doGet(const SMetaDataData &inValue)
@@ -224,7 +224,7 @@ struct SUICDMGetter<SMetaDataData>
 };
 
 template <>
-struct SUICDMValueTyper<SMetaDataData>
+struct Qt3DSDMValueTyper<SMetaDataData>
 {
     AdditionalMetaDataType::Value Get(const SMetaDataData &inValue) { return inValue.getType(); }
 };
@@ -240,7 +240,7 @@ inline QStringList get<QStringList>(const qt3dsdm::SMetaDataData &inType)
         return result;
 
     auto list = qt3dsdm::get<qt3dsdm::TMetaDataStringList>(inType);
-    std::transform(list.begin(), list.end(), std::back_inserter(result), [](const SUICDMStr &s) {
+    std::transform(list.begin(), list.end(), std::back_inserter(result), [](const Qt3DSDMStr &s) {
         return QString::fromWCharArray(s.wide_str());
     });
     return result;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h
index 4ccd34e2..d324b539 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMPropertyDefinition.h
@@ -27,38 +27,38 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMPROPERTYDEFINITIONH
-#define UICDMPROPERTYDEFINITIONH
+#ifndef QT3DSDM_PROPERTY_DEFINITION_H
+#define QT3DSDM_PROPERTY_DEFINITION_H
 
 #include "Qt3DSDMDataTypes.h"
 
 namespace qt3dsdm {
 
-struct SUICDMPropertyDefinition
+struct Qt3DSDMPropertyDefinition
 {
     TCharStr m_Name;
     Qt3DSDMInstanceHandle m_Instance;
     DataModelDataType::Value m_Type;
 
-    SUICDMPropertyDefinition()
+    Qt3DSDMPropertyDefinition()
         : m_Type(DataModelDataType::None)
     {
     }
-    SUICDMPropertyDefinition(Qt3DSDMInstanceHandle inInstanceHandle, TCharPtr inName,
+    Qt3DSDMPropertyDefinition(Qt3DSDMInstanceHandle inInstanceHandle, TCharPtr inName,
                              DataModelDataType::Value inType)
         : m_Name(inName)
         , m_Instance(inInstanceHandle)
         , m_Type(inType)
     {
     }
-    SUICDMPropertyDefinition(const SUICDMPropertyDefinition &inOther)
+    Qt3DSDMPropertyDefinition(const Qt3DSDMPropertyDefinition &inOther)
         : m_Name(inOther.m_Name)
         , m_Instance(inOther.m_Instance)
         , m_Type(inOther.m_Type)
     {
     }
 
-    SUICDMPropertyDefinition &operator=(const SUICDMPropertyDefinition &inOther)
+    Qt3DSDMPropertyDefinition &operator=(const Qt3DSDMPropertyDefinition &inOther)
     {
         if (this != &inOther) {
             m_Name = inOther.m_Name;
@@ -69,7 +69,7 @@ struct SUICDMPropertyDefinition
     }
 };
 
-typedef std::vector<SUICDMPropertyDefinition> TPropertyDefinitionList;
+typedef std::vector<Qt3DSDMPropertyDefinition> TPropertyDefinitionList;
 }
 
 #endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h
index 8d22b8cd..9664566f 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructImpl.h
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSIGNALSTRUCTIMPLH
-#define UICDMSIGNALSTRUCTIMPLH
+#ifndef QT3DSDM_SIGNAL_STRUCT_IMPL_H
+#define QT3DSDM_SIGNAL_STRUCT_IMPL_H
 #include "Qt3DSDMSignalStructs.h"
 
-namespace UICDM {
+namespace qt3dsdm {
 
 struct SSignalDataStruct0
 {
@@ -65,7 +65,7 @@ struct SSignalDataStruct0
     }
 };
 
-#define UICDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT0(name)                                         \
+#define QT3DSDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT0(name)                                         \
     std::shared_ptr<ISignalConnection> Sig##name::AddListener(                                   \
         ISignalSystem &inSystem, void *inSender, std::function<void()> inHandler)                \
     {                                                                                              \
@@ -118,7 +118,7 @@ struct SSignalDataStruct1
     }
 };
 
-#define UICDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT1(name, d1)                                     \
+#define QT3DSDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT1(name, d1)                                     \
     std::shared_ptr<ISignalConnection> Sig##name::AddListener(                                   \
         ISignalSystem &inSystem, void *inSender, std::function<void(d1)> inHandler)              \
     {                                                                                              \
@@ -174,7 +174,7 @@ struct SSignalDataStruct2
     }
 };
 
-#define UICDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT2(name, d1, d2)                                 \
+#define QT3DSDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT2(name, d1, d2)                                 \
     std::shared_ptr<ISignalConnection> Sig##name::AddListener(                                   \
         ISignalSystem &inSystem, void *inSender, std::function<void(d1, d2)> inHandler)          \
     {                                                                                              \
@@ -230,7 +230,7 @@ struct SSignalDataStruct3
     }
 };
 
-#define UICDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT3(name, d1, d2, d3)                             \
+#define QT3DSDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT3(name, d1, d2, d3)                             \
     std::shared_ptr<ISignalConnection> Sig##name::AddListener(                                   \
         ISignalSystem &inSystem, void *inSender, std::function<void(d1, d2, d3)> inHandler)      \
     {                                                                                              \
@@ -289,7 +289,7 @@ struct SSignalDataStruct4
     }
 };
 
-#define UICDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT4(name, d1, d2, d3, d4)                         \
+#define QT3DSDM_SIGNALS_DEFINE_SPECIFIC_SIGNAL_STRUCT4(name, d1, d2, d3, d4)                         \
     std::shared_ptr<ISignalConnection> Sig##name::AddListener(                                   \
         ISignalSystem &inSystem, void *inSender, std::function<void(d1, d2, d3, d4)> inHandler)  \
     {                                                                                              \
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h
index 82497f5b..86c09fd4 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalStructs.h
@@ -27,16 +27,16 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSIGNALSTRUCTSH
-#define UICDMSIGNALSTRUCTSH
+#ifndef QT3DSDM_SIGNAL_STRUCTS_H
+#define QT3DSDM_SIGNAL_STRUCTS_H
 #include "Qt3DSDMSignalSystem.h"
 // Helper structs for signals of different arity.
-namespace UICDM {
+namespace qt3dsdm {
 // Helper defines to create static tables of signals
 // Macros with the same number of args but with 'declare' replaced by 'define
 // are available in UICDMSignalStructImpl.h.  You will need to place these somewhere but
 // they rely on std::bind so I don't place them here.
-#define UICDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT0(name)                                        \
+#define QT3DSDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT0(name)                                        \
     struct Sig##name                                                                               \
     {                                                                                              \
         static std::shared_ptr<ISignalConnection>                                                \
@@ -45,7 +45,7 @@ namespace UICDM {
     };
 
 // Helper defines to create static tables of signals
-#define UICDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT1(name, d1)                                    \
+#define QT3DSDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT1(name, d1)                                    \
     struct Sig##name                                                                               \
     {                                                                                              \
         static std::shared_ptr<ISignalConnection>                                                \
@@ -54,7 +54,7 @@ namespace UICDM {
     };
 
 // Helper defines to create static tables of signals
-#define UICDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT2(name, d1, d2)                                \
+#define QT3DSDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT2(name, d1, d2)                                \
     struct Sig##name                                                                               \
     {                                                                                              \
         static std::shared_ptr<ISignalConnection>                                                \
@@ -64,7 +64,7 @@ namespace UICDM {
     };
 
 // Helper defines to create static tables of signals
-#define UICDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT3(name, d1, d2, d3)                            \
+#define QT3DSDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT3(name, d1, d2, d3)                            \
     struct Sig##name                                                                               \
     {                                                                                              \
         static std::shared_ptr<ISignalConnection>                                                \
@@ -75,7 +75,7 @@ namespace UICDM {
     };
 
 // Helper defines to create static tables of signals
-#define UICDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT4(name, d1, d2, d3, d4)                        \
+#define QT3DSDM_SIGNALS_DECLARE_SPECIFIC_SIGNAL_STRUCT4(name, d1, d2, d3, d4)                        \
     struct Sig##name                                                                               \
     {                                                                                              \
         static std::shared_ptr<ISignalConnection>                                                \
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h
index 2a27d81f..cd80010d 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignalSystem.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSIGNALSYSTEMH
-#define UICDMSIGNALSYSTEMH
+#ifndef QT3DSDM_SIGNAL_SYSTEM_H
+#define QT3DSDM_SIGNAL_SYSTEM_H
 #include <functional>
 #include "Qt3DSDMSignals.h"
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
index 489cd7c3..c69fb281 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSignals.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSIGNALSH
-#define UICDMSIGNALSH
+#ifndef QT3DSDM_SIGNALS_H
+#define QT3DSDM_SIGNALS_H
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMAnimation.h"
@@ -589,9 +589,9 @@ inline void MaybackCallbackInstancePropertyValue(Qt3DSDMInstanceHandle inInstanc
         inCallback(inInstance, inProperty);
 }
 
-void SetUICDMSignalsEnabled(bool inEnabled);
+void SetDataModelSignalsEnabled(bool inEnabled);
 // Defaults to true
-bool AreUICDMSignalsEnabled();
+bool AreDataModelSignalsEnabled();
 }
 
 #endif
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
index 7f54c203..6d6fb4ce 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideCore.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSLIDECOREH
-#define UICDMSLIDECOREH
+#ifndef QT3DSDM_SLIDE_CORE_H
+#define QT3DSDM_SLIDE_CORE_H
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMDataTypes.h"
 #include "HandleSystemBase.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
index dcb5ba99..34c04e11 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlideGraphCore.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSLIDEGRAPHCOREH
-#define UICDMSLIDEGRAPHCOREH
+#ifndef QT3DSDM_SLIDE_GRAPH_CORE_H
+#define QT3DSDM_SLIDE_GRAPH_CORE_H
 
 #include "Qt3DSDMHandles.h"
 #include "HandleSystemBase.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
index 7396eb14..5a98f33b 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMSlides.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMSLIDESH
-#define UICDMSLIDESH
+#ifndef QT3DSDM_SLIDES_H
+#define QT3DSDM_SLIDES_H
 #include "Qt3DSDMHandles.h"
 #include "Qt3DSDMSlideCore.h"
 
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h
index 2e3c13c6..4f8453d1 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMStringTable.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTSTRINGTABLEH
-#define UICIMPORTSTRINGTABLEH
+#ifndef QT3DS_IMPORT_STRINGTABLE_H
+#define QT3DS_IMPORT_STRINGTABLE_H
 
 #include <string>
 #include <EABase/eabase.h>
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h
index 3c6959e5..ac43eaf0 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMTestOps.h
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMOPSH
-#define UICDMOPSH
+#ifndef QT3DSDM_OPS_H
+#define QT3DSDM_OPS_H
 
-namespace UICDM {
+namespace qt3dsdm {
 inline const TCharStr &GetPropertyName(const IDataCore &inModel, Qt3DSDMPropertyHandle inProperty)
 {
     return inModel.GetProperty(inProperty).m_Name;
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h
index 486c3d9a..f3d47d7b 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMTransactions.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMTRANSACTIONSH
-#define UICDMTRANSACTIONSH
+#ifndef QT3DSDM_TRANSACTIONS_H
+#define QT3DSDM_TRANSACTIONS_H
 #include "Qt3DSDMDataTypes.h"
 #include "StandardExtensions.h"
 #include <functional>
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h
index 0bb5b9df..d7301c2d 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMVALUEH
-#define UICDMVALUEH
+#ifndef QT3DSDM_VALUE_H
+#define QT3DSDM_VALUE_H
 #include "Qt3DSDMDataTypes.h"
 
 #include <QColor>
@@ -50,7 +50,7 @@ struct SEnumToDataTypeMap
 {
 };
 
-#define DEFINE_UICDM_DATA_TYPE_MAP(dtype, enumName)                                                \
+#define DEFINE_QT3DSDM_DATA_TYPE_MAP(dtype, enumName)                                                \
     template <>                                                                                    \
     struct SDataTypeToEnumMap<dtype>                                                               \
     {                                                                                              \
@@ -62,24 +62,24 @@ struct SEnumToDataTypeMap
         typedef dtype TDataType;                                                                   \
     };
 
-#define ITERATE_UICDM_DATA_TYPES                                                                   \
-    HANDLE_UICDM_DATA_TYPE(float, DataModelDataType::Float);                                        \
-    HANDLE_UICDM_DATA_TYPE(SFloat2, DataModelDataType::Float2);                                     \
-    HANDLE_UICDM_DATA_TYPE(SFloat3, DataModelDataType::Float3);                                     \
-    HANDLE_UICDM_DATA_TYPE(qt3ds::QT3DSI32, DataModelDataType::Long);                                          \
-    HANDLE_UICDM_DATA_TYPE(TDataStrPtr, DataModelDataType::String);                                 \
-    HANDLE_UICDM_DATA_TYPE(bool, DataModelDataType::Bool);                                          \
-    HANDLE_UICDM_DATA_TYPE(SLong4, DataModelDataType::Long4);                                       \
-    HANDLE_UICDM_DATA_TYPE(SStringRef, DataModelDataType::StringRef);                               \
-    HANDLE_UICDM_DATA_TYPE(SObjectRefType, DataModelDataType::ObjectRef);                           \
-    HANDLE_UICDM_DATA_TYPE(SStringOrInt, DataModelDataType::StringOrInt);                           \
-    HANDLE_UICDM_DATA_TYPE(TFloatList, DataModelDataType::FloatList);
-
-#define HANDLE_UICDM_DATA_TYPE(a, b) DEFINE_UICDM_DATA_TYPE_MAP(a, b)
-ITERATE_UICDM_DATA_TYPES
-#undef HANDLE_UICDM_DATA_TYPE
-
-struct SUICDMDataTypeUnionTraits
+#define ITERATE_QT3DSDM_DATA_TYPES                                                                   \
+    HANDLE_QT3DSDM_DATA_TYPE(float, DataModelDataType::Float);                                        \
+    HANDLE_QT3DSDM_DATA_TYPE(SFloat2, DataModelDataType::Float2);                                     \
+    HANDLE_QT3DSDM_DATA_TYPE(SFloat3, DataModelDataType::Float3);                                     \
+    HANDLE_QT3DSDM_DATA_TYPE(qt3ds::QT3DSI32, DataModelDataType::Long);                                          \
+    HANDLE_QT3DSDM_DATA_TYPE(TDataStrPtr, DataModelDataType::String);                                 \
+    HANDLE_QT3DSDM_DATA_TYPE(bool, DataModelDataType::Bool);                                          \
+    HANDLE_QT3DSDM_DATA_TYPE(SLong4, DataModelDataType::Long4);                                       \
+    HANDLE_QT3DSDM_DATA_TYPE(SStringRef, DataModelDataType::StringRef);                               \
+    HANDLE_QT3DSDM_DATA_TYPE(SObjectRefType, DataModelDataType::ObjectRef);                           \
+    HANDLE_QT3DSDM_DATA_TYPE(SStringOrInt, DataModelDataType::StringOrInt);                           \
+    HANDLE_QT3DSDM_DATA_TYPE(TFloatList, DataModelDataType::FloatList);
+
+#define HANDLE_QT3DSDM_DATA_TYPE(a, b) DEFINE_QT3DSDM_DATA_TYPE_MAP(a, b)
+ITERATE_QT3DSDM_DATA_TYPES
+#undef HANDLE_QT3DSDM_DATA_TYPE
+
+struct Qt3DSDMDataTypeUnionTraits
 {
     typedef DataModelDataType::Value TIdType;
 
@@ -99,11 +99,11 @@ struct SUICDMDataTypeUnionTraits
     static TRetType visit(char *inData, DataModelDataType::Value inType, TVisitorType inVisitor)
     {
         switch (inType) {
-#define HANDLE_UICDM_DATA_TYPE(dtype, enumType)                                                    \
+#define HANDLE_QT3DSDM_DATA_TYPE(dtype, enumType)                                                    \
     case enumType:                                                                                 \
         return inVisitor(*NVUnionCast<dtype *>(inData));
-            ITERATE_UICDM_DATA_TYPES
-#undef HANDLE_UICDM_DATA_TYPE
+            ITERATE_QT3DSDM_DATA_TYPES
+#undef HANDLE_QT3DSDM_DATA_TYPE
 
         default:
             QT3DS_ASSERT(false);
@@ -116,11 +116,11 @@ struct SUICDMDataTypeUnionTraits
     static TRetType visit(const char *inData, DataModelDataType::Value inType, TVisitorType inVisitor)
     {
         switch (inType) {
-#define HANDLE_UICDM_DATA_TYPE(dtype, enumType)                                                    \
+#define HANDLE_QT3DSDM_DATA_TYPE(dtype, enumType)                                                    \
     case enumType:                                                                                 \
         return inVisitor(*NVUnionCast<const dtype *>(inData));
-            ITERATE_UICDM_DATA_TYPES
-#undef HANDLE_UICDM_DATA_TYPE
+            ITERATE_QT3DSDM_DATA_TYPES
+#undef HANDLE_QT3DSDM_DATA_TYPE
 
         default:
             QT3DS_ASSERT(false);
@@ -132,9 +132,9 @@ struct SUICDMDataTypeUnionTraits
 
 typedef qt3ds::foundation::
     DiscriminatedUnion<qt3ds::foundation::
-                           DiscriminatedUnionGenericBase<SUICDMDataTypeUnionTraits,
-                                                         SUICDMDataTypeUnionTraits::TBufferSize>,
-                       SUICDMDataTypeUnionTraits::TBufferSize>
+                           DiscriminatedUnionGenericBase<Qt3DSDMDataTypeUnionTraits,
+                                                         Qt3DSDMDataTypeUnionTraits::TBufferSize>,
+                       Qt3DSDMDataTypeUnionTraits::TBufferSize>
         TValue;
 
 struct SValue : public TValue
@@ -169,7 +169,7 @@ struct SValue : public TValue
 typedef std::shared_ptr<SValue> SValuePtr;
 
 template <>
-struct SUICDMGetter<SValue>
+struct Qt3DSDMGetter<SValue>
 {
     template <typename TRetType>
     TRetType doGet(const SValue &inValue)
@@ -179,7 +179,7 @@ struct SUICDMGetter<SValue>
 };
 
 template <>
-struct SUICDMValueTyper<SValue>
+struct Qt3DSDMValueTyper<SValue>
 {
     DataModelDataType::Value Get(const SValue &inValue) { return inValue.getType(); }
 };
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h
index 81632d88..b1e1fb01 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOps.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMWSTROPSH
-#define UICDMWSTROPSH
+#ifndef QT3DSDM_WSTR_OPS_H
+#define QT3DSDM_WSTR_OPS_H
 namespace qt3dsdm {
 // Template base class so that we can convert items to and from wide string
 template <typename TDataType>
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
index 15dca3c8..5cf9b4c7 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTWSTROPSIMPLH
-#define UICIMPORTWSTROPSIMPLH
+#ifndef QT3DS_IMPORT_WSTR_OPS_IMPL_H
+#define QT3DS_IMPORT_WSTR_OPS_IMPL_H
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMWStrOps.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h
index 8a67d413..0a53c71c 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWindowsCompatibility.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICDMWINDOWSCOMPATIBILITYH
-#define UICDMWINDOWSCOMPATIBILITYH
+#ifndef QT3DSDM_WINDOWS_COMPATIBILITY_H
+#define QT3DSDM_WINDOWS_COMPATIBILITY_H
 #include "EABase/config/eaplatform.h"
 #include "EABase/eabase.h"
 #include <string>
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h
index 53b63bab..1a23d117 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMXML.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTXMLH
-#define UICIMPORTXMLH
+#ifndef QT3DS_IMPORT_XML_H
+#define QT3DS_IMPORT_XML_H
 #include "foundation/Qt3DS.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
 #include "Qt3DSDMDataTypes.h"
diff --git a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
index 90f028c0..d94d68bd 100644
--- a/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
+++ b/src/Authoring/QT3DSDM/Systems/SignalsImpl.cpp
@@ -40,24 +40,24 @@ using namespace std;
 using namespace boost::BOOST_SIGNALS_NAMESPACE;
 
 namespace {
-bool g_UICDMSignalsEnabled = true;
+bool g_DataModelSignalsEnabled = true;
 
 #define CHECK_SIGNALS_ENABLED()                                                                    \
     {                                                                                              \
-        if (g_UICDMSignalsEnabled == false)                                                        \
+        if (g_DataModelSignalsEnabled == false)                                                        \
             return;                                                                                \
     }
 }
 
 namespace qt3dsdm {
-void SetUICDMSignalsEnabled(bool inEnabled)
+void SetDataModelSignalsEnabled(bool inEnabled)
 {
-    g_UICDMSignalsEnabled = inEnabled;
+    g_DataModelSignalsEnabled = inEnabled;
 }
 // Defaults to true
-bool AreUICDMSignalsEnabled()
+bool AreDataModelSignalsEnabled()
 {
-    return g_UICDMSignalsEnabled;
+    return g_DataModelSignalsEnabled;
 }
 struct SBoostSignalConnection : public ISignalConnection
 {
diff --git a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp b/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
index 74f4c1a8..09f0159a 100644
--- a/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
+++ b/src/Authoring/QT3DSDM/Systems/StudioPropertySystem.cpp
@@ -87,7 +87,7 @@ CStudioPropertySystem::GetAdditionalMetaDataData(Qt3DSDMInstanceHandle inInstanc
 Qt3DSDMInstanceHandle CStudioPropertySystem::GetPropertyOwner(Qt3DSDMPropertyHandle inProperty) const
 {
 
-    qt3dsdm::SUICDMPropertyDefinition thePropDef = m_DataCore->GetProperty(inProperty);
+    qt3dsdm::Qt3DSDMPropertyDefinition thePropDef = m_DataCore->GetProperty(inProperty);
     return thePropDef.m_Instance;
 }
 
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSFileToolsSeekableMeshBufIOStream.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSFileToolsSeekableMeshBufIOStream.h
index c6e6e07d..41394cca 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSFileToolsSeekableMeshBufIOStream.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSFileToolsSeekableMeshBufIOStream.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICFILETOOLSSEEKABLEMESHBUFIOSTREAM
-#define UICFILETOOLSSEEKABLEMESHBUFIOSTREAM
+#ifndef QT3DS_FILETOOLSSEEKABLEMESHBUFIOSTREAM
+#define QT3DS_FILETOOLSSEEKABLEMESHBUFIOSTREAM
 #include "foundation/IOStreams.h"
 
 namespace Q3DStudio {
@@ -36,13 +36,13 @@ struct SFile;
 }
 
 namespace qt3dsimp {
-class CUICFileToolsSeekableMeshBufIOStream : public qt3ds::foundation::ISeekableIOStream
+class Qt3DSFileToolsSeekableMeshBufIOStream : public qt3ds::foundation::ISeekableIOStream
 {
 protected:
     std::shared_ptr<Q3DStudio::SFile> m_File;
 
 public:
-    CUICFileToolsSeekableMeshBufIOStream(std::shared_ptr<Q3DStudio::SFile> inFile)
+    Qt3DSFileToolsSeekableMeshBufIOStream(std::shared_ptr<Q3DStudio::SFile> inFile)
         : m_File(inFile)
     {
     }
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp
index 54816b84..2ba79743 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.cpp
@@ -863,7 +863,7 @@ public:
 
         Q3DStudio::TFilePtr handf =
             Q3DStudio::SFileTools::FindUniqueDestFile(m_MeshDir, name, L"mesh");
-        CUICFileToolsSeekableMeshBufIOStream output(handf);
+        Qt3DSFileToolsSeekableMeshBufIOStream output(handf);
         MallocAllocator alloc;
         QT3DSU32 meshId = meshBuffer.SaveMulti(alloc, output);
         CFilePath _retval = CFilePath::GetRelativePathFromBase(m_DestDirectory, handf->m_Path);
@@ -885,7 +885,7 @@ public:
                 CFilePath::CombineBaseAndRelative(m_DestDirectory, CString(srcMesh.getValue()));
 
             meshPath = meshPath.GetPathWithoutIdentifier();
-            CUICFileToolsSeekableMeshBufIOStream output(SFile::Wrap(
+            Qt3DSFileToolsSeekableMeshBufIOStream output(SFile::Wrap(
                 SFile::OpenForWrite(
                     meshPath, FileOpenFlags(FileOpenFlagValues::Open | FileOpenFlagValues::Create)),
                 meshPath));
@@ -964,7 +964,7 @@ public:
 
         Q3DStudio::TFilePtr handf =
             Q3DStudio::SFileTools::FindUniqueDestFile(m_PathBufferDir, name, L"path");
-        CUICFileToolsSeekableMeshBufIOStream output(handf);
+        Qt3DSFileToolsSeekableMeshBufIOStream output(handf);
         MallocAllocator alloc;
         pathBuffer.Save(output);
         CFilePath _retval = CFilePath::GetRelativePathFromBase(m_DestDirectory, handf->m_Path);
@@ -988,7 +988,7 @@ public:
                 m_DestDirectory, CString(srcPathBuffer.getValue()));
 
             pathBufferPath = pathBufferPath.GetPathWithoutIdentifier();
-            CUICFileToolsSeekableMeshBufIOStream output(SFile::Wrap(
+            Qt3DSFileToolsSeekableMeshBufIOStream output(SFile::Wrap(
                 SFile::OpenForWrite(pathBufferPath, FileOpenFlags(FileOpenFlagValues::Open
                                                                   | FileOpenFlagValues::Create)),
                 pathBufferPath));
@@ -1472,7 +1472,7 @@ public:
         std::shared_ptr<IDOMFactory> factory(IDOMFactory::CreateDOMFactory(m_StringTablePtr));
         SDOMElement *topElement = NULL;
         {
-            CUICFileToolsSeekableMeshBufIOStream stream(
+            Qt3DSFileToolsSeekableMeshBufIOStream stream(
                 SFile::Wrap(SFile::OpenForRead(fname), fname));
             if (stream.IsOpen() == false) {
                 QT3DS_ASSERT(false);
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h
index 03ff5068..ca2d4f7a 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImport.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTH
-#define UICIMPORTH
+#ifndef QT3DS_IMPORT_H
+#define QT3DS_IMPORT_H
 #include "Qt3DSImportLibPrecompile.h"
 #include "Qt3DSImportMesh.h"
 #include "Qt3DSImportPath.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.h
index fe08f401..016c3390 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTCOMPOSERTYPESH
-#define UICIMPORTCOMPOSERTYPESH
+#ifndef QT3DS_IMPORT_COMPOSER_TYPES_H
+#define QT3DS_IMPORT_COMPOSER_TYPES_H
 #include "Qt3DSDMComposerTypeDefinitions.h"
 
 // Define the subset of types that the import library supports.
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h
index 4fa9eff2..2f2a72ee 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportContainers.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTCONTAINERSH
-#define UICIMPORTCONTAINERSH
+#ifndef QT3DS_IMPORT_CONTAINERS_H
+#define QT3DS_IMPORT_CONTAINERS_H
 
 #include "EASTL/hash_map.h"
 #include "EASTL/hash_set.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportErrorCodes.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportErrorCodes.h
index 827295ef..9cf7f82e 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportErrorCodes.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportErrorCodes.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTERRORCODESH
-#define UICIMPORTERRORCODESH
+#ifndef QT3DS_IMPORT_ERROR_CODES_H
+#define QT3DS_IMPORT_ERROR_CODES_H
 
 namespace qt3dsimp {
 
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportImpl.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportImpl.h
index d991b77a..53643650 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportImpl.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportImpl.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTIMPLH
-#define UICIMPORTIMPLH
+#ifndef QT3DS_IMPORT_IMPL_H
+#define QT3DS_IMPORT_IMPL_H
 #include "Qt3DSImport.h"
 #include "Qt3DSImportContainers.h"
 #include "EASTL/functional.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp
index 10ff7f66..ac3b47e3 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.cpp
@@ -33,7 +33,7 @@
 #include "Qt3DSImportMesh.h"
 
 // This file is compiled for both studio and the runtime so you can't
-// add boost or much UICDM.  Note that the only UICDM file included is
+// add boost or much DataModel.  Note that the only DataModel file included is
 // UICDMStreams and this file does not include UICDMDatatypes or anything
 // like that.
 
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h
index 9c0581f6..ca0ae617 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMesh.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTMESHH
-#define UICIMPORTMESHH
+#ifndef QT3DS_IMPORT_MESH_H
+#define QT3DS_IMPORT_MESH_H
 #include "foundation/Qt3DS.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "render/Qt3DSRenderBaseTypes.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp
index 54f362da..4e41e5c8 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportMeshStudioOnly.cpp
@@ -96,19 +96,19 @@ QT3DSU32 Mesh::GetHighestMultiVersion(const char *inFilePath)
     return GetHighestMultiVersion(allocator, stream);
 }
 
-void CUICFileToolsSeekableMeshBufIOStream::SetPosition(QT3DSI64 inOffset, SeekPosition::Enum inEnum)
+void Qt3DSFileToolsSeekableMeshBufIOStream::SetPosition(QT3DSI64 inOffset, SeekPosition::Enum inEnum)
 {
     m_File->SetPosition(inOffset, (Q3DStudio::SeekPosition::Enum)inEnum);
 }
-QT3DSI64 CUICFileToolsSeekableMeshBufIOStream::GetPosition() const
+QT3DSI64 Qt3DSFileToolsSeekableMeshBufIOStream::GetPosition() const
 {
     return m_File->GetPosition();
 }
-QT3DSU32 CUICFileToolsSeekableMeshBufIOStream::Read(NVDataRef<QT3DSU8> data)
+QT3DSU32 Qt3DSFileToolsSeekableMeshBufIOStream::Read(NVDataRef<QT3DSU8> data)
 {
     return m_File->Read(data.begin(), data.size());
 }
-bool CUICFileToolsSeekableMeshBufIOStream::Write(NVConstDataRef<QT3DSU8> data)
+bool Qt3DSFileToolsSeekableMeshBufIOStream::Write(NVConstDataRef<QT3DSU8> data)
 {
     return m_File->Write(data.begin(), data.size()) == data.size();
 }
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h
index ef4cae26..3b52c8ce 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPath.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTPATHH
-#define UICIMPORTPATHH
+#ifndef QT3DS_IMPORT_PATH_H
+#define QT3DS_IMPORT_PATH_H
 #include "foundation/Qt3DS.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "render/Qt3DSRenderBaseTypes.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPerformImport.h b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPerformImport.h
index 1d40fcfa..f7ccf718 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPerformImport.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportPerformImport.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 #pragma once
-#ifndef UICIMPORTPERFORMIMPORTH
-#define UICIMPORTPERFORMIMPORTH
+#ifndef QT3DS_IMPORT_PERFORM_IMPORT_H
+#define QT3DS_IMPORT_PERFORM_IMPORT_H
 #include "Qt3DSDMDataTypes.h"
 #include "Qt3DSDMHandles.h"
 #include "foundation/Qt3DS.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
index 209daa1b..8db0bf45 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
@@ -46,7 +46,7 @@
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
 
-using namespace UICIMP;
+using namespace qt3dsimp;
 
 namespace {
 
@@ -2195,7 +2195,7 @@ void FbxDomWalker::FilterAnimCurve(FbxAnimCurve *inAnimCurve, std::vector<int> &
 * @return no return.
 */
 inline void WriteKeyframe(const FbxAnimCurveKey &inKey, const char *transformType,
-                          const char *channelName, UICIMP::ISceneGraphTranslation *inTranslator)
+                          const char *channelName, qt3dsimp::ISceneGraphTranslation *inTranslator)
 {
     // Create a key
     SKeyframeParameters theKeyframeInfo((float)inKey.GetTime().GetSecondDouble(), inKey.GetValue(),
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp
index a1e287de..05b52db5 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportSceneGraphTranslation.cpp
@@ -250,7 +250,7 @@ void matrixFromAxisAngle(float inDegreeAngle, float inXAxis, float inYAxis, floa
         return;
     }
 
-    inDegreeAngle *= (float)UIC3D_DEGREES_TO_RADIANS;
+    inDegreeAngle *= (float)QT3DS_DEGREES_TO_RADIANS;
 
     Q3DStudio::CVector3 theAxis(inXAxis, inYAxis, inZAxis);
     if (theAxis.LengthSquared() != 1.0f)
@@ -896,7 +896,7 @@ public:
                 // EulerAngleConverter::CEulerAngleConverter theConverter;
                 // EulerAngleConverter::EulerAngles theAxisAngle ={ ( *theTransform )[0], (
                 // *theTransform )[1], ( *theTransform )[2], ( *theTransform )[3] *
-                // (float)Q3DStudio::UIC3D_DEGREES_TO_RADIANS };
+                // (float)Q3DStudio::QT3DS_DEGREES_TO_RADIANS };
                 // theConverter.Eul_ToHMatrix( theAxisAngle, theMatrix.GetArray( ) );
                 matrixFromAxisAngle((*theTransform)[3], (*theTransform)[0], (*theTransform)[1],
                                     (*theTransform)[2], theMatrix.GetArray());
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportTranslation.h b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportTranslation.h
index 77b1d20a..5ecd9d64 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportTranslation.h
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportTranslation.h
@@ -28,8 +28,8 @@
 ****************************************************************************/
 #pragma once
 
-#ifndef UICIMPORTTRANSLATIONH
-#define UICIMPORTTRANSLATIONH
+#ifndef QT3DS_IMPORT_TRANSLATION_H
+#define QT3DS_IMPORT_TRANSLATION_H
 
 #include "qtAuthoring-config.h"
 #include "Qt3DSImportPerformImport.h"
@@ -63,7 +63,7 @@ public:
                            const wchar_t *inAssociatedName) = 0;
 };
 
-#ifdef UICIMPORT_TRANSLATION_INTERNAL
+#ifdef QT3DS_IMPORT_TRANSLATION_INTERNAL
 #define EXPORT_FUNCTION
 #else
 #define EXPORT_FUNCTION
@@ -119,7 +119,7 @@ struct SColladaTranslator : public qt3dsimp::ITranslator
 };
 
 #ifdef QT_3DSTUDIO_FBX
-struct SFbxTranslator : public UICIMP::ITranslator
+struct SFbxTranslator : public qt3dsimp::ITranslator
 {
     QString m_SourceFile;
     STranslationLog m_TranslationLog;
diff --git a/src/Authoring/Studio/Controls/Control.cpp b/src/Authoring/Studio/Controls/Control.cpp
index dbf06690..d5092f09 100644
--- a/src/Authoring/Studio/Controls/Control.cpp
+++ b/src/Authoring/Studio/Controls/Control.cpp
@@ -1315,7 +1315,7 @@ CPt CControl::GetGlobalPosition(CPt inChildPoint) const
 /**
  * Query the platform specific render device (window)
  */
-UICRenderDevice CControl::GetPlatformDevice()
+Qt3DSRenderDevice CControl::GetPlatformDevice()
 {
     if (GetParent())
         return GetParent()->GetPlatformDevice();
@@ -1327,7 +1327,7 @@ UICRenderDevice CControl::GetPlatformDevice()
  * Does self or child use this render device?
  * @see CWndControl::OnKillFocus
  */
-bool CControl::IsChildPlatformDevice(UICRenderDevice inDevice)
+bool CControl::IsChildPlatformDevice(Qt3DSRenderDevice inDevice)
 {
     if (GetPlatformDevice() == inDevice)
         return true;
diff --git a/src/Authoring/Studio/Controls/Control.h b/src/Authoring/Studio/Controls/Control.h
index 0d2ea79e..3fdb6ead 100644
--- a/src/Authoring/Studio/Controls/Control.h
+++ b/src/Authoring/Studio/Controls/Control.h
@@ -44,7 +44,7 @@
 
 class CRenderer;
 class CContextMenu;
-class CUICFile;
+class Qt3DSFile;
 class IDragable;
 class CAsset;
 class CStudioApp;
@@ -209,8 +209,8 @@ public:
     virtual void OffsetPosition(CPt inOffset);
 
     virtual CPt GetGlobalPosition(CPt inChildPoint) const;
-    virtual UICRenderDevice GetPlatformDevice();
-    bool IsChildPlatformDevice(UICRenderDevice inDevice);
+    virtual Qt3DSRenderDevice GetPlatformDevice();
+    bool IsChildPlatformDevice(Qt3DSRenderDevice inDevice);
     virtual void ShowMoveableWindow(CPt inLocation, const Q3DStudio::CString &inText, CRct inBoundingRct);
     virtual void HideMoveableWindow();
     CControl *GetFirstChild();
diff --git a/src/Authoring/Studio/Controls/ControlData.cpp b/src/Authoring/Studio/Controls/ControlData.cpp
index 65122537..640ade00 100644
--- a/src/Authoring/Studio/Controls/ControlData.cpp
+++ b/src/Authoring/Studio/Controls/ControlData.cpp
@@ -621,14 +621,14 @@ CPt CControlData::GetGlobalPosition(CPt inChildPoint) const
     }
     return CPt();
 }
-UICRenderDevice CControlData::GetPlatformDevice()
+Qt3DSRenderDevice CControlData::GetPlatformDevice()
 {
     if (m_Control) {
         return m_Control->GetPlatformDevice();
     }
     return nullptr;
 }
-bool CControlData::IsChildPlatformDevice(UICRenderDevice inDevice)
+bool CControlData::IsChildPlatformDevice(Qt3DSRenderDevice inDevice)
 {
     if (m_Control) {
         return m_Control->IsChildPlatformDevice(inDevice);
diff --git a/src/Authoring/Studio/Controls/ControlData.h b/src/Authoring/Studio/Controls/ControlData.h
index 8e2ea6d0..9c8e9fd9 100644
--- a/src/Authoring/Studio/Controls/ControlData.h
+++ b/src/Authoring/Studio/Controls/ControlData.h
@@ -235,8 +235,8 @@ namespace Control {
         void OffsetPosition(CPt inOffset);
 
         CPt GetGlobalPosition(CPt inChildPoint) const;
-        UICRenderDevice GetPlatformDevice();
-        bool IsChildPlatformDevice(UICRenderDevice inDevice);
+        Qt3DSRenderDevice GetPlatformDevice();
+        bool IsChildPlatformDevice(Qt3DSRenderDevice inDevice);
         void ShowMoveableWindow(CPt inLocation, Q3DStudio::CString inText, CRct inBoundingRct);
         void HideMoveableWindow();
         CControl *GetFirstChild();
diff --git a/src/Authoring/Studio/Controls/FloatEdit.cpp b/src/Authoring/Studio/Controls/FloatEdit.cpp
index ef16e803..897b7ad0 100644
--- a/src/Authoring/Studio/Controls/FloatEdit.cpp
+++ b/src/Authoring/Studio/Controls/FloatEdit.cpp
@@ -108,9 +108,9 @@ void CFloatEdit::FormatString()
 {
     Q3DStudio::CString theFormatString;
     if (m_FixedPlaces == -1)
-        theFormatString.Format(_UIC("%%.%df"), m_NumDecimalPlaces);
+        theFormatString.Format(_LSTR("%%.%df"), m_NumDecimalPlaces);
     else
-        theFormatString.Format(_UIC("%%0%d.%df"), m_FixedPlaces, m_NumDecimalPlaces);
+        theFormatString.Format(_LSTR("%%0%d.%df"), m_FixedPlaces, m_NumDecimalPlaces);
 
     m_ValueString.Format(theFormatString, m_Value);
 }
diff --git a/src/Authoring/Studio/Controls/FlowLayout.cpp b/src/Authoring/Studio/Controls/FlowLayout.cpp
index 21582128..5f750691 100644
--- a/src/Authoring/Studio/Controls/FlowLayout.cpp
+++ b/src/Authoring/Studio/Controls/FlowLayout.cpp
@@ -360,7 +360,7 @@ void CFlowLayout::SuspendRecalcLayout(bool inSuspendFlag)
  */
 void CFlowLayout::RecalcLayout()
 {
-    UICPROFILE(RecalcLayout);
+    QT3DS_PROFILE(RecalcLayout);
 
     // if you need to add lots of children items to this control, do this:
     // SuspendRecalcLayout( true ); AddLotsOFItems( ); SuspendRecalcLayout( false );
diff --git a/src/Authoring/Studio/Controls/ListLayout.cpp b/src/Authoring/Studio/Controls/ListLayout.cpp
index 912cec13..0410e2d4 100644
--- a/src/Authoring/Studio/Controls/ListLayout.cpp
+++ b/src/Authoring/Studio/Controls/ListLayout.cpp
@@ -171,7 +171,7 @@ void CListLayout::OnChildSizeChanged(CControl *inControl)
 
     // If we are not actively resizing then redo the layout.
     if (!m_IsResizing) {
-        UICPROFILE(OnChildSizeChanged);
+        QT3DS_PROFILE(OnChildSizeChanged);
 
         RecalcLayout();
     }
diff --git a/src/Authoring/Studio/Controls/Scroller.cpp b/src/Authoring/Studio/Controls/Scroller.cpp
index a2b63ab9..6cc2e8d9 100644
--- a/src/Authoring/Studio/Controls/Scroller.cpp
+++ b/src/Authoring/Studio/Controls/Scroller.cpp
@@ -227,7 +227,7 @@ void CScroller::AddChild(CControl *inControl, CControl *inInsertBefore /*= nullp
  */
 void CScroller::RecalcLayout()
 {
-    UICPROFILE(RecalcLayout);
+    QT3DS_PROFILE(RecalcLayout);
 
     m_ResizingChildren = true;
 
@@ -417,7 +417,7 @@ CPt CScroller::GetVisibleSize()
  */
 CPt CScroller::GetContaineeSize()
 {
-    UICPROFILE(GetContaineeSize);
+    QT3DS_PROFILE(GetContaineeSize);
 
     CControl *theControl = GetControl();
     CPt theSize;
@@ -511,7 +511,7 @@ CPt CScroller::GetMaxVisiblePosition()
 
 void CScroller::OnDraw(CRenderer *inRenderer, CRct &inDirtyRect, bool inIgnoreValidation)
 {
-    UICPROFILE(OnDraw);
+    QT3DS_PROFILE(OnDraw);
 
     CRct theDirtyRect;
     bool isInvalidated = IsInvalidated();
@@ -560,7 +560,7 @@ void CScroller::OnDraw(CRenderer *inRenderer, CRct &inDirtyRect, bool inIgnoreVa
  */
 void CScroller::Draw(CRenderer *inRenderer)
 {
-    UICPROFILE(Draw);
+    QT3DS_PROFILE(Draw);
 
     CRct theDirtyRct;
     // Only draw the side bar if it's visible
@@ -648,7 +648,7 @@ CScroller::EScrollMode CScroller::GetHorizontalScrollMode()
 
 void CScroller::OnChildSizeChanged(CControl *inControl)
 {
-    UICPROFILE(OnChildSizeChanged);
+    QT3DS_PROFILE(OnChildSizeChanged);
 
     CControl *theChild = GetControl();
 
diff --git a/src/Authoring/Studio/Controls/TreeControl.cpp b/src/Authoring/Studio/Controls/TreeControl.cpp
index 05764ddc..f2a54447 100644
--- a/src/Authoring/Studio/Controls/TreeControl.cpp
+++ b/src/Authoring/Studio/Controls/TreeControl.cpp
@@ -522,7 +522,7 @@ bool CTreeControl::GetAllowRefresh()
  */
 CTreeItem *CTreeControl::GetSiblingAfter(CTreeItem *inItem)
 {
-    UICPROFILE(GetSiblingAfter);
+    QT3DS_PROFILE(GetSiblingAfter);
 
     ASSERT(inItem);
 
@@ -580,7 +580,7 @@ CTreeItem *CTreeControl::GetSiblingAfter(CTreeItem *inItem)
  */
 CTreeItem *CTreeControl::RecurseGetControlAfter(CTreeItem *inItem)
 {
-    UICPROFILE(RecurseGetControlAfter);
+    QT3DS_PROFILE(RecurseGetControlAfter);
 
     ASSERT(inItem);
 
diff --git a/src/Authoring/Studio/Controls/TreeItem.cpp b/src/Authoring/Studio/Controls/TreeItem.cpp
index 8d2a81f9..be5239a4 100644
--- a/src/Authoring/Studio/Controls/TreeItem.cpp
+++ b/src/Authoring/Studio/Controls/TreeItem.cpp
@@ -401,7 +401,7 @@ void CTreeItem::ToggleExpansion()
  */
 void CTreeItem::Expand()
 {
-    UICPROFILE(Expand);
+    QT3DS_PROFILE(Expand);
 
     if (!m_IsExpanded) {
         m_TreeControl->OnItemExpanding(this);
@@ -648,7 +648,7 @@ void CTreeItem::RemoveItem()
  */
 void CTreeItem::UpdateToggle()
 {
-    UICPROFILE(UpdateToggle);
+    QT3DS_PROFILE(UpdateToggle);
 
     bool theEnableToggle = IsContainer();
     bool theToggleIsEnabled = m_Toggle->IsEnabled();
diff --git a/src/Authoring/Studio/Controls/WidgetControl.cpp b/src/Authoring/Studio/Controls/WidgetControl.cpp
index 4516cca7..011d223d 100644
--- a/src/Authoring/Studio/Controls/WidgetControl.cpp
+++ b/src/Authoring/Studio/Controls/WidgetControl.cpp
@@ -228,11 +228,11 @@ void WidgetControl::DoStartDrag(std::vector<Q3DStudio::CString> &inDragFileNameL
         auto thePos = inDragFileNameList.begin();
         auto theEndPos = inDragFileNameList.end();
 
-        Q3DStudio::CAutoMemPtr<CUICFile> theDragFile;
+        Q3DStudio::CAutoMemPtr<Qt3DSFile> theDragFile;
         for (; thePos != theEndPos; ++thePos) {
             Q3DStudio::CString theDragFileName = *thePos;
             if (theDragFileName.Length() > 0) {
-                theDragFile = new CUICFile(theDragFileName);
+                theDragFile = new Qt3DSFile(theDragFileName);
                 CDropSource *theDropSource = CDropSourceFactory::Create(
                     QT3DS_FLAVOR_ASSET_UICFILE, (void *)theDragFile, sizeof(theDragFile));
                 // Add the QT3DS_GESTURE_FLAVOR.  This will allow us to drag to StudioControls.
diff --git a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp
index 45db2d8f..0d9c10b7 100644
--- a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.cpp
@@ -69,7 +69,7 @@ CExplorerFileDropSource::CExplorerFileDropSource(long inFlavor, void *inData, un
     , m_File("")
 {
     // Pull out all of the SDropItemData and build a file.
-    m_File = *(CUICFile *)inData;
+    m_File = *(Qt3DSFile *)inData;
     Q3DStudio::CFilePath thePath(m_File.GetAbsolutePath());
     m_ObjectType = Q3DStudio::ImportUtils::GetObjectFileTypeForFile(thePath).m_IconType;
     // Fix because DAE files are the *only* thing you can drop onto the project
diff --git a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.h b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.h
index 3dbd00f0..a8ecf0c6 100644
--- a/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/ExplorerFileDropSource.h
@@ -53,7 +53,7 @@ class CDropTarget;
 class CExplorerFileDropSource : public CDropSource
 {
 protected:
-    CUICFile m_File;
+    Qt3DSFile m_File;
     static bool s_FileHasValidTarget;
 
 public:
@@ -64,7 +64,7 @@ public:
     bool ValidateTarget(CDropTarget *inTarget) override;
     bool GetHasValidTarget();
     void SetHasValidTarget(bool inValid) override;
-    CUICFile GetFile() const { return m_File; }
+    Qt3DSFile GetFile() const { return m_File; }
 };
 
 #endif // #ifndef __EXPLORERFILEDROPSOURCE_H__
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
index 6b55cc54..02ee8ba8 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.cpp
@@ -96,7 +96,7 @@ CFileDropSource::CFileDropSource(long inFlavor, void *inData, unsigned long inSi
     , m_File("")
 {
     // Pull out all of the SDropItemData and build a file.
-    m_File = *(CUICFile *)inData;
+    m_File = *(Qt3DSFile *)inData;
     m_ObjectType =
         Q3DStudio::ImportUtils::GetObjectFileTypeForFile(m_File.GetAbsolutePath()).m_ObjectType;
 }
diff --git a/src/Authoring/Studio/DragAndDrop/FileDropSource.h b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
index b401c7ec..a0cf1040 100644
--- a/src/Authoring/Studio/DragAndDrop/FileDropSource.h
+++ b/src/Authoring/Studio/DragAndDrop/FileDropSource.h
@@ -54,7 +54,7 @@ class CDropTarget;
 class CFileDropSource : public CDropSource
 {
 protected:
-    CUICFile m_File;
+    Qt3DSFile m_File;
     static bool s_FileHasValidTarget;
 
 public:
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index d78757df..b89c848e 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -290,7 +290,7 @@ int CMainFrame::OnCreate()
         if (m_RecentItems && m_RecentItems->GetItemCount() > 0)
             theMostRecentOpen = m_RecentItems->GetItem(0).GetPath();
         if (theMostRecentOpen.IsEmpty()) // default to exe
-            theMostRecentOpen = CUICFile::GetApplicationDirectory().GetPath();
+            theMostRecentOpen = Qt3DSFile::GetApplicationDirectory().GetPath();
 
         theDialogs->ResetSettings(theMostRecentOpen);
     }
@@ -935,7 +935,7 @@ void CMainFrame::EditPreferences(short inPageIndex)
         // Also clear out the viewer's settings file
         Q3DStudio::CFilePath theFilePath(Q3DStudio::CFilePath::CombineBaseAndRelative(
                                              Q3DStudio::CFilePath::GetUserApplicationDirectory(),
-                                             "Qt3DSomposer\\UICViewerSettings.txt"));
+                                             "Qt3DSComposer\\Qt3DSViewerSettings.txt"));
         theFilePath.DeleteThisFile();
     }
 }
@@ -1724,7 +1724,7 @@ void CMainFrame::OnViewTooltips()
  */
 void CMainFrame::OnUpdateHelpIndex()
 {
-    CUICFile theFile(g_StudioApp.m_pszHelpFilePath);
+    Qt3DSFile theFile(g_StudioApp.m_pszHelpFilePath);
     m_ui->action_Reference_Manual->setEnabled(theFile.Exists());
 }
 
@@ -1734,7 +1734,7 @@ void CMainFrame::OnUpdateHelpIndex()
  */
 void CMainFrame::OnHelpIndex()
 {
-    CUICFile theFile(g_StudioApp.m_pszHelpFilePath);
+    Qt3DSFile theFile(g_StudioApp.m_pszHelpFilePath);
     if (theFile.Exists())
         QDesktopServices::openUrl(QUrl::fromLocalFile(theFile.GetAbsolutePath().toQString()));
 }
@@ -1767,7 +1767,7 @@ void CMainFrame::OnHelpOpenTutorial()
  */
 void CMainFrame::OnHelpBehaviorReference()
 {
-    CUICFile theFile(CUICFile::GetApplicationDirectory(),
+    Qt3DSFile theFile(Qt3DSFile::GetApplicationDirectory(),
                      ::LoadResourceString(IDS_HELP_BEHAVIORREFERENCE));
     if (theFile.Exists()) {
         g_StudioApp.GetCore()->GetDispatch()->FireOnNavigate(
@@ -1825,7 +1825,7 @@ void CMainFrame::RecheckSizingMode()
 /**
  * Callback when a Core is opened or fails to open.
  */
-void CMainFrame::OnOpenDocument(const CUICFile &inFilename, bool inSucceeded)
+void CMainFrame::OnOpenDocument(const Qt3DSFile &inFilename, bool inSucceeded)
 {
     if (inSucceeded)
         m_RecentItems->AddRecentItem(inFilename);
@@ -1837,7 +1837,7 @@ void CMainFrame::OnOpenDocument(const CUICFile &inFilename, bool inSucceeded)
 /**
  * Callback when a Core is saved or fails to save.
  */
-void CMainFrame::OnSaveDocument(const CUICFile &inFilename, bool inSucceeded, bool inSaveCopy)
+void CMainFrame::OnSaveDocument(const Qt3DSFile &inFilename, bool inSucceeded, bool inSaveCopy)
 {
     if (!inSaveCopy)
         OnOpenDocument(inFilename, inSucceeded);
@@ -1847,7 +1847,7 @@ void CMainFrame::OnSaveDocument(const CUICFile &inFilename, bool inSucceeded, bo
 /**
  * Callback for when a the doc gets a new path
  */
-void CMainFrame::OnDocumentPathChanged(const CUICFile &inNewPath)
+void CMainFrame::OnDocumentPathChanged(const Qt3DSFile &inNewPath)
 {
     QString theTitle = inNewPath.GetName().toQString();
     if (theTitle.isEmpty())
@@ -1868,7 +1868,7 @@ void CMainFrame::OnDocumentPathChanged(const CUICFile &inNewPath)
  */
 void CMainFrame::OnOpenMostRecentlyUsedDocument()
 {
-    CUICFile theDocument = m_RecentItems->GetItem(0);
+    Qt3DSFile theDocument = m_RecentItems->GetItem(0);
     if (theDocument.Exists())
         g_StudioApp.OnLoadDocument(theDocument);
 }
diff --git a/src/Authoring/Studio/MainFrm.h b/src/Authoring/Studio/MainFrm.h
index 95684582..3981ee9a 100644
--- a/src/Authoring/Studio/MainFrm.h
+++ b/src/Authoring/Studio/MainFrm.h
@@ -82,9 +82,9 @@ public:
     void OnClosingPresentation() override;
 
     // CFileOpenListener
-    void OnOpenDocument(const CUICFile &inFilename, bool inSucceeded) override;
-    void OnSaveDocument(const CUICFile &inFilename, bool inSucceeded, bool inSaveCopy) override;
-    void OnDocumentPathChanged(const CUICFile &inNewPath) override;
+    void OnOpenDocument(const Qt3DSFile &inFilename, bool inSucceeded) override;
+    void OnSaveDocument(const Qt3DSFile &inFilename, bool inSucceeded, bool inSaveCopy) override;
+    void OnDocumentPathChanged(const Qt3DSFile &inNewPath) override;
 
     void RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler);
     void RecheckSizingMode();
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index 3397869d..aa952321 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -627,7 +627,7 @@ void ActionView::copyAction()
     auto theTempAPFile =
         GetDoc()->GetDocumentReader().CopyAction(m_actionsModel->actionAt(m_currentActionIndex),
                                                  GetDoc()->GetActiveSlide());
-    CUICFile theFile(theTempAPFile);
+    Qt3DSFile theFile(theTempAPFile);
     CStudioClipboard::CopyActionToClipboard(theFile);
 }
 
@@ -640,7 +640,7 @@ void ActionView::cutAction()
 
 void ActionView::pasteAction()
 {
-    CUICFile theTempAPFile = CStudioClipboard::GetActionFromClipboard();
+    Qt3DSFile theTempAPFile = CStudioClipboard::GetActionFromClipboard();
     Q3DStudio::SCOPED_DOCUMENT_EDITOR(*GetDoc(), QObject::tr("Paste Action"))
         ->PasteAction(theTempAPFile.GetAbsolutePath(), m_itemHandle);
 }
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.h b/src/Authoring/Studio/Palettes/Action/ActionView.h
index 5bdd431c..057c0a5a 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.h
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.h
@@ -179,7 +179,7 @@ private:
     ActionModel *m_actionsModel = nullptr;
     PropertyModel *m_propertyModel = nullptr;
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
-        m_connections; /// connections to the UICDM
+        m_connections; /// connections to the DataModel
     QPointer<ObjectListModel> m_objectsModel;
     QPointer<ObjectBrowserView> m_triggerObjectBrowser;
     QPointer<ObjectBrowserView> m_targetObjectBrowser;
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 288f56d7..7c357d39 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -389,7 +389,7 @@ bool InspectorControlModel::isGroupRebuildRequired(CInspectableBase* inspectable
         int existingIndex = 0;
         if (const auto group = dynamic_cast<const Qt3DSDMInspectorGroup *>(theInspectorGroup)) {
             const auto materialGroup
-                    = dynamic_cast<const UICDMMaterialInspectorGroup *>(group);
+                    = dynamic_cast<const Qt3DSDMMaterialInspectorGroup *>(group);
             if (materialGroup && materialGroup->isMaterialGroup()) {
                 auto i = existingGroup.controlElements.at(existingIndex++).value<InspectorControlBase*>();
                 if (i->m_instance != cdmInspectable->GetGroupInstance(theIndex))
@@ -439,7 +439,7 @@ auto InspectorControlModel::computeGroup(CInspectableBase* inspectable,
     if (const auto cdmInspectable = dynamic_cast<Qt3DSDMInspectable *>(inspectable)) {
         if (const auto group = dynamic_cast<Qt3DSDMInspectorGroup *>(theInspectorGroup)) {
             const auto materialGroup
-                    = dynamic_cast<UICDMMaterialInspectorGroup *>(group);
+                    = dynamic_cast<Qt3DSDMMaterialInspectorGroup *>(group);
             if (materialGroup && materialGroup->isMaterialGroup()) {
                 InspectorControlBase *item = createMaterialItem(cdmInspectable, theIndex);
                 if (item) {
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
index f3d7e3ec..73eb4e0a 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.cpp
@@ -313,7 +313,7 @@ bool Qt3DSDMInspectable::IsMaster()
 //		if ( theProperty && thePropertySystem->GetInstancePropertyValue( m_Instance,
 //theProperty, theTypeValue ) )
 //		{
-//			theReturn.assign( UICDM::get<TDataStrPtr>( theTypeValue )->GetData() );
+//			theReturn.assign( qt3dsdm::get<TDataStrPtr>( theTypeValue )->GetData() );
 //		}
 //	}
 //	catch( ... )
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
index 9ed59a0c..c1a02940 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectable.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICDM_INSPECTABLE_H
-#define INCLUDED_UICDM_INSPECTABLE_H 1
+#ifndef INCLUDED_QT3DSDM_INSPECTABLE_H
+#define INCLUDED_QT3DSDM_INSPECTABLE_H 1
 
 //==============================================================================
 //	Includes
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp
index 996a1108..dc12bc8c 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.cpp
@@ -64,8 +64,8 @@ Qt3DSDMInspectorGroup::Qt3DSDMInspectorGroup(CStudioApp &inApp, const QString &i
 Qt3DSDMInspectorGroup::~Qt3DSDMInspectorGroup()
 {
     std::vector<Q3DStudio::Qt3DSDMInspectorRow *>::iterator theIterator =
-        m_UICDMInspectorRows.begin();
-    for (; theIterator != m_UICDMInspectorRows.end(); ++theIterator)
+        m_DMInspectorRows.begin();
+    for (; theIterator != m_DMInspectorRows.end(); ++theIterator)
         delete (*theIterator);
 }
 
@@ -75,9 +75,9 @@ Qt3DSDMInspectorGroup::~Qt3DSDMInspectorGroup()
  */
 void Qt3DSDMInspectorGroup::CreateRow(CDoc *inDoc, qt3dsdm::Qt3DSDMMetaDataPropertyHandle inProperty)
 {
-    Q3DStudio::Qt3DSDMInspectorRow *theUICDMRow =
+    Q3DStudio::Qt3DSDMInspectorRow *theRow =
         new Q3DStudio::Qt3DSDMInspectorRow(inDoc, inProperty);
-    m_UICDMInspectorRows.push_back(
-        theUICDMRow); // this Qt3DSDMInspectorRow is now owned by this class
+    m_DMInspectorRows.push_back(
+        theRow); // this Qt3DSDMInspectorRow is now owned by this class
 
 }
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.h
index 70b5d3de..203cf632 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorGroup.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICDM_INSPECTORGROUP_H
-#define INCLUDED_UICDM_INSPECTORGROUP_H 1
+#ifndef INCLUDED_QT3DSDM_INSPECTORGROUP_H
+#define INCLUDED_QT3DSDM_INSPECTORGROUP_H 1
 
 #pragma once
 
@@ -57,7 +57,7 @@ class Qt3DSDMInspectorGroup: public CEasyInspectorGroup
 {
 protected: // Members
     CStudioApp &m_App;
-    std::vector<Q3DStudio::Qt3DSDMInspectorRow *> m_UICDMInspectorRows;
+    std::vector<Q3DStudio::Qt3DSDMInspectorRow *> m_DMInspectorRows;
     Qt3DSDMInspectable &m_Inspectable;
     long m_Index;
 
@@ -68,7 +68,7 @@ public: // Construction
 
     const std::vector<Q3DStudio::Qt3DSDMInspectorRow *> &GetRows() const
     {
-        return m_UICDMInspectorRows;
+        return m_DMInspectorRows;
     }
 
 public: // Use
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.h
index 4895d7bf..5d9a79fd 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMInspectorRow.h
@@ -44,7 +44,7 @@
 class CDoc;
 class CEasyInspectorRow;
 
-// UICDM
+// DataModel
 namespace qt3dsdm {
 class ISignalConnection;
 }
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp
index b1ac2915..94c475aa 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.cpp
@@ -180,7 +180,7 @@ struct SMaterialTypeDropDown : public CGenericComboDropDown
     }
 };
 
-UICDMMaterialInspectorGroup::UICDMMaterialInspectorGroup(
+Qt3DSDMMaterialInspectorGroup::Qt3DSDMMaterialInspectorGroup(
         CStudioApp &inApp,
         const Q3DStudio::CString &inName,
         Qt3DSDMInspectable &inInspectable,
@@ -189,11 +189,11 @@ UICDMMaterialInspectorGroup::UICDMMaterialInspectorGroup(
 {
 }
 
-struct SUICDMMaterialInspectorGroup : public UICDMMaterialInspectorGroup
+struct SQt3DSDMMaterialInspectorGroup : public Qt3DSDMMaterialInspectorGroup
 {
-    SUICDMMaterialInspectorGroup(CStudioApp &inApp, const Q3DStudio::CString &inName,
+    SQt3DSDMMaterialInspectorGroup(CStudioApp &inApp, const Q3DStudio::CString &inName,
                                  Qt3DSDMInspectable &inInspectable, long inIndex)
-        : UICDMMaterialInspectorGroup(inApp, inName, inInspectable, inIndex)
+        : Qt3DSDMMaterialInspectorGroup(inApp, inName, inInspectable, inIndex)
     {
         Q3DStudio::CString theMaterialGroupName = L"Material";
         m_isMaterialGroup = (inName == theMaterialGroupName);
@@ -214,7 +214,7 @@ CInspectorGroup *Qt3DSDMMaterialInspectable::GetGroup(long inIndex)
     Q3DStudio::CString theMaterialGroupName = L"Material";
 
     Qt3DSDMInspectorGroup *theGroup =
-        new SUICDMMaterialInspectorGroup(m_App, theGroupName, *this, inIndex);
+        new SQt3DSDMMaterialInspectorGroup(m_App, theGroupName, *this, inIndex);
 
     TMetaDataPropertyHandleList theProperties = GetGroupProperties(inIndex);
     size_t thePropertyCount = theProperties.size();
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.h
index ad93b6dd..25929c27 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMMaterialInspectable.h
@@ -30,16 +30,16 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICDM_MATERIAL_INSPECTABLE_H
-#define INCLUDED_UICDM_MATERIAL_INSPECTABLE_H 1
+#ifndef INCLUDED_QT3DSDM_MATERIAL_INSPECTABLE_H
+#define INCLUDED_QT3DSDM_MATERIAL_INSPECTABLE_H 1
 
 #include "Qt3DSDMInspectable.h"
 #include "Qt3DSDMInspectorGroup.h"
 
-class UICDMMaterialInspectorGroup : public Qt3DSDMInspectorGroup
+class Qt3DSDMMaterialInspectorGroup : public Qt3DSDMInspectorGroup
 {
 public:
-    UICDMMaterialInspectorGroup(CStudioApp &inApp, const Q3DStudio::CString &inName,
+    Qt3DSDMMaterialInspectorGroup(CStudioApp &inApp, const Q3DStudio::CString &inName,
                                 Qt3DSDMInspectable &inInspectable, long inIndex);
 
     virtual bool isMaterialGroup() const = 0;
diff --git a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.h b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.h
index 3c7b5259..eb9bc6e0 100644
--- a/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.h
+++ b/src/Authoring/Studio/Palettes/Inspector/Qt3DSDMSceneInspectable.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICDM_SCENE_INSPECTABLE_H
-#define INCLUDED_UICDM_SCENE_INSPECTABLE_H 1
+#ifndef INCLUDED_QT3DSDM_SCENE_INSPECTABLE_H
+#define INCLUDED_QT3DSDM_SCENE_INSPECTABLE_H 1
 
 //==============================================================================
 //	Includes
diff --git a/src/Authoring/Studio/Palettes/Master/MasterControl.cpp b/src/Authoring/Studio/Palettes/Master/MasterControl.cpp
index 922b6d02..f923c314 100644
--- a/src/Authoring/Studio/Palettes/Master/MasterControl.cpp
+++ b/src/Authoring/Studio/Palettes/Master/MasterControl.cpp
@@ -274,7 +274,7 @@ bool CMasterControl::OnMouseRDown(CPt inPoint, Qt::KeyboardModifiers inFlags)
 /**
  *	Return the window handle to the master view
  */
-UICRenderDevice CMasterControl::GetPlatformDevice()
+Qt3DSRenderDevice CMasterControl::GetPlatformDevice()
 {
     return m_RenderDevice;
 }
diff --git a/src/Authoring/Studio/Palettes/Master/MasterControl.h b/src/Authoring/Studio/Palettes/Master/MasterControl.h
index 40a347a4..3e16a518 100644
--- a/src/Authoring/Studio/Palettes/Master/MasterControl.h
+++ b/src/Authoring/Studio/Palettes/Master/MasterControl.h
@@ -75,7 +75,7 @@ public:
     CMasterControl(IMasterControlProvider *inProvider);
     ~CMasterControl();
 
-    void SetRenderDevice(UICRenderDevice inDevice) { m_RenderDevice = inDevice; }
+    void SetRenderDevice(Qt3DSRenderDevice inDevice) { m_RenderDevice = inDevice; }
 
     void AddControl(const Q3DStudio::CString &inName, long inType, CControl *inControl);
     void RemoveControl(CControl *inControl);
@@ -93,7 +93,7 @@ public:
     void Draw(CRenderer *inRenderer) override;
     void SetSize(CPt inSize) override;
     bool OnMouseRDown(CPt inPoint, Qt::KeyboardModifiers inFlags) override;
-    UICRenderDevice GetPlatformDevice() override;
+    Qt3DSRenderDevice GetPlatformDevice() override;
     void GrabFocus(CControl *inControl) override;
 
 protected:
@@ -108,7 +108,7 @@ protected:
     Q3DStudio::CAutoMemPtr<CProceduralButton<CButtonControl>>
         m_MenuButton; ///< menu button for the storage palette
     TControlMap m_ControlList; ///< the list of controls to display
-    UICRenderDevice m_RenderDevice; ///<
+    Qt3DSRenderDevice m_RenderDevice; ///<
 };
 
 #endif //#ifndef INCLUDED_MASTER_CONTROL_H
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
index 499d8bd1..732ee954 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp
@@ -108,7 +108,7 @@ QVariant ProjectFileSystemModel::data(const QModelIndex &index, int role) const
 QMimeData *ProjectFileSystemModel::mimeData(const QModelIndexList &indexes) const
 {
     const auto path = filePath(indexes.first().row()); // can only drag one item
-    CUICFile dragFile(Q3DStudio::CString::fromQString(path));
+    Qt3DSFile dragFile(Q3DStudio::CString::fromQString(path));
     return CDropSourceFactory::Create(QT3DS_FLAVOR_ASSET_UICFILE,
                                       reinterpret_cast<void *>(&dragFile),
                                       sizeof(dragFile));
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
index 69f5ce60..4e1bd58f 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.cpp
@@ -53,24 +53,24 @@ ProjectView::ProjectView(QWidget *parent) : QQuickWidget(parent)
   , m_ProjectModel(new ProjectFileSystemModel(this))
 {
     const QString theApplicationPath =
-            CUICFile::GetApplicationDirectory().GetAbsolutePath().toQString();
+            Qt3DSFile::GetApplicationDirectory().GetAbsolutePath().toQString();
 
-    m_BehaviorDir = CUICFile(
+    m_BehaviorDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Behavior Library")));
-    m_EffectDir = CUICFile(
+    m_EffectDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Effect Library")));
-    m_FontDir = CUICFile(
+    m_FontDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Font Library")));
-    m_ImageDir = CUICFile(
+    m_ImageDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Maps Library")));
-    m_MaterialDir = CUICFile(
+    m_MaterialDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Material Library")));
-    m_ModelDir = CUICFile(
+    m_ModelDir = Qt3DSFile(
                 Q3DStudio::CString::fromQString(theApplicationPath
                                                 + QLatin1String("/Content/Models Library")));
 
diff --git a/src/Authoring/Studio/Palettes/Project/ProjectView.h b/src/Authoring/Studio/Palettes/Project/ProjectView.h
index d8c94938..43359d5c 100644
--- a/src/Authoring/Studio/Palettes/Project/ProjectView.h
+++ b/src/Authoring/Studio/Palettes/Project/ProjectView.h
@@ -92,12 +92,12 @@ private:
 
     ProjectFileSystemModel *m_ProjectModel = nullptr;
     QColor m_BaseColor = QColor::fromRgb(75, 75, 75);
-    CUICFile m_BehaviorDir{""};
-    CUICFile m_EffectDir{""};
-    CUICFile m_FontDir{""};
-    CUICFile m_ImageDir{""};
-    CUICFile m_MaterialDir{""};
-    CUICFile m_ModelDir{""};
+    Qt3DSFile m_BehaviorDir{""};
+    Qt3DSFile m_EffectDir{""};
+    Qt3DSFile m_FontDir{""};
+    Qt3DSFile m_ImageDir{""};
+    Qt3DSFile m_MaterialDir{""};
+    Qt3DSFile m_ModelDir{""};
 };
 
 #endif // PROJECTVIEW_H
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h
index 677fcb78..d818c745 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h
@@ -75,7 +75,7 @@ Q_SIGNALS:
 
 
 protected:
-    // UICDM callbacks
+    // DataModel callbacks
     virtual void OnActiveSlide(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, int inIndex,
                                const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
     virtual void OnNewSlide(const qt3dsdm::Qt3DSDMSlideHandle &inSlide);
@@ -99,7 +99,7 @@ private:
     SlideModel *m_SlidesModel = nullptr;
     QColor m_BaseColor = QColor::fromRgb(75, 75, 75);
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
-        m_Connections; /// connections to the UICDM
+        m_Connections; /// connections to the DataModel
     typedef std::unordered_map<int, int> TIntIntMap;
     // We need to remember which slide we were on when we entered the master slide.
     // Then, when the users leave the master slide we can go back to roughly the same
diff --git a/src/Authoring/Studio/Palettes/Timeline/AssetTimelineKeyframe.cpp b/src/Authoring/Studio/Palettes/Timeline/AssetTimelineKeyframe.cpp
index c0541fac..46259fa7 100644
--- a/src/Authoring/Studio/Palettes/Timeline/AssetTimelineKeyframe.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/AssetTimelineKeyframe.cpp
@@ -349,7 +349,7 @@ void CAssetTimelineKeyframe::OnMouseUp(CPt inPoint, Qt::KeyboardModifiers inFlag
 void CAssetTimelineKeyframe::OnMouseMove(CPt inPoint, Qt::KeyboardModifiers inFlags)
 {
     CControl::OnMouseMove(inPoint, inFlags);
-    UICPROFILE(OnMouseMove);
+    QT3DS_PROFILE(OnMouseMove);
     // If the mouse is down and this is slected, then offst the keys
     if (m_IsMouseDown && m_Selected) {
         // If we are not yet dragging the keyframe
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
index 6f4934d1..d8f809d1 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/BehaviorTimelineItemBinding.h
@@ -44,7 +44,7 @@ class CTimelineTranslationManager;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Behavior type
+ * Binding to a DataModel object of Behavior type
  */
 class CBehaviorTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
index 9d2fd868..3ac8a6e3 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/GroupTimelineItemBinding.h
@@ -46,7 +46,7 @@ class CBaseStateRow;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Group type
+ * Binding to a DataModel object of Group type
  */
 class CGroupTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
index 1912c742..187cb78a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/ImageTimelineItemBinding.h
@@ -46,7 +46,7 @@ class ITimelineTimebar;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Image type
+ * Binding to a DataModel object of Image type
  */
 class CImageTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
index 7c383fb9..d9c12072 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/KeyframesManager.cpp
@@ -63,7 +63,7 @@ bool SortKeyframeInstancePairByTime(const CKeyframesManager::SKeyframeInstancePa
 
 //==============================================================================
 //	Keyframe specific.
-//  UICDM selection is handled by CTimelineTranslationManager.
+//  DataModel selection is handled by CTimelineTranslationManager.
 //==============================================================================
 CKeyframesManager::CKeyframesManager(CTimelineTranslationManager *inTransMgr)
     : m_TransMgr(inTransMgr)
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
index 9f5ed298..7cd9bfe6 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.cpp
@@ -170,7 +170,7 @@ ITimelineItemBinding *CLayerTimelineItemBinding::GetChild(long inIndex)
                     qt3dsdm::Qt3DSDMPropertyHandle theProperty =
                         std::get<2>(m_ImageNameFormalNamePairs[theSlotIndex]);
                     SValue theValue;
-                    const SUICDMPropertyDefinition &theDefinition(
+                    const Qt3DSDMPropertyDefinition &theDefinition(
                         theDataCore->GetProperty(theProperty));
                     if (theDefinition.m_Type == DataModelDataType::Long4) {
                         SValue theDCValue;
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
index b3579bd3..3d74625e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/LayerTimelineItemBinding.h
@@ -43,7 +43,7 @@ class CStudioSystem;
 
 //=============================================================================
 /**
- * Binding to generic UICDM object
+ * Binding to generic DataModel object
  */
 class CLayerTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
index 0259a583..252363e2 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/MaterialTimelineItemBinding.h
@@ -46,7 +46,7 @@ class CBaseStateRow;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Material type
+ * Binding to a DataModel object of Material type
  */
 class CMaterialTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
index 19698de3..41857093 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/OffsetKeyframesCommandHelper.cpp
@@ -62,7 +62,7 @@ COffsetKeyframesCommandHelper::~COffsetKeyframesCommandHelper()
 void COffsetKeyframesCommandHelper::SetCommandTime(qt3dsdm::Qt3DSDMKeyframeHandle inKeyframe,
                                                    long inTime)
 {
-    // The UICDM system will take care of merging these under the hood.
+    // The DataModel system will take care of merging these under the hood.
     ENSURE_EDITOR(L"Set Keyframe Time").SetKeyframeTime(inKeyframe, inTime);
 }
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
index 89c47695..b400d7ce 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathAnchorPointTimelineItemBinding.h
@@ -46,7 +46,7 @@ class CBaseStateRow;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Material type
+ * Binding to a DataModel object of Material type
  */
 class CPathAnchorPointTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
index f46f90d4..9f88e53f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/PathTimelineItemBinding.h
@@ -45,7 +45,7 @@ class CBaseStateRow;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Material type
+ * Binding to a DataModel object of Material type
  */
 class CPathTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.h
index 8a78f8ea..c57837da 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMAssetTimelineKeyframe.h
@@ -26,8 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef INCLUDED_UICDMASSETKEYFRAME_H
-#define INCLUDED_UICDMASSETKEYFRAME_H 1
+#ifndef QT3DSDM_ASSET_KEYFRAME_H
+#define QT3DSDM_ASSET_KEYFRAME_H 1
 
 #pragma once
 
@@ -66,4 +66,4 @@ public:
     void UpdateTime(const long inTime) { m_Time = inTime; }
 };
 
-#endif // INCLUDED_UICDMKEYFRAME_H
+#endif // QT3DSDM_ASSET_KEYFRAME_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimeline.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimeline.h
index 7989956f..18624897 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimeline.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimeline.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef INCLUDED_UICDMTIMELINE_H
-#define INCLUDED_UICDMTIMELINE_H 1
+#ifndef QT3DSDM_TIMELINE_H
+#define QT3DSDM_TIMELINE_H 1
 
 #pragma once
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 8b793f6a..465ef387 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -106,7 +106,7 @@ Qt3DSDMTimelineItemBinding::~Qt3DSDMTimelineItemBinding()
 }
 
 // helpers
-bool Qt3DSDMTimelineItemBinding::UICDMGetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const
+bool Qt3DSDMTimelineItemBinding::GetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const
 {
     qt3dsdm::IPropertySystem *thePropertySystem = m_StudioSystem->GetPropertySystem();
     SValue theValue;
@@ -114,7 +114,7 @@ bool Qt3DSDMTimelineItemBinding::UICDMGetBoolean(qt3dsdm::Qt3DSDMPropertyHandle
     return qt3dsdm::get<bool>(theValue);
 }
 
-void Qt3DSDMTimelineItemBinding::UICDMSetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
+void Qt3DSDMTimelineItemBinding::SetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty,
                                                 bool inValue, const QString &inNiceText) const
 {
     CDoc *theDoc = dynamic_cast<CDoc *>(g_StudioApp.GetCore()->GetDoc());
@@ -166,16 +166,16 @@ bool Qt3DSDMTimelineItemBinding::IsMaster() const
 
 bool Qt3DSDMTimelineItemBinding::IsShy() const
 {
-    return UICDMGetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Shy);
+    return GetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Shy);
 }
 void Qt3DSDMTimelineItemBinding::SetShy(bool inShy)
 {
-    UICDMSetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Shy, inShy,
+    SetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Shy, inShy,
                     QObject::tr("Shy Toggle"));
 }
 bool Qt3DSDMTimelineItemBinding::IsLocked() const
 {
-    return UICDMGetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Locked);
+    return GetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Locked);
 }
 
 void ToggleChildrenLock(Q3DStudio::ScopedDocumentEditor &scopedDocEditor,
@@ -208,12 +208,12 @@ void Qt3DSDMTimelineItemBinding::SetLocked(bool inLocked)
 
 bool Qt3DSDMTimelineItemBinding::IsVisible() const
 {
-    return UICDMGetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Eyeball);
+    return GetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Eyeball);
 }
 
 void Qt3DSDMTimelineItemBinding::SetVisible(bool inVisible)
 {
-    UICDMSetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Eyeball,
+    SetBoolean(m_StudioSystem->GetClientDataModelBridge()->GetSceneAsset().m_Eyeball,
                     inVisible, QObject::tr("Visibility Toggle"));
 }
 
@@ -339,7 +339,7 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
     if (inName.IsEmpty()) {
         Q3DStudio::CString theTitle(::LoadResourceString(IDS_ERROR_OBJECT_RENAME_TITLE));
         Q3DStudio::CString theString(::LoadResourceString(IDS_ERROR_OBJECT_RENAME_EMPTY_STRING));
-        g_StudioApp.GetDialogs()->DisplayMessageBox(theTitle, theString, CUICMessageBox::ICON_ERROR,
+        g_StudioApp.GetDialogs()->DisplayMessageBox(theTitle, theString, Qt3DSMessageBox::ICON_ERROR,
                                                     false);
 
         return;
@@ -351,7 +351,7 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
         Q3DStudio::CString theString(
             ::LoadResourceString(IDS_ERROR_OBJECT_RENAME_DUPLICATED_STRING));
         int theUserChoice = g_StudioApp.GetDialogs()->DisplayChoiceBox(
-            theTitle, theString, CUICMessageBox::ICON_WARNING);
+            theTitle, theString, Qt3DSMessageBox::ICON_WARNING);
         if (theUserChoice == QMessageBox::Yes) {
             // Set with the unique name
             Q3DStudio::SCOPED_DOCUMENT_EDITOR(*m_TransMgr->GetDoc(), QObject::tr("Set Name"))
@@ -381,9 +381,9 @@ CBaseStateRow *Qt3DSDMTimelineItemBinding::GetRow()
 void Qt3DSDMTimelineItemBinding::SetSelected(bool inMultiSelect)
 {
     if (!inMultiSelect)
-        g_StudioApp.GetCore()->GetDoc()->SelectUICDMObject(m_DataHandle);
+        g_StudioApp.GetCore()->GetDoc()->SelectDataModelObject(m_DataHandle);
     else
-        g_StudioApp.GetCore()->GetDoc()->ToggleUICDMObjectToSelection(m_DataHandle);
+        g_StudioApp.GetCore()->GetDoc()->ToggleDataModelObjectToSelection(m_DataHandle);
 }
 
 void Qt3DSDMTimelineItemBinding::OnCollapsed()
@@ -687,7 +687,7 @@ ITimelineKeyframesManager *Qt3DSDMTimelineItemBinding::GetKeyframesManager() con
 void Qt3DSDMTimelineItemBinding::RemoveProperty(ITimelineItemProperty *inProperty)
 {
     Q_UNUSED(inProperty);
-    // TODO: This function has no use in UICDM world. This is replaced by RemovePropertyRow(
+    // TODO: This function has no use in DataModel world. This is replaced by RemovePropertyRow(
     // Qt3DSDMPropertyHandle inPropertyHandle ).
     // Decide if this function should be removed from ITimelineItemBinding.
 }
@@ -951,7 +951,7 @@ void Qt3DSDMTimelineItemBinding::RefreshPropertyKeyframe(
 }
 
 // called when the keyframes are updated in the UI and data model hasn't committed the change, ie no
-// event callback from UICDM
+// event callback from DataModel
 void Qt3DSDMTimelineItemBinding::UIRefreshPropertyKeyframe(long inOffset)
 {
     if (!m_Row)
@@ -1252,7 +1252,7 @@ bool Qt3DSDMTimelineItemBinding::OpenSourcePathFile()
             m_DataHandle, theClientBridge->GetSourcePathProperty(), theValue)) {
         // Open the respective file
         Q3DStudio::CFilePath theSourcePath(qt3dsdm::get<qt3dsdm::TDataStrPtr>(theValue)->GetData());
-        CUICFile theFile(m_TransMgr->GetDoc()->GetResolvedPathToDoc(theSourcePath));
+        Qt3DSFile theFile(m_TransMgr->GetDoc()->GetResolvedPathToDoc(theSourcePath));
         theFile.Execute();
         return true;
     }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h
index 3192e180..2926bf67 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.h
@@ -30,8 +30,8 @@
 //==============================================================================
 //	Prefix
 //==============================================================================
-#ifndef INCLUDED_UICDM_TIMELINEITEM_BINDING_H
-#define INCLUDED_UICDM_TIMELINEITEM_BINDING_H 1
+#ifndef INCLUDED_QT3DSDM_TIMELINEITEM_BINDING_H
+#define INCLUDED_QT3DSDM_TIMELINEITEM_BINDING_H 1
 
 #pragma once
 
@@ -61,7 +61,7 @@ class CStudioSystem;
 
 //=============================================================================
 /**
- * Binding to generic UICDM object
+ * Binding to generic DataModel object
  */
 class Qt3DSDMTimelineItemBinding : public ITimelineItemBinding,
                                   public ITimelineItem,
@@ -93,8 +93,8 @@ public:
     virtual ~Qt3DSDMTimelineItemBinding();
 
 protected:
-    bool UICDMGetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const;
-    void UICDMSetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty, bool inValue,
+    bool GetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty) const;
+    void SetBoolean(qt3dsdm::Qt3DSDMPropertyHandle inProperty, bool inValue,
                          const QString &inNiceText) const;
     void SetInstanceHandle(qt3dsdm::Qt3DSDMInstanceHandle inDataHandle);
 
@@ -202,7 +202,7 @@ public:
 
     Q3DStudio::CId GetGuid() const;
 
-    // Bridge between asset & UICDM. Ideally we should be fully UICDM
+    // Bridge between asset & DataModel. Ideally we should be fully DataModel
     virtual qt3dsdm::Qt3DSDMInstanceHandle GetInstance() const;
 
 protected:
@@ -222,4 +222,4 @@ protected:
     virtual bool OpenSourcePathFile();
 };
 
-#endif // INCLUDED_UICDM_TIMELINEITEM_BINDING_H
+#endif // INCLUDED_QT3DSDM_TIMELINEITEM_BINDING_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
index a5bf0593..7dab15d8 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.cpp
@@ -66,8 +66,8 @@ bool SortKeyframeByTime(const Qt3DSDMTimelineKeyframe *inLHS, const Qt3DSDMTimel
     return inLHS->GetTime() < inRHS->GetTime();
 }
 
-// UICDM stores it from 0..1, UI expects 0..255
-inline float UICDMToColor(float inValue)
+// DataModel stores it from 0..1, UI expects 0..255
+inline float DataModelToColor(float inValue)
 {
     return inValue * 255;
 }
@@ -210,7 +210,7 @@ float Qt3DSDMTimelineItemProperty::GetMaximumValue() const
     float theRetVal = FLT_MIN;
     do_all(m_Keyframes, boost::bind(CompareAndSet, _1, boost::ref(theRetVal), true));
     if (m_Type.first == DataModelDataType::Float3 && m_Type.second == AdditionalMetaDataType::Color)
-        theRetVal = UICDMToColor(theRetVal);
+        theRetVal = DataModelToColor(theRetVal);
     return theRetVal;
 }
 
@@ -220,7 +220,7 @@ float Qt3DSDMTimelineItemProperty::GetMinimumValue() const
     float theRetVal = FLT_MAX;
     do_all(m_Keyframes, boost::bind(CompareAndSet, _1, boost::ref(theRetVal), false));
     if (m_Type.first == DataModelDataType::Float3 && m_Type.second == AdditionalMetaDataType::Color)
-        theRetVal = UICDMToColor(theRetVal);
+        theRetVal = DataModelToColor(theRetVal);
     return theRetVal;
 }
 
@@ -320,7 +320,7 @@ float Qt3DSDMTimelineItemProperty::GetChannelValueAtTime(long inChannelIndex, lo
                 if (m_Type.second == AdditionalMetaDataType::Color) {
                     SFloat3 theFloat3 = qt3dsdm::get<SFloat3>(theValue);
                     if (inChannelIndex >= 0 && inChannelIndex < 3)
-                        return UICDMToColor(theFloat3[inChannelIndex]);
+                        return DataModelToColor(theFloat3[inChannelIndex]);
                 } else {
                     SFloat3 theFloat3 = qt3dsdm::get<SFloat3>(theValue);
                     if (inChannelIndex >= 0 && inChannelIndex < 3)
@@ -349,7 +349,7 @@ float Qt3DSDMTimelineItemProperty::GetChannelValueAtTime(long inChannelIndex, lo
             m_AnimationHandles[inChannelIndex], Qt3DSDMTimelineKeyframe::GetTimeInSecs(inTime));
         if (m_Type.first == DataModelDataType::Float3
             && m_Type.second == AdditionalMetaDataType::Color)
-            theValue = UICDMToColor(theValue);
+            theValue = DataModelToColor(theValue);
 
         return theValue;
     }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
index 206d1ba2..29ba585d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemProperty.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef INCLUDED_UICDMTIMELINE_ITEM_PROPERTY_H
-#define INCLUDED_UICDMTIMELINE_ITEM_PROPERTY_H 1
+#ifndef QT3DSDM_TIMELINE_ITEM_PROPERTY_H
+#define QT3DSDM_TIMELINE_ITEM_PROPERTY_H 1
 
 #pragma once
 
@@ -116,4 +116,4 @@ protected:
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>> m_Signals;
 };
 
-#endif // INCLUDED_UICDMTIMELINE_ITEM_PROPERTY_H
+#endif // QT3DSDM_TIMELINE_ITEM_PROPERTY_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.h
index a3833ac5..ccec6ef0 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineKeyframe.h
@@ -26,8 +26,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef INCLUDED_UICDMKEYFRAME_H
-#define INCLUDED_UICDMKEYFRAME_H 1
+#ifndef QT3DSDM_KEYFRAME_H
+#define QT3DSDM_KEYFRAME_H 1
 
 #pragma once
 
@@ -43,7 +43,7 @@ class COffsetKeyframesCommandHelper;
 
 //==============================================================================
 /**
- *	Wrapper for a keyframe in UICDM.
+ *	Wrapper for a keyframe in DataModel.
  */
 //==============================================================================
 class Qt3DSDMTimelineKeyframe : public IKeyframe
@@ -81,4 +81,4 @@ public:
     static float GetTimeInSecs(long inTime);
 };
 
-#endif // INCLUDED_UICDMKEYFRAME_H
+#endif // QT3DSDM_KEYFRAME_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
index 853b4f49..3d54f6e5 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
@@ -50,7 +50,7 @@ class ISignalConnection;
 
 //=============================================================================
 /**
- * General timebar implementation for UICDM objects
+ * General timebar implementation for DataModel objects
  */
 class Qt3DSDMTimelineTimebar : public ITimelineTimebar, public Q3DStudio::CUpdateableDocumentEditor
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
index 14f3b95b..eb6a5f45 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/SlideTimelineItemBinding.h
@@ -46,7 +46,7 @@ class CBaseStateRow;
 
 //=============================================================================
 /**
- * Binding to a UICDM object of Slide type
+ * Binding to a DataModel object of Slide type
  */
 class CSlideTimelineItemBinding : public Qt3DSDMTimelineItemBinding
 {
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
index 8ff3d23b..68dbc85b 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineBreadCrumbProvider.h
@@ -68,7 +68,7 @@ protected:
     std::vector<qt3dsdm::Qt3DSDMInstanceHandle> m_BreadCrumbList;
     CDoc *m_Doc;
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
-        m_Connections; /// connections to the UICDM
+        m_Connections; /// connections to the DataModel
 };
 
 #endif // INCLUDED_BREADCRUMBPROVIDER_H
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
index 8c447381..5d25704f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.cpp
@@ -114,7 +114,7 @@ ITimelineItemBinding *CTimelineTranslationManager::GetOrCreate(Qt3DSDMInstanceHa
                  || theWideTypeString == L"Alias" || theWideTypeString == L"SubPath")
             theReturn = new Qt3DSDMTimelineItemBinding(this, inInstance);
         else {
-            // Add support for additional UICDM types here.
+            // Add support for additional DataModel types here.
             ASSERT(0);
         }
 
@@ -179,7 +179,7 @@ void CTimelineTranslationManager::Clear()
  */
 void CTimelineTranslationManager::Unregister(ITimelineItemBinding *inTimelineItem)
 {
-    // UICDM
+    // DataModel
     bool theDeselectItem = false;
     TInstanceHandleBindingMap::iterator theInstanceIter = m_InstanceHandleBindingMap.begin();
     for (; theInstanceIter != m_InstanceHandleBindingMap.end(); ++theInstanceIter) {
@@ -513,7 +513,7 @@ void CTimelineTranslationManager::OnActionEvent(qt3dsdm::Qt3DSDMActionHandle inA
  */
 void CTimelineTranslationManager::ClearBindingsKeyframeSelection()
 {
-    // UICDM bindings handle their own selections
+    // DataModel bindings handle their own selections
     TInstanceHandleBindingMap::const_iterator theIter = m_InstanceHandleBindingMap.begin();
     for (; theIter != m_InstanceHandleBindingMap.end(); ++theIter)
         theIter->second->DoSelectKeyframes(false, -1, true);
@@ -562,9 +562,9 @@ ITimelineItemBinding *CTimelineTranslationManager::EnsureLoaded(Qt3DSDMInstanceH
             bool rowLoaded = theBinding != nullptr && theBinding->GetRow() != nullptr;
             if (theParentBinding && rowLoaded == false) {
                 // start to add the scene asset to the timeline
-                Qt3DSDMTimelineItemBinding *theUICDMBinding =
+                Qt3DSDMTimelineItemBinding *theDMBinding =
                     dynamic_cast<Qt3DSDMTimelineItemBinding *>(theParentBinding);
-                theUICDMBinding->OnAddChild(inHandle);
+                theDMBinding->OnAddChild(inHandle);
                 theBinding = GetBinding(inHandle);
             }
         }
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
index b7d80b29..663cbc1f 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/TimelineTranslationManager.h
@@ -55,7 +55,7 @@ class CAsset;
 class IUICDMSelectable;
 class CClientDataModelBridge;
 
-// UICDM
+// DataModel
 namespace qt3dsdm {
 class CStudioSystem;
 class ISignalConnection;
@@ -70,21 +70,21 @@ class CDoc;
 class CTimelineTranslationManager
 {
 protected: // Typedefs
-    // UICDM support
+    // DataModel support
     typedef std::map<qt3dsdm::Qt3DSDMInstanceHandle, Qt3DSDMTimelineItemBinding *>
         TInstanceHandleBindingMap;
 
     // Store expanded state
-    typedef std::map<qt3dsdm::Qt3DSDMInstanceHandle, bool> TInstanceHandleExpandedMap; // UICDM support
+    typedef std::map<qt3dsdm::Qt3DSDMInstanceHandle, bool> TInstanceHandleExpandedMap; // DataModel support
 
 protected: // Properties
-    // UICDM support
+    // DataModel support
     TInstanceHandleBindingMap m_InstanceHandleBindingMap;
 
     CKeyframesManager *m_KeyframesManager;
     IBreadCrumbProvider *m_BreadCrumbProvider;
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
-        m_Connections; /// connections to the UICDM
+        m_Connections; /// connections to the DataModel
 
     TInstanceHandleExpandedMap m_InstanceHandleExpandedMap;
 
@@ -114,7 +114,7 @@ public:
 
     qt3dsdm::CStudioSystem *GetStudioSystem() const;
 
-    // UICDM callback
+    // DataModel callback
     void OnAnimationCreated(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
                             qt3dsdm::Qt3DSDMPropertyHandle inProperty);
     void OnAnimationDeleted(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
diff --git a/src/Authoring/Studio/Palettes/Timeline/PropertyTimebarRow.cpp b/src/Authoring/Studio/Palettes/Timeline/PropertyTimebarRow.cpp
index 6f13fec4..0a334df7 100644
--- a/src/Authoring/Studio/Palettes/Timeline/PropertyTimebarRow.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/PropertyTimebarRow.cpp
@@ -115,7 +115,7 @@ void CPropertyTimebarRow::Draw(CRenderer *inRenderer)
  */
 void CPropertyTimebarRow::DrawColor(CRenderer *inRenderer)
 {
-    UICPROFILE(DrawColor);
+    QT3DS_PROFILE(DrawColor);
 
     ITimelineItemProperty *theProperty = m_PropertyRow->GetProperty();
     ASSERT(theProperty->GetChannelCount() == 3); // sanity check
@@ -211,7 +211,7 @@ bool CPropertyTimebarRow::OnMouseRDown(CPt inPoint, Qt::KeyboardModifiers inFlag
  */
 void CPropertyTimebarRow::OnMouseMove(CPt inPoint, Qt::KeyboardModifiers inFlags)
 {
-    UICPROFILE(OnMouseMove);
+    QT3DS_PROFILE(OnMouseMove);
     CControl::OnMouseMove(inPoint, inFlags);
 }
 //=============================================================================
@@ -284,7 +284,7 @@ void CPropertyTimebarRow::SetSize(CPt inSize)
 void CPropertyTimebarRow::RefreshKeyframes()
 {
     m_Refreshing = true;
-    UICPROFILE(RefreshKeyframes);
+    QT3DS_PROFILE(RefreshKeyframes);
 
     // First Loop clears any keys that do not correlate to a supersetkey
     TTimelineKeyframeList::iterator thePos = m_Keyframes.begin();
diff --git a/src/Authoring/Studio/Palettes/Timeline/StateTimebarlessRow.cpp b/src/Authoring/Studio/Palettes/Timeline/StateTimebarlessRow.cpp
index 6eebd0c4..5853b73c 100644
--- a/src/Authoring/Studio/Palettes/Timeline/StateTimebarlessRow.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/StateTimebarlessRow.cpp
@@ -84,7 +84,7 @@ void CStateTimebarlessRow::OnDraw(CRenderer *inRenderer, CRct &inDirtyRect, bool
  */
 void CStateTimebarlessRow::Draw(CRenderer *inRenderer)
 {
-    UICPROFILE(Draw);
+    QT3DS_PROFILE(Draw);
 
     if (m_DirtyFlag) {
         RefreshKeyframes();
@@ -189,7 +189,7 @@ bool CStateTimebarlessRow::PropertiesHaveKeyframe(long inTime)
  */
 void CStateTimebarlessRow::RefreshKeyframes()
 {
-    UICPROFILE(RefreshKeyframes);
+    QT3DS_PROFILE(RefreshKeyframes);
 
     m_Refreshing = true;
 
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimeMeasure.cpp b/src/Authoring/Studio/Palettes/Timeline/TimeMeasure.cpp
index caf1cb9c..f6c01e1a 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimeMeasure.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimeMeasure.cpp
@@ -156,19 +156,19 @@ Q3DStudio::CString CTimeMeasure::FormatTime(long inTime)
     Q3DStudio::CString theTime;
     // If only hours are being displayed then format it as hours.
     if (theHoursOnlyFlag) {
-        theTime.Format(_UIC("%dh"), theHours);
+        theTime.Format(_LSTR("%dh"), theHours);
     }
     // If only minutes are being displayed then format it as minutes.
     else if (theMinutesOnlyFlag) {
-        theTime.Format(_UIC("%dm"), theMinutes);
+        theTime.Format(_LSTR("%dm"), theMinutes);
     }
     // If only seconds are being displayed then format as seconds
     else if (theSecondsOnlyFlag) {
-        theTime.Format(_UIC("%ds"), theSeconds);
+        theTime.Format(_LSTR("%ds"), theSeconds);
     }
     // If the intervals are correct then this should only be tenths of seconds, so do that.
     else {
-        theTime.Format(_UIC("0.%ds"), theMillis / 100);
+        theTime.Format(_LSTR("0.%ds"), theMillis / 100);
     }
 
     return theTime;
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimebarControl.cpp b/src/Authoring/Studio/Palettes/Timeline/TimebarControl.cpp
index af0084aa..d1421d95 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimebarControl.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimebarControl.cpp
@@ -477,7 +477,7 @@ void CTimebarControl::OnMouseMove(CPt inPoint, Qt::KeyboardModifiers inFlags)
 
     // If we are in edit Comment mode or locked, then we do not drag the timebar.
     if (!theCommentEditMode && m_IsMouseDown && !m_TimelineItemBinding->IsLockedEnabled()) {
-        UICPROFILE(OnMouseMove);
+        QT3DS_PROFILE(OnMouseMove);
 
         if (m_MaybeDragStart) {
             // Dragging in the first 5 pixels will be ignored to avoid unconsciously accidental
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
index 985fe420..6146788e 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.cpp
@@ -300,8 +300,8 @@ void CTimelineControl::OnSelectionChange(Q3DStudio::SSelectedValue inNewSelectab
     bool theLoseFocus = !inNewSelectable.empty();
     if (!theLoseFocus) {
         Q3DStudio::SelectedValueTypes::Enum theSelectionType = inNewSelectable.getType();
-        // for now, its just UICDM objects
-        theLoseFocus = theSelectionType != Q3DStudio::SelectedValueTypes::Instance; // UICDM objects
+        // for now, its just DataModel objects
+        theLoseFocus = theSelectionType != Q3DStudio::SelectedValueTypes::Instance; // DataModel objects
     }
     if (theLoseFocus)
         m_TreeLayout->OnLoseFocus();
@@ -405,7 +405,7 @@ void CTimelineControl::SetScrollPositionY(CScroller *inSource, long inPositionY)
  */
 void CTimelineControl::OnDraw(CRenderer *inRenderer, CRct &inDirtyRect, bool inIgnoreValidation)
 {
-    UICPROFILE(OnDraw);
+    QT3DS_PROFILE(OnDraw);
     CControl::OnDraw(inRenderer, inDirtyRect, inIgnoreValidation);
 }
 
@@ -551,7 +551,7 @@ void CTimelineControl::RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandl
  * event that takes place just before a save or export, on lose focus will commit changes
  * in text boxes
  */
-void CTimelineControl::OnSavingPresentation(const CUICFile *inNewPresentationFile)
+void CTimelineControl::OnSavingPresentation(const Qt3DSFile *inNewPresentationFile)
 {
     Q_UNUSED(inNewPresentationFile);
     OnLoseFocus();
diff --git a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
index 67120690..0ee2451d 100644
--- a/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
+++ b/src/Authoring/Studio/Palettes/Timeline/TimelineControl.h
@@ -90,7 +90,7 @@ public:
     // Presentation Change Listener
     void OnNewPresentation() override;
     void OnClosingPresentation() override;
-    void OnSavingPresentation(const CUICFile *inNewPresentationFile) override;
+    void OnSavingPresentation(const Qt3DSFile *inNewPresentationFile) override;
 
     // ClientPlayChangeListener
     void OnPlayStart() override;
@@ -131,7 +131,7 @@ protected:
 
     void HideInsertionMarkers();
 
-    // UICDM callbacks
+    // DataModel callbacks
     void OnActiveSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
     void OnDeleteSlide(qt3dsdm::Qt3DSDMSlideHandle inSlide);
 
@@ -153,6 +153,6 @@ protected:
     CTimelineTranslationManager *m_TranslationManager;
 
     std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>>
-        m_Connections; /// connections to the UICDM
+        m_Connections; /// connections to the DataModel
 };
 #endif // INCLUDED_TIMELINE_CONTROL_H
diff --git a/src/Authoring/Studio/PreviewHelper.cpp b/src/Authoring/Studio/PreviewHelper.cpp
index 788a4a3e..cbefc738 100644
--- a/src/Authoring/Studio/PreviewHelper.cpp
+++ b/src/Authoring/Studio/PreviewHelper.cpp
@@ -116,7 +116,7 @@ void CPreviewHelper::PreviewViaConfig(Q3DStudio::CBuildConfiguration *inSelected
                                       EExecMode inMode, RemoteDeploymentSender *project)
 {
     bool theUsingTempFile;
-    CUICFile theDocument = GetDocumentFile(theUsingTempFile);
+    Qt3DSFile theDocument = GetDocumentFile(theUsingTempFile);
     CCore *theCore = g_StudioApp.GetCore();
     try {
         if (theCore->GetDoc()->IsModified()) {
@@ -150,7 +150,7 @@ void CPreviewHelper::DoPreviewViaConfig(Q3DStudio::CBuildConfiguration * /*inSel
     } else if (inMode == EXECMODE_PREVIEW
                && CStudioPreferences::GetPreviewProperty("PLATFORM") == "PC") {
         // Quick Preview on PC without going via NANT
-        CFilePath theCurrentPath(CUICFile::GetApplicationDirectory().GetAbsolutePath());
+        CFilePath theCurrentPath(Qt3DSFile::GetApplicationDirectory().GetAbsolutePath());
         CFilePath theViewerDir = CFilePath::fromQString(QApplication::applicationDirPath());
         if (!theViewerDir.IsDirectory()) {
             // theMainDir = theCurrentPath.GetDirectory().GetDirectory();
@@ -281,10 +281,10 @@ bool CPreviewHelper::ResolveVariable(Q3DStudio::CBuildConfiguration *inSelectedC
  *	@param	outUsingTempFile	if temp file if used
  *	@return the document file to be previewed or conditioned
  */
-CUICFile CPreviewHelper::GetDocumentFile(bool &outUsingTempFile)
+Qt3DSFile CPreviewHelper::GetDocumentFile(bool &outUsingTempFile)
 {
-    CUICFile theDocument = g_StudioApp.GetCore()->GetDoc()->GetDocumentPath();
-    CUICFile theResult("");
+    Qt3DSFile theDocument = g_StudioApp.GetCore()->GetDoc()->GetDocumentPath();
+    Qt3DSFile theResult("");
     theResult = theDocument;
     outUsingTempFile = false;
     return theResult;
diff --git a/src/Authoring/Studio/PreviewHelper.h b/src/Authoring/Studio/PreviewHelper.h
index 6e8fb25c..75f72ee1 100644
--- a/src/Authoring/Studio/PreviewHelper.h
+++ b/src/Authoring/Studio/PreviewHelper.h
@@ -78,7 +78,7 @@ protected:
     static bool ResolveVariable(Q3DStudio::CBuildConfiguration *inSelectedConfig,
                                 const Q3DStudio::CString &inDocumentFile,
                                 const Q3DStudio::CString &inVariable, Q3DStudio::CString &outValue);
-    static CUICFile GetDocumentFile(bool &outUsingTempFile);
+    static Qt3DSFile GetDocumentFile(bool &outUsingTempFile);
     static Q3DStudio::CString GetLaunchFile(const Q3DStudio::CString &inDocFile);
 };
 
diff --git a/src/Authoring/Studio/Render/PathWidget.cpp b/src/Authoring/Studio/Render/PathWidget.cpp
index b54da2e3..fa9b1223 100644
--- a/src/Authoring/Studio/Render/PathWidget.cpp
+++ b/src/Authoring/Studio/Render/PathWidget.cpp
@@ -72,7 +72,7 @@ struct SPathWidget : public IPathWidget
         TReverseAnchorBuffer;
 
     NVAllocatorCallback &m_Allocator;
-    IUICRenderContext &m_UICContext;
+    IQt3DSRenderContext &m_Context;
 
     NVScopedRefCounted<NVRenderVertexBuffer> m_PointVertexBuffer;
     NVScopedRefCounted<NVRenderInputAssembler> m_PointAssembler;
@@ -91,9 +91,9 @@ struct SPathWidget : public IPathWidget
     QT3DSMat44 m_PointMVP;
 
     QT3DSI32 m_RefCount;
-    SPathWidget(NVAllocatorCallback &inAlloc, IUICRenderContext &inRc)
+    SPathWidget(NVAllocatorCallback &inAlloc, IQt3DSRenderContext &inRc)
         : m_Allocator(inAlloc)
-        , m_UICContext(inRc)
+        , m_Context(inRc)
         , m_LineBuffer(inAlloc, "m_LineBuffer")
         , m_PointBuffer(inAlloc, "m_PointBuffer")
         , m_AnchorIndexBuffer(inAlloc, "m_AnchorIndexBuffer")
@@ -338,7 +338,7 @@ struct SPathWidget : public IPathWidget
         if (!m_Node)
             return;
         SPath &thePath = static_cast<SPath &>(*m_Node);
-        IPathManager &theManager = m_UICContext.GetPathManager();
+        IPathManager &theManager = m_Context.GetPathManager();
 
         QT3DSVec3 anchorColor(0, 1, 0);
         QT3DSVec3 controlColor(0, 0, 1);
@@ -506,7 +506,7 @@ struct SPathWidget : public IPathWidget
 };
 }
 
-IPathWidget &IPathWidget::CreatePathWidget(NVAllocatorCallback &inCallback, IUICRenderContext &inRc)
+IPathWidget &IPathWidget::CreatePathWidget(NVAllocatorCallback &inCallback, IQt3DSRenderContext &inRc)
 {
     return *QT3DS_NEW(inCallback, SPathWidget)(inCallback, inRc);
 }
diff --git a/src/Authoring/Studio/Render/PathWidget.h b/src/Authoring/Studio/Render/PathWidget.h
index 0730426c..6396b3e9 100644
--- a/src/Authoring/Studio/Render/PathWidget.h
+++ b/src/Authoring/Studio/Render/PathWidget.h
@@ -41,7 +41,7 @@ namespace widgets {
     public:
         qt3ds::studio::SStudioPickValue PickIndexToPickValue(QT3DSU32 inPickIndex) override = 0;
         static IPathWidget &CreatePathWidget(NVAllocatorCallback &inAlloc,
-                                             IUICRenderContext &inRenderContext);
+                                             IQt3DSRenderContext &inRenderContext);
     };
 }
 }
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp
index 4517130e..b36fe1fb 100644
--- a/src/Authoring/Studio/Render/StudioRenderer.cpp
+++ b/src/Authoring/Studio/Render/StudioRenderer.cpp
@@ -73,7 +73,7 @@ struct SRendererImpl : public IStudioRenderer,
 {
     typedef eastl::vector<Option<SEditCameraPersistentInformation>> TEditCameraInfoList;
     std::shared_ptr<CWGLRenderContext> m_RenderContext;
-    NVScopedRefCounted<IUICRenderContext> m_UICContext;
+    NVScopedRefCounted<IQt3DSRenderContext> m_Context;
     QRect m_Rect;
     CDispatch &m_Dispatch;
     CDoc &m_Doc;
@@ -135,46 +135,46 @@ struct SRendererImpl : public IStudioRenderer,
 
     ITextRenderer *GetTextRenderer() override
     {
-        if (m_UICContext.mPtr)
-            return m_UICContext->GetTextRenderer();
+        if (m_Context.mPtr)
+            return m_Context->GetTextRenderer();
         return NULL;
     }
     // The buffer manager may not be available
     IBufferManager *GetBufferManager() override
     {
-        if (m_UICContext.mPtr)
-            return &m_UICContext->GetBufferManager();
+        if (m_Context.mPtr)
+            return &m_Context->GetBufferManager();
         return NULL;
     }
 
     IPathManager *GetPathManager() override
     {
-        if (m_UICContext.mPtr)
-            return &m_UICContext->GetPathManager();
+        if (m_Context.mPtr)
+            return &m_Context->GetPathManager();
         return NULL;
     }
 
     qt3ds::foundation::IStringTable *GetRenderStringTable() override
     {
-        if (m_UICContext.mPtr)
-            return &m_UICContext->GetStringTable();
+        if (m_Context.mPtr)
+            return &m_Context->GetStringTable();
         return NULL;
     }
 
-    bool IsInitialized() override { return m_UICContext.mPtr != NULL; }
+    bool IsInitialized() override { return m_Context.mPtr != NULL; }
 
     void Initialize(QWidget *inWindow) override
     {
         if (m_Closed)
             return;
         QT3DS_ASSERT(!m_RenderContext);
-        QT3DS_ASSERT(m_UICContext.mPtr == NULL);
+        QT3DS_ASSERT(m_Context.mPtr == NULL);
         try {
             m_RenderContext = std::make_shared<CWGLRenderContext>(inWindow);
 
             Q3DStudio::CString theResourcePath = Q3DStudio::CString::fromQString(resourcePath());
-            NVScopedRefCounted<qt3ds::render::IUICRenderContextCore> theCore =
-                qt3ds::render::IUICRenderContextCore::Create(
+            NVScopedRefCounted<qt3ds::render::IQt3DSRenderContextCore> theCore =
+                qt3ds::render::IQt3DSRenderContextCore::Create(
                     m_RenderContext->GetRenderContext().GetFoundation(),
                     m_RenderContext->GetRenderContext().GetStringTable());
 
@@ -185,19 +185,19 @@ struct SRendererImpl : public IStudioRenderer,
                             m_RenderContext->GetRenderContext().GetStringTable()));
             theCore->SetTextRendererCore(theTextRenderer);
 
-            m_UICContext = theCore->CreateRenderContext(
+            m_Context = theCore->CreateRenderContext(
                 m_RenderContext->GetRenderContext(),
                 m_RenderContext->GetRenderContext().GetStringTable().RegisterStr(
                     theResourcePath.c_str()));
 
             // Allow the artist to interact with the top level objects alone.
-            m_UICContext->GetRenderer().PickRenderPlugins(false);
+            m_Context->GetRenderer().PickRenderPlugins(false);
 
             SetupTextRenderer();
 
-            m_UICContext->SetAuthoringMode(true);
+            m_Context->SetAuthoringMode(true);
 
-            InitializePointerTags(m_UICContext->GetStringTable());
+            InitializePointerTags(m_Context->GetStringTable());
             SetViewRect(m_Rect);
 #ifdef KDAB_TEMPORARILY_REMOVE
             // KDAB_TODO the below call asserts on windows
@@ -209,7 +209,7 @@ struct SRendererImpl : public IStudioRenderer,
             // Notify that renderer has been initialized
             m_Dispatch.FireOnRendererInitialized();
         } catch (...) {
-            m_UICContext = nullptr;
+            m_Context = nullptr;
             m_RenderContext = std::shared_ptr<CWGLRenderContext>();
             throw;
         }
@@ -374,7 +374,7 @@ struct SRendererImpl : public IStudioRenderer,
                 for (SNode *theChild = theEditLayer->m_FirstChild; theChild;
                      theChild = theChild->m_NextSibling) {
                     qt3ds::NVBounds3 childBounds = theChild->GetBounds(
-                        m_UICContext->GetBufferManager(), m_UICContext->GetPathManager());
+                        m_Context->GetBufferManager(), m_Context->GetPathManager());
                     if (childBounds.isEmpty() == false) {
                         childBounds.transform(theChild->m_GlobalTransform);
                         theBounds.include(childBounds);
@@ -383,7 +383,7 @@ struct SRendererImpl : public IStudioRenderer,
             }
         } else
             theBounds =
-                theNode.GetBounds(m_UICContext->GetBufferManager(), m_UICContext->GetPathManager());
+                theNode.GetBounds(m_Context->GetBufferManager(), m_Context->GetPathManager());
         QT3DSVec3 theCenter = theNode.m_GlobalTransform.transform(theBounds.getCenter());
         // Center the edit camera so that it points directly at the bounds center point
         m_Translation->m_EditCameraInfo.m_Position = theCenter;
@@ -405,7 +405,7 @@ struct SRendererImpl : public IStudioRenderer,
     {
         m_Closed = true;
         m_Translation = std::shared_ptr<STranslation>();
-        m_UICContext = nullptr;
+        m_Context = nullptr;
         m_RenderContext = std::shared_ptr<CWGLRenderContext>();
     }
 
@@ -488,9 +488,9 @@ struct SRendererImpl : public IStudioRenderer,
     void CreateTranslator()
     {
         if (!m_Translation) {
-            if (m_UICContext.mPtr) {
+            if (m_Context.mPtr) {
                 m_Translation = std::make_shared<STranslation>(std::ref(*this),
-                                                                 std::ref(*m_UICContext.mPtr));
+                                                                 std::ref(*m_Context.mPtr));
                 m_Translation->m_EditLightEnabled = CStudioPreferences::GetEditViewFillMode();
                 ApplyEditCameraIndex();
                 SetTranslationViewport();
@@ -500,17 +500,17 @@ struct SRendererImpl : public IStudioRenderer,
 
     void SetupTextRenderer()
     {
-        if (m_UICContext.mPtr && m_UICContext->GetTextRenderer()) {
-            m_UICContext->GetTextRenderer()->ClearProjectFontDirectories();
+        if (m_Context.mPtr && m_Context->GetTextRenderer()) {
+            m_Context->GetTextRenderer()->ClearProjectFontDirectories();
             Q3DStudio::CString theDocDir = m_Doc.GetDocumentDirectory();
             if (theDocDir.Length()) {
                 // Add the installed font folders from the res dir.
                 Q3DStudio::CString thePath(Q3DStudio::CString::fromQString(
                                                resourcePath() + QStringLiteral("/Font")));
-                m_UICContext->GetTextRenderer()->AddSystemFontDirectory(
-                    m_UICContext->GetStringTable().RegisterStr(thePath.c_str()));
-                m_UICContext->GetTextRenderer()->AddProjectFontDirectory(
-                    m_UICContext->GetStringTable().RegisterStr(theDocDir.c_str()));
+                m_Context->GetTextRenderer()->AddSystemFontDirectory(
+                    m_Context->GetStringTable().RegisterStr(thePath.c_str()));
+                m_Context->GetTextRenderer()->AddProjectFontDirectory(
+                    m_Context->GetStringTable().RegisterStr(theDocDir.c_str()));
             }
         }
     }
@@ -583,7 +583,7 @@ struct SRendererImpl : public IStudioRenderer,
                 qt3dsdm::Qt3DSDMInstanceHandle theHandle(m_PickResult.getData<Qt3DSDMInstanceHandle>());
 
                 if (theHandle != m_Doc.GetSelectedInstance())
-                    m_Doc.SelectUICDMObject(theHandle);
+                    m_Doc.SelectDataModelObject(theHandle);
             } else if (m_PickResult.getType() == StudioPickValueTypes::Guide)
                 m_Doc.NotifySelectionChanged(m_PickResult.getData<qt3dsdm::Qt3DSDMGuideHandle>());
             else if (m_PickResult.getType() == StudioPickValueTypes::Path) {
@@ -591,7 +591,7 @@ struct SRendererImpl : public IStudioRenderer,
                 qt3dsdm::Qt3DSDMInstanceHandle theAnchorHandle =
                     m_Translation->GetAnchorPoint(thePick);
                 if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) {
-                    m_Doc.SelectUICDMObject(theAnchorHandle);
+                    m_Doc.SelectDataModelObject(theAnchorHandle);
                 }
             }
             RequestRender();
@@ -836,13 +836,13 @@ struct SRendererImpl : public IStudioRenderer,
             m_RenderContext->EndRender();
 
             if (theResult.getType() == StudioPickValueTypes::Instance)
-                m_Doc.SelectAndNavigateToUICDMObject(theResult.getData<Qt3DSDMInstanceHandle>());
+                m_Doc.SelectAndNavigateToDataModelObject(theResult.getData<Qt3DSDMInstanceHandle>());
             else if (theResult.getType() == StudioPickValueTypes::Path) {
                 SPathPick thePickValue = theResult.getData<SPathPick>();
                 qt3dsdm::Qt3DSDMInstanceHandle theAnchorHandle =
                     m_Translation->GetAnchorPoint(thePickValue);
                 if (theAnchorHandle.Valid() && theAnchorHandle != m_Doc.GetSelectedInstance()) {
-                    m_Doc.SelectUICDMObject(theAnchorHandle);
+                    m_Doc.SelectDataModelObject(theAnchorHandle);
                 }
             }
         }
diff --git a/src/Authoring/Studio/Render/StudioRendererImpl.h b/src/Authoring/Studio/Render/StudioRendererImpl.h
index 981b7a7a..21c0e564 100644
--- a/src/Authoring/Studio/Render/StudioRendererImpl.h
+++ b/src/Authoring/Studio/Render/StudioRendererImpl.h
@@ -97,7 +97,7 @@ namespace studio {
     using qt3ds::foundation::rotationArc;
     using qt3ds::foundation::Option;
     using qt3ds::foundation::Empty;
-    using qt3ds::render::IUICRenderContext;
+    using qt3ds::render::IQt3DSRenderContext;
     using qt3ds::render::SScene;
     using qt3ds::render::SLayer;
     using qt3ds::render::SNode;
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
index b046b225..88814e2d 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
@@ -73,11 +73,11 @@ using qt3ds::render::NVRenderRect;
 
 namespace {
 using namespace qt3dsdm;
-struct STranslatorUICDMParser
+struct STranslatorDataModelParser
 {
     STranslation &m_Context;
     Qt3DSDMInstanceHandle m_InstanceHandle;
-    STranslatorUICDMParser(STranslation &inContext, Qt3DSDMInstanceHandle inInstance)
+    STranslatorDataModelParser(STranslation &inContext, Qt3DSDMInstanceHandle inInstance)
         : m_Context(inContext)
         , m_InstanceHandle(inInstance)
     {
@@ -201,7 +201,7 @@ struct STranslatorUICDMParser
     {
         Option<qt3dsdm::TDataStrPtr> theValue = GetPropertyValue<qt3dsdm::TDataStrPtr>(inProperty);
         if (theValue.hasValue() && *theValue) {
-            qt3ds::render::IStringTable &theStrTable(m_Context.m_UICContext.GetStringTable());
+            qt3ds::render::IStringTable &theStrTable(m_Context.m_Context.GetStringTable());
             outValue = theStrTable.RegisterStr((*theValue)->GetData());
             return true;
         }
@@ -217,7 +217,7 @@ struct STranslatorUICDMParser
                 Q3DStudio::CFilePath theResolvedPath =
                     Q3DStudio::CFilePath::CombineBaseAndRelative(theDirectory, outValue.c_str());
                 outValue =
-                    m_Context.m_UICContext.GetStringTable().RegisterStr(theResolvedPath.c_str());
+                    m_Context.m_Context.GetStringTable().RegisterStr(theResolvedPath.c_str());
             }
             return true;
         }
@@ -528,7 +528,7 @@ struct SSceneTranslator : public SGraphObjectTranslator
     void PushTranslation(STranslation &inContext) override
     {
         SScene &theItem = static_cast<SScene &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_SCENE_PROPERTIES
         SLayer *theCurrentLayer = nullptr;
         theItem.m_FirstChild = nullptr;
@@ -605,7 +605,7 @@ struct SNodeTranslator : public SGraphObjectTranslator
     {
         SGraphObjectTranslator::PushTranslation(inContext);
         SNode &theItem = static_cast<SNode &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_NODE_PROPERTIES
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Node.m_BoneId,
                                 theItem.m_SkeletonId);
@@ -660,7 +660,7 @@ struct SLayerTranslator : public SNodeTranslator
     {
         SNodeTranslator::PushTranslation(inContext);
         SLayer &theItem = static_cast<SLayer &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_LAYER_PROPERTIES
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Layer.m_AoSamplerate,
                                 theItem.m_AoSamplerate);
@@ -706,7 +706,7 @@ struct SLightTranslator : public SNodeTranslator
     {
         SNodeTranslator::PushTranslation(inContext);
         SLight &theItem = static_cast<SLight &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_LIGHT_PROPERTIES
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Light.m_ShadowMapRes,
                                 theItem.m_ShadowMapRes);
@@ -724,7 +724,7 @@ struct SCameraTranslator : public SNodeTranslator
     {
         SNodeTranslator::PushTranslation(inContext);
         SCamera &theItem = static_cast<SCamera &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_CAMERA_PROPERTIES
     }
 };
@@ -738,7 +738,7 @@ struct SModelTranslator : public SNodeTranslator
     {
         SNodeTranslator::PushTranslation(inContext);
         SModel &theItem = static_cast<SModel &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_MODEL_PROPERTIES
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Model.m_PoseRoot,
                                 theItem.m_SkeletonRoot);
@@ -808,7 +808,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator
     void PushTranslation(STranslation &inContext) override
     {
         SPathSubPath &theItem = static_cast<SPathSubPath &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_PATH_SUBPATH_PROPERTIES
         m_PathBuffer.clear();
         Q3DStudio::IDocumentReader &theReader(inContext.m_Doc.GetDocumentReader());
@@ -845,7 +845,7 @@ struct SPathSubPathTranslator : public SGraphObjectTranslator
                 ++anchorIdx;
             }
         }
-        inContext.m_UICContext.GetPathManager().SetPathSubPathData(
+        inContext.m_Context.GetPathManager().SetPathSubPathData(
             theItem,
             qt3ds::foundation::toConstDataRef(m_PathBuffer.begin(), (QT3DSU32)m_PathBuffer.size()));
     }
@@ -890,7 +890,7 @@ struct SPathTranslator : public SNodeTranslator
     {
         SNodeTranslator::PushTranslation(inContext);
         SPath &theItem = static_cast<SPath &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_PATH_PROPERTIES
     }
 };
@@ -907,7 +907,7 @@ struct SDefaultMaterialTranslator : public SGraphObjectTranslator
     {
         SGraphObjectTranslator::PushTranslation(inContext);
         SDefaultMaterial &theItem = static_cast<SDefaultMaterial &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES
 
         // qt3dsdm::Qt3DSDMInstanceHandle parent = inContext.m_AssetGraph.GetParent(
@@ -937,7 +937,7 @@ struct SImageTranslator : public SGraphObjectTranslator
     {
         SGraphObjectTranslator::PushTranslation(inContext);
         SImage &theItem = static_cast<SImage &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_IMAGE_PROPERTIES
 
         theItem.m_Flags.SetDirty(true);
@@ -968,7 +968,7 @@ struct STextTranslator : public SNodeTranslator
     void PushTranslation(STranslation &inContext) override
     {
         SNodeTranslator::PushTranslation(inContext);
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         SText &theItem = static_cast<SText &>(GetGraphObject());
         ITERATE_QT3DS_RENDER_TEXT_PROPERTIES
         theItem.m_Flags.SetTextDirty(true);
@@ -999,7 +999,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator
     void PushTranslation(STranslation &inContext) override
     {
         SDynamicObject &theItem = static_cast<SDynamicObject &>(GetGraphObject());
-        IDynamicObjectSystem &theSystem = inContext.m_UICContext.GetDynamicObjectSystem();
+        IDynamicObjectSystem &theSystem = inContext.m_Context.GetDynamicObjectSystem();
         using namespace qt3ds::render::dynamic;
         using qt3ds::foundation::NVConstDataRef;
         NVConstDataRef<SPropertyDefinition> theProperties =
@@ -1084,7 +1084,7 @@ struct SDynamicObjectTranslator : public SGraphObjectTranslator
                             theItem.SetPropertyValue(
                                 theDefinition, theStr.c_str(),
                                 inContext.m_Doc.GetDocumentDirectory().GetCharStar(), theWorkspace,
-                                inContext.m_UICContext.GetStringTable());
+                                inContext.m_Context.GetStringTable());
                         }
                     } break;
                     default:
@@ -1112,7 +1112,7 @@ struct SEffectTranslator : public SDynamicObjectTranslator
     }
     void PushTranslation(STranslation &inContext) override
     {
-        m_EffectSystem = &inContext.m_UICContext.GetEffectSystem();
+        m_EffectSystem = &inContext.m_Context.GetEffectSystem();
         SDynamicObjectTranslator::PushTranslation(inContext);
     }
 
@@ -1140,7 +1140,7 @@ struct SCustomMaterialTranslator : public SDynamicObjectTranslator
     {
         SDynamicObjectTranslator::PushTranslation(inContext);
         SCustomMaterial &theItem = static_cast<SCustomMaterial &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_CUSTOM_MATERIAL_PROPERTIES
 
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Lightmaps.m_LightmapIndirect,
@@ -1173,7 +1173,7 @@ struct SReferencedMaterialTranslator : public SGraphObjectTranslator
     {
         SGraphObjectTranslator::PushTranslation(inContext);
         SReferencedMaterial &theItem = static_cast<SReferencedMaterial &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         ITERATE_QT3DS_RENDER_REFERENCED_MATERIAL_PROPERTIES
 
         theItem.m_Dirty.SetDirty();
@@ -1291,10 +1291,10 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
             return;
 
         Q3DStudio::CFilePath theFullPath = inContext.m_Doc.GetResolvedPathToDoc(theData->GetData());
-        qt3ds::foundation::IStringTable &theStrTable = inContext.m_UICContext.GetStringTable();
+        qt3ds::foundation::IStringTable &theStrTable = inContext.m_Context.GetStringTable();
         theItem.m_PluginPath = theStrTable.RegisterStr(theFullPath);
         qt3ds::render::IRenderPluginInstance *theInstance =
-            inContext.m_UICContext.GetRenderPluginManager().GetOrCreateRenderPluginInstance(
+            inContext.m_Context.GetRenderPluginManager().GetOrCreateRenderPluginInstance(
                 theItem.m_PluginPath, &theItem);
 
         // Couldn't load the instance, so we can't render the instance.
@@ -1317,7 +1317,7 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
         using qt3ds::render::SRenderPluginPropertyDeclaration;
         if (theClass.GetRegisteredProperties().size() == 0) {
             for (size_t idx = 0, end = theSpecificProperties.size(); idx < end; ++idx) {
-                SUICDMPropertyDefinition theProperty =
+                Qt3DSDMPropertyDefinition theProperty =
                     theDataCore->GetProperty(theSpecificProperties[idx]);
                 qt3dsdm::AdditionalMetaDataType::Value theMetaType =
                     inContext.m_StudioSystem.GetActionMetaData()->GetAdditionalMetaDataType(
@@ -1366,7 +1366,7 @@ struct SRenderPluginTranslator : public SGraphObjectTranslator
                 GetInstanceHandle(), theSpecificProperties[idx]);
             if (thePropValueOpt.hasValue()) {
                 SValue &thePropValue = thePropValueOpt.getValue();
-                SUICDMPropertyDefinition theProperty =
+                Qt3DSDMPropertyDefinition theProperty =
                     theDataCore->GetProperty(theSpecificProperties[idx]);
                 SRenderPluginPropertyDeclaration theDeclaration(theClass.GetPropertyDeclaration(
                     theStrTable.RegisterStr(theProperty.m_Name.c_str())));
@@ -1446,7 +1446,7 @@ struct SAliasTranslator : public SGraphObjectTranslator
     }
     void PushTranslation(STranslation &inContext) override
     {
-        STranslatorUICDMParser theParser(inContext, GetInstanceHandle());
+        STranslatorDataModelParser theParser(inContext, GetInstanceHandle());
         Option<SObjectRefType> theData = theParser.GetPropertyValue<SObjectRefType>(
             inContext.m_ObjectDefinitions.m_Alias.m_ReferencedNode);
         m_ReferencedInstance = Qt3DSDMInstanceHandle();
@@ -1473,7 +1473,7 @@ struct SAliasTranslator : public SGraphObjectTranslator
     void AfterRenderGraphIsBuilt(STranslation &inContext) override
     {
         SNode &theItem = static_cast<SNode &>(GetGraphObject());
-        STranslatorUICDMParser theParser(inContext, m_InstanceHandle);
+        STranslatorDataModelParser theParser(inContext, m_InstanceHandle);
         ITERATE_QT3DS_RENDER_NODE_PROPERTIES
         theParser.ParseProperty(inContext.m_ObjectDefinitions.m_Node.m_BoneId,
                                 theItem.m_SkeletonId);
@@ -1521,7 +1521,7 @@ void SGraphObjectTranslator::PushTranslation(STranslation &inTranslatorContext)
     Q3DStudio::CString theId = inTranslatorContext.m_Reader.GetFileId(GetInstanceHandle());
     if (theId.size())
         GetGraphObject().m_Id =
-            inTranslatorContext.m_UICContext.GetStringTable().RegisterStr(theId.c_str());
+            inTranslatorContext.m_Context.GetStringTable().RegisterStr(theId.c_str());
 }
 
 bool STranslation::IncludeNode(const SNode &inNode)
@@ -1545,11 +1545,11 @@ void STranslation::ReleaseEffect(qt3dsdm::Qt3DSDMInstanceHandle inInstance)
         theType = m_ObjectDefinitions.GetType(theParentClass);
 
     if (theType == qt3dsdm::ComposerObjectTypes::Effect) {
-        IEffectSystem &theSystem = m_UICContext.GetEffectSystem();
+        IEffectSystem &theSystem = m_Context.GetEffectSystem();
         if (theParentClass.Valid()) {
             Q3DStudio::CString theInstanceName = m_Reader.GetName(theParentClass);
             CRegisteredString theNameStr =
-                m_UICContext.GetStringTable().RegisterStr(theInstanceName);
+                m_Context.GetStringTable().RegisterStr(theInstanceName);
 
             if (theSystem.IsEffectRegistered(theNameStr)) {
                 TInstanceToTranslatorMap::iterator theTranslatorList =
@@ -1617,11 +1617,11 @@ SGraphObjectTranslator *STranslation::CreateTranslator(qt3dsdm::Qt3DSDMInstanceH
         theNewTranslator = QT3DS_NEW(m_Allocator, SPathSubPathTranslator)(inInstance, m_Allocator);
         break;
     case qt3dsdm::ComposerObjectTypes::Effect: {
-        IEffectSystem &theSystem = m_UICContext.GetEffectSystem();
+        IEffectSystem &theSystem = m_Context.GetEffectSystem();
         if (theParentClass.Valid()) {
             Q3DStudio::CString theInstanceName = m_Reader.GetName(theParentClass);
             CRegisteredString theNameStr =
-                m_UICContext.GetStringTable().RegisterStr(theInstanceName);
+                m_Context.GetStringTable().RegisterStr(theInstanceName);
 
             if (theSystem.IsEffectRegistered(theNameStr)
                 && theSystem.DoesEffectRequireCompilation(theNameStr)) {
@@ -1634,11 +1634,11 @@ SGraphObjectTranslator *STranslation::CreateTranslator(qt3dsdm::Qt3DSDMInstanceH
                 Q3DStudio::CString theInstancePath = m_Reader.GetSourcePath(theParentClass);
                 Option<qt3dsdm::SMetaDataEffect> theMetaEffect =
                     theMetaData.GetEffectBySourcePath(
-                        m_UICContext.GetStringTable().GetNarrowStr(theInstancePath));
+                        m_Context.GetStringTable().GetNarrowStr(theInstancePath));
                 if (theMetaEffect.hasValue()) {
                     qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect(
-                        theNameStr, m_UICContext.GetFoundation(), theSystem, theMetaEffect,
-                        m_UICContext.GetStringTable());
+                        theNameStr, m_Context.GetFoundation(), theSystem, theMetaEffect,
+                        m_Context.GetStringTable());
                     theSystem.SetEffectRequiresCompilation(theNameStr, true);
                 }
             }
@@ -1651,22 +1651,22 @@ SGraphObjectTranslator *STranslation::CreateTranslator(qt3dsdm::Qt3DSDMInstanceH
         }
     } break;
     case qt3dsdm::ComposerObjectTypes::CustomMaterial: {
-        ICustomMaterialSystem &theSystem = m_UICContext.GetCustomMaterialSystem();
+        ICustomMaterialSystem &theSystem = m_Context.GetCustomMaterialSystem();
         if (theParentClass.Valid()) {
             Q3DStudio::CString theInstanceName = m_Reader.GetName(theParentClass);
             CRegisteredString theNameStr =
-                m_UICContext.GetStringTable().RegisterStr(theInstanceName);
+                m_Context.GetStringTable().RegisterStr(theInstanceName);
             if (!theSystem.IsMaterialRegistered(theNameStr)) {
                 // We assume the effect has already been registered and such.
                 qt3dsdm::IMetaData &theMetaData(*m_StudioSystem.GetActionMetaData());
                 Q3DStudio::CString theInstancePath = m_Reader.GetSourcePath(theParentClass);
                 Option<qt3dsdm::SMetaDataCustomMaterial> theMaterialData =
                     theMetaData.GetMaterialBySourcePath(
-                        m_UICContext.GetStringTable().GetNarrowStr(theInstancePath));
+                        m_Context.GetStringTable().GetNarrowStr(theInstancePath));
                 if (theMaterialData.hasValue()) {
                     qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial(
-                        theNameStr, m_UICContext.GetFoundation(), theSystem, theMaterialData,
-                        m_UICContext.GetStringTable());
+                        theNameStr, m_Context.GetFoundation(), theSystem, theMaterialData,
+                        m_Context.GetStringTable());
                 }
             }
             if (theSystem.IsMaterialRegistered(theNameStr)) {
@@ -1804,9 +1804,9 @@ namespace studio {
 }
 }
 
-STranslation::STranslation(IStudioRenderer &inRenderer, IUICRenderContext &inContext)
+STranslation::STranslation(IStudioRenderer &inRenderer, IQt3DSRenderContext &inContext)
     : m_Renderer(inRenderer)
-    , m_UICContext(inContext)
+    , m_Context(inContext)
     , m_Doc(*g_StudioApp.GetCore()->GetDoc())
     , m_Reader(m_Doc.GetDocumentReader())
     , m_ObjectDefinitions(
@@ -1956,7 +1956,7 @@ void STranslation::BuildRenderGraph(SGraphObjectTranslator &inParent,
         }
     }
     if (GraphObjectTypes::Layer == theParentTranslator.GetGraphObject().m_Type)
-        m_UICContext.GetRenderer().ChildrenUpdated(
+        m_Context.GetRenderer().ChildrenUpdated(
             static_cast<SLayer &>(theParentTranslator.GetGraphObject()));
 
     // Allow certain nodes to override their children.
@@ -2025,8 +2025,8 @@ void STranslation::PreRender()
     TIdentifier theRoot = m_AssetGraph.GetRoot(0);
     ClearDirtySet();
     BuildRenderGraph(theRoot);
-    m_UICContext.SetScaleMode(qt3ds::render::ScaleModes::ExactSize);
-    m_UICContext.SetMatteColor(QT3DSVec4(.13f, .13f, .13f, 1.0f));
+    m_Context.SetScaleMode(qt3ds::render::ScaleModes::ExactSize);
+    m_Context.SetMatteColor(QT3DSVec4(.13f, .13f, .13f, 1.0f));
     QT3DSVec2 theViewportDims(GetViewportDimensions());
     // Ensure the camera points where it should
     if (m_EditCameraEnabled) {
@@ -2043,21 +2043,21 @@ void STranslation::PreRender()
         m_Presentation.m_PresentationDimensions =
             QT3DSVec2((QT3DSF32)thePresSize.x, (QT3DSF32)thePresSize.y);
         QT3DSVec2 theViewportDims(GetViewportDimensions());
-        m_UICContext.SetWindowDimensions(
+        m_Context.SetWindowDimensions(
             qt3ds::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y));
-        m_UICContext.SetPresentationDimensions(
+        m_Context.SetPresentationDimensions(
             qt3ds::render::SWindowDimensions((QT3DSU32)m_Presentation.m_PresentationDimensions.x,
                                            (QT3DSU32)m_Presentation.m_PresentationDimensions.y));
 
         // set if we draw geometry in wireframe mode
-        m_UICContext.SetWireframeMode(CStudioPreferences::IsWireframeModeOn());
+        m_Context.SetWireframeMode(CStudioPreferences::IsWireframeModeOn());
 
         if (m_EditCameraEnabled) {
             m_Presentation.m_PresentationDimensions = theViewportDims;
-            m_UICContext.SetPresentationDimensions(
+            m_Context.SetPresentationDimensions(
                 qt3ds::render::SWindowDimensions((QT3DSU32)theViewportDims.x, (QT3DSU32)theViewportDims.y));
             ::CColor theEditCameraBackground = CStudioPreferences::GetEditViewBackgroundColor();
-            m_UICContext.SetSceneColor(QT3DSVec4(theEditCameraBackground.GetRed() / 255.0f,
+            m_Context.SetSceneColor(QT3DSVec4(theEditCameraBackground.GetRed() / 255.0f,
                                               theEditCameraBackground.GetGreen() / 255.0f,
                                               theEditCameraBackground.GetBlue() / 255.0f, 1.0f));
         } else {
@@ -2067,16 +2067,16 @@ void STranslation::PreRender()
             if (theSceneTranslator) {
                 SScene &theScene = static_cast<SScene &>(theSceneTranslator->GetGraphObject());
                 if (theScene.m_UseClearColor)
-                    m_UICContext.SetSceneColor(QT3DSVec4(theScene.m_ClearColor, 1.0f));
+                    m_Context.SetSceneColor(QT3DSVec4(theScene.m_ClearColor, 1.0f));
                 else
-                    m_UICContext.SetSceneColor(QT3DSVec4(QT3DSVec3(0.0f), 1.0f));
+                    m_Context.SetSceneColor(QT3DSVec4(QT3DSVec3(0.0f), 1.0f));
             }
         }
     }
     if (m_EditCameraEnabled == false && g_StudioApp.IsAuthorZoom()) {
         if (m_Presentation.m_PresentationDimensions.x > theViewportDims.x
             || m_Presentation.m_PresentationDimensions.y > theViewportDims.y) {
-            m_UICContext.SetScaleMode(qt3ds::render::ScaleModes::FitSelected);
+            m_Context.SetScaleMode(qt3ds::render::ScaleModes::FitSelected);
         }
     }
 }
@@ -2279,7 +2279,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
     if (m_Scene) {
         // Note that begin frame is called before we allocate the bounding box and axis widgets so
         // that we can take advantage of the renderer's per-frame-allocator.
-        m_UICContext.BeginFrame();
+        m_Context.BeginFrame();
         // Render the bounding boxes and extra widgets.
         // This is called *before* the render because these sort of appendages need to be added
         // to the layer renderables.
@@ -2350,10 +2350,10 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
                         selectedPath = true;
                         if (!m_PathWidget)
                             m_PathWidget = qt3ds::widgets::IPathWidget::CreatePathWidget(
-                                m_UICContext.GetAllocator(), m_UICContext);
+                                m_Context.GetAllocator(), m_Context);
                         m_PathWidget->SetNode(
                             static_cast<SNode &>(theTranslator->GetGraphObject()));
-                        m_UICContext.GetRenderer().AddRenderWidget(*m_PathWidget);
+                        m_Context.GetRenderer().AddRenderWidget(*m_PathWidget);
                     }
                 }
             }
@@ -2368,7 +2368,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
 
             qt3ds::render::SNode &theNode(
                 static_cast<qt3ds::render::SNode &>(theTranslator->GetGraphObject()));
-            SCamera *theRenderCamera = m_UICContext.GetRenderer().GetCameraForNode(theNode);
+            SCamera *theRenderCamera = m_Context.GetRenderer().GetCameraForNode(theNode);
             bool isActiveCamera = theRenderCamera == (static_cast<SCamera *>(&theNode));
             if (shouldDisplayWidget && isActiveCamera == false) {
                 switch (theToolMode) {
@@ -2379,26 +2379,26 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
                     // Render translation widget
                     if (!m_TranslationWidget)
                         m_TranslationWidget = qt3ds::widgets::IStudioWidget::CreateTranslationWidget(
-                            m_UICContext.GetAllocator());
+                            m_Context.GetAllocator());
                     theNextWidget = m_TranslationWidget.mPtr;
                     break;
                 case STUDIO_TOOLMODE_ROTATE:
                     if (!m_RotationWidget)
                         m_RotationWidget = qt3ds::widgets::IStudioWidget::CreateRotationWidget(
-                            m_UICContext.GetAllocator());
+                            m_Context.GetAllocator());
                     theNextWidget = m_RotationWidget.mPtr;
                     break;
 
                 case STUDIO_TOOLMODE_SCALE:
                     if (!m_ScaleWidget)
                         m_ScaleWidget = qt3ds::widgets::IStudioWidget::CreateScaleWidget(
-                            m_UICContext.GetAllocator());
+                            m_Context.GetAllocator());
                     theNextWidget = m_ScaleWidget.mPtr;
                     break;
                 }
                 if (theNextWidget) {
                     theNextWidget->SetNode(static_cast<SNode &>(theTranslator->GetGraphObject()));
-                    m_UICContext.GetRenderer().AddRenderWidget(*theNextWidget);
+                    m_Context.GetRenderer().AddRenderWidget(*theNextWidget);
                 }
             }
         }
@@ -2421,18 +2421,18 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
             }
         }
 
-        m_Scene->PrepareForRender(GetViewportDimensions(), m_UICContext);
+        m_Scene->PrepareForRender(GetViewportDimensions(), m_Context);
 
-        m_UICContext.RunRenderTasks();
+        m_Context.RunRenderTasks();
 
-        m_Scene->Render(GetViewportDimensions(), m_UICContext, SScene::DoNotClear);
+        m_Scene->Render(GetViewportDimensions(), m_Context, SScene::DoNotClear);
 
         if (inDrawGuides && m_EditCameraEnabled == false && g_StudioApp.IsAuthorZoom() == false) {
             m_GuideContainer.clear();
             // Figure out the matte area.
-            NVRenderRect theContextViewport = m_UICContext.GetContextViewport();
-            NVRenderRect thePresentationViewport = m_UICContext.GetPresentationViewport();
-            m_UICContext.GetRenderContext().SetViewport(theContextViewport);
+            NVRenderRect theContextViewport = m_Context.GetContextViewport();
+            NVRenderRect thePresentationViewport = m_Context.GetPresentationViewport();
+            m_Context.GetRenderContext().SetViewport(theContextViewport);
             QT3DSI32 innerLeft = thePresentationViewport.m_X;
             QT3DSI32 innerRight = thePresentationViewport.m_X + thePresentationViewport.m_Width;
             QT3DSI32 innerBottom = thePresentationViewport.m_Y;
@@ -2494,14 +2494,14 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
                     break;
                 }
             }
-            m_UICContext.GetPixelGraphicsRenderer().Render(
+            m_Context.GetPixelGraphicsRenderer().Render(
                 qt3ds::foundation::toDataRef(m_GuideContainer.data(), m_GuideContainer.size()));
 
             m_GuideContainer.clear();
             m_GuideAllocator.reset();
         }
 
-        m_UICContext.EndFrame();
+        m_Context.EndFrame();
 
         if (m_ZoomRender.hasValue()) {
             RenderZoomRender(*m_ZoomRender);
@@ -2512,7 +2512,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
         /*
         if ( m_PickBuffer )
         {
-            qt3ds::render::NVRenderContext& theRenderContext( m_UICContext.GetRenderContext() );
+            qt3ds::render::NVRenderContext& theRenderContext( m_Context.GetRenderContext() );
             qt3ds::render::STextureDetails thePickDetails = m_PickBuffer->GetTextureDetails();
             theRenderContext.SetViewport( qt3ds::render::NVRenderRect( 0, 0, thePickDetails.m_Width,
         thePickDetails.m_Height ) );
@@ -2528,7 +2528,7 @@ void STranslation::Render(int inWidgetId, bool inDrawGuides)
             theRenderContext.SetBlendingEnabled( false );
             theRenderContext.SetDepthTestEnabled( false );
             theRenderContext.SetDepthWriteEnabled( false );
-            m_UICContext.GetRenderer().RenderQuad( theDimensions, theVP, *m_PickBuffer );
+            m_Context.GetRenderer().RenderQuad( theDimensions, theVP, *m_PickBuffer );
         }*/
     }
 }
@@ -2555,7 +2555,7 @@ void STranslation::DoPrepareForDrag(SNode *inSelectedNode)
     m_MouseDownNode.m_Parent = nullptr;
     m_MouseDownNode.m_FirstChild = nullptr;
     m_MouseDownNode.m_NextSibling = nullptr;
-    SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*inSelectedNode);
+    SCamera *theCamera = m_Context.GetRenderer().GetCameraForNode(*inSelectedNode);
     m_CumulativeRotation = 0.0f;
     if (theCamera == nullptr)
         return;
@@ -2600,12 +2600,12 @@ void STranslation::RenderZoomRender(SZoomRender &inRender)
     SLayer *theLayer(inRender.m_Layer);
     CPt thePoint(inRender.m_Point);
     if (theLayer) {
-        qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer());
+        qt3ds::render::IQt3DSRenderer &theRenderer(m_Context.GetRenderer());
         Option<qt3ds::render::SLayerPickSetup> thePickSetup(
             theRenderer.GetLayerPickSetup(*theLayer, QT3DSVec2((QT3DSF32)thePoint.x, (QT3DSF32)thePoint.y),
                                           qt3ds::render::SWindowDimensions(16, 16)));
         if (thePickSetup.hasValue()) {
-            qt3ds::render::NVRenderContext &theRenderContext(m_UICContext.GetRenderContext());
+            qt3ds::render::NVRenderContext &theRenderContext(m_Context.GetRenderContext());
             theRenderContext.SetViewport(qt3ds::render::NVRenderRect(0, 0, 100, 100));
             theRenderContext.SetScissorRect(qt3ds::render::NVRenderRect(0, 0, 100, 100));
             theRenderContext.SetDepthWriteEnabled(true);
@@ -2621,11 +2621,11 @@ void STranslation::RenderZoomRender(SZoomRender &inRender)
 
 void STranslation::DrawBoundingBox(SNode &inNode, QT3DSVec3 inColor)
 {
-    qt3ds::NVBounds3 theBounds = inNode.GetBounds(m_UICContext.GetBufferManager(),
-                                               m_UICContext.GetPathManager(), true, this);
+    qt3ds::NVBounds3 theBounds = inNode.GetBounds(m_Context.GetBufferManager(),
+                                               m_Context.GetPathManager(), true, this);
     qt3ds::render::IRenderWidget &theBBoxWidget = qt3ds::render::IRenderWidget::CreateBoundingBoxWidget(
-        inNode, theBounds, inColor, m_UICContext.GetRenderer().GetPerFrameAllocator());
-    m_UICContext.GetRenderer().AddRenderWidget(theBBoxWidget);
+        inNode, theBounds, inColor, m_Context.GetRenderer().GetPerFrameAllocator());
+    m_Context.GetRenderer().AddRenderWidget(theBBoxWidget);
 }
 
 void STranslation::DrawLightBoundingBox(SNode &inNode, QT3DSVec3 inColor)
@@ -2639,8 +2639,8 @@ void STranslation::DrawLightBoundingBox(SNode &inNode, QT3DSVec3 inColor)
         qt3ds::QT3DSVec3(-theLight->m_AreaWidth * 0.5f, -theLight->m_AreaHeight * 0.5f, 0.0f),
         qt3ds::QT3DSVec3(theLight->m_AreaWidth * 0.5f, theLight->m_AreaHeight * 0.5f, 0.0f));
     qt3ds::render::IRenderWidget &theBBoxWidget = qt3ds::render::IRenderWidget::CreateBoundingBoxWidget(
-        inNode, theBounds, inColor, m_UICContext.GetRenderer().GetPerFrameAllocator());
-    m_UICContext.GetRenderer().AddRenderWidget(theBBoxWidget);
+        inNode, theBounds, inColor, m_Context.GetRenderer().GetPerFrameAllocator());
+    m_Context.GetRenderer().AddRenderWidget(theBBoxWidget);
 }
 
 void STranslation::DrawAxis(SGraphObjectTranslator &inTranslator)
@@ -2648,8 +2648,8 @@ void STranslation::DrawAxis(SGraphObjectTranslator &inTranslator)
     if (GraphObjectTypes::IsNodeType(inTranslator.GetGraphObject().m_Type)) {
         qt3ds::render::IRenderWidget &theAxisWidget = qt3ds::render::IRenderWidget::CreateAxisWidget(
             static_cast<SNode &>(inTranslator.GetGraphObject()),
-            m_UICContext.GetRenderer().GetPerFrameAllocator());
-        m_UICContext.GetRenderer().AddRenderWidget(theAxisWidget);
+            m_Context.GetRenderer().GetPerFrameAllocator());
+        m_Context.GetRenderer().AddRenderWidget(theAxisWidget);
     } else {
         QT3DS_ASSERT(false);
     }
@@ -2664,16 +2664,16 @@ Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMo
     SLayer *theLayer = GetLayerForNode(theNode);
     if (theLayer && theWidgetTranslator) {
         Option<qt3ds::render::SLayerPickSetup> thePickSetup(
-            m_UICContext.GetRenderer().GetLayerPickSetup(
+            m_Context.GetRenderer().GetLayerPickSetup(
                 *theLayer, QT3DSVec2((QT3DSF32)inMouseCoords.x, (QT3DSF32)inMouseCoords.y),
                 qt3ds::render::SWindowDimensions(4, 4)));
         if (thePickSetup.hasValue()) {
-            qt3ds::render::NVRenderContext &theContext(m_UICContext.GetRenderContext());
+            qt3ds::render::NVRenderContext &theContext(m_Context.GetRenderContext());
             qt3ds::render::NVRenderContextScopedProperty<qt3ds::render::NVRenderFrameBuffer *>
                 __currentrt(theContext, &qt3ds::render::NVRenderContext::GetRenderTarget,
                             &qt3ds::render::NVRenderContext::SetRenderTarget);
             qt3ds::render::NVRenderFrameBuffer *theFBO =
-                m_UICContext.GetResourceManager().AllocateFrameBuffer();
+                m_Context.GetResourceManager().AllocateFrameBuffer();
             const QT3DSU32 fboDims = 8;
             if (!m_PickBuffer) {
                 m_PickBuffer = theContext.CreateTexture2D();
@@ -2682,7 +2682,7 @@ Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMo
                                              qt3ds::render::NVRenderTextureFormats::LuminanceAlpha8);
             }
             qt3ds::render::NVRenderRenderBuffer *theRenderBuffer =
-                m_UICContext.GetResourceManager().AllocateRenderBuffer(
+                m_Context.GetResourceManager().AllocateRenderBuffer(
                     fboDims, fboDims, qt3ds::render::NVRenderRenderBufferFormats::Depth16);
             theFBO->Attach(qt3ds::render::NVRenderFrameBufferAttachments::Color0,
                            qt3ds::render::NVRenderTextureOrRenderBuffer(*m_PickBuffer));
@@ -2703,8 +2703,8 @@ Option<QT3DSU32> STranslation::PickWidget(CPt inMouseCoords, TranslationSelectMo
             m_PixelBuffer.resize(fboDims * fboDims * 3);
             theContext.ReadPixels(theViewport, qt3ds::render::NVRenderReadPixelFormats::RGB8,
                                   m_PixelBuffer);
-            m_UICContext.GetResourceManager().Release(*theFBO);
-            m_UICContext.GetResourceManager().Release(*theRenderBuffer);
+            m_Context.GetResourceManager().Release(*theFBO);
+            m_Context.GetResourceManager().Release(*theRenderBuffer);
             eastl::hash_map<QT3DSU32, QT3DSU32> tallies;
             QT3DSU32 numPixels = fboDims * fboDims;
             for (QT3DSU32 idx = 0; idx < numPixels; ++idx) {
@@ -2779,8 +2779,8 @@ SStudioPickValue STranslation::Pick(CPt inMouseCoords, TranslationSelectMode::En
         }
     }
     if (m_Scene && m_Scene->m_FirstChild) {
-        qt3ds::render::SUICRenderPickResult thePickResult =
-            m_UICContext.GetRenderer().Pick(*m_Scene->m_FirstChild, GetViewportDimensions(),
+        qt3ds::render::Qt3DSRenderPickResult thePickResult =
+            m_Context.GetRenderer().Pick(*m_Scene->m_FirstChild, GetViewportDimensions(),
                                             QT3DSVec2((QT3DSF32)inMouseCoords.x, (QT3DSF32)inMouseCoords.y));
         if (thePickResult.m_HitObject) {
             const SGraphObject &theObject = *thePickResult.m_HitObject;
@@ -2886,21 +2886,21 @@ QT3DSVec3 STranslation::GetIntendedPosition(qt3dsdm::Qt3DSDMInstanceHandle inIns
     if (GraphObjectTypes::IsNodeType(theTranslator->GetGraphObject().m_Type) == false)
         return QT3DSVec3(0, 0, 0);
     SNode *theNode = static_cast<SNode *>(&theTranslator->GetGraphObject());
-    SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*theNode);
+    SCamera *theCamera = m_Context.GetRenderer().GetCameraForNode(*theNode);
     {
         // Get the node's parent
         Qt3DSDMInstanceHandle theParent = m_AssetGraph.GetParent(inInstance);
         SGraphObjectTranslator *theParentTranslator = GetOrCreateTranslator(theParent);
         if (theParentTranslator
             && GraphObjectTypes::IsNodeType(theParentTranslator->GetGraphObject().m_Type))
-            theCamera = m_UICContext.GetRenderer().GetCameraForNode(
+            theCamera = m_Context.GetRenderer().GetCameraForNode(
                 *static_cast<SNode *>(&theParentTranslator->GetGraphObject()));
     }
     if (theCamera == nullptr)
         return QT3DSVec3(0, 0, 0);
 
     QT3DSVec3 theGlobalPos(theNode->GetGlobalPos());
-    return m_UICContext.GetRenderer().UnprojectToPosition(*theCamera, theGlobalPos,
+    return m_Context.GetRenderer().UnprojectToPosition(*theCamera, theGlobalPos,
                                                           QT3DSVec2((QT3DSF32)inPos.x, (QT3DSF32)inPos.y));
 }
 
@@ -2946,7 +2946,7 @@ void STranslation::TranslateSelectedInstanceAlongCameraDirection(
     SNode *theNode = GetSelectedNode();
     if (theNode == nullptr)
         return;
-    SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*theNode);
+    SCamera *theCamera = m_Context.GetRenderer().GetCameraForNode(*theNode);
     if (theCamera == nullptr)
         return;
     QT3DSF32 theYDistance = QT3DSF32(inMouseCoords.y - inOriginalCoords.y);
@@ -2967,7 +2967,7 @@ void STranslation::TranslateSelectedInstance(CPt inOriginalCoords, CPt inMouseCo
     SNode *theNode = GetSelectedNode();
     if (theNode == nullptr)
         return;
-    qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer());
+    qt3ds::render::IQt3DSRenderer &theRenderer(m_Context.GetRenderer());
 
     QT3DSF32 theXDistance = QT3DSF32(inMouseCoords.x - inOriginalCoords.x);
     QT3DSF32 theYDistance = QT3DSF32(inMouseCoords.y - inOriginalCoords.y);
@@ -3076,7 +3076,7 @@ void STranslation::RotateSelectedInstanceAboutCameraDirectionVector(
     SNode *theNode = GetSelectedNode();
     if (theNode == nullptr)
         return;
-    SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*theNode);
+    SCamera *theCamera = m_Context.GetRenderer().GetCameraForNode(*theNode);
     if (theCamera == nullptr)
         return;
 
@@ -3097,7 +3097,7 @@ void STranslation::RotateSelectedInstance(CPt inOriginalCoords, CPt inPreviousCo
     SNode *theNode = GetSelectedNode();
     if (theNode == nullptr)
         return;
-    SCamera *theCamera = m_UICContext.GetRenderer().GetCameraForNode(*theNode);
+    SCamera *theCamera = m_Context.GetRenderer().GetCameraForNode(*theNode);
     if (theCamera == nullptr)
         return;
     // We want to do a similar translation to what we did below but we need to calculate the
@@ -3224,12 +3224,12 @@ STranslation::PrepareWidgetDrag(qt3ds::widgets::StudioWidgetComponentIds::Enum i
     retval.m_ComponentId = inComponentId;
     retval.m_WidgetType = inWidgetId;
     retval.m_WidgetMode = inWidgetMode;
-    qt3ds::render::IUICRenderer &theRenderer(m_UICContext.GetRenderer());
+    qt3ds::render::IQt3DSRenderer &theRenderer(m_Context.GetRenderer());
     retval.m_Renderer = &theRenderer;
     retval.m_Node = &inNode;
     retval.m_Layer = GetLayerForNode(inNode);
     retval.m_Camera = theRenderer.GetCameraForNode(inNode);
-    qt3ds::render::SWindowDimensions theUnsignedDimensions(m_UICContext.GetWindowDimensions());
+    qt3ds::render::SWindowDimensions theUnsignedDimensions(m_Context.GetWindowDimensions());
     QT3DSVec2 theWindowDimensions((QT3DSF32)theUnsignedDimensions.m_Width,
                                (QT3DSF32)theUnsignedDimensions.m_Height);
     if (retval.m_Camera == nullptr || retval.m_Layer == nullptr)
@@ -3237,15 +3237,15 @@ STranslation::PrepareWidgetDrag(qt3ds::widgets::StudioWidgetComponentIds::Enum i
 
     SCamera &theCamera(*retval.m_Camera);
     SLayer &theLayer(*retval.m_Layer);
-    QT3DSVec2 theLayerOriginalCoords = m_UICContext.GetRenderer().GetLayerMouseCoords(
+    QT3DSVec2 theLayerOriginalCoords = m_Context.GetRenderer().GetLayerMouseCoords(
         *retval.m_Layer, QT3DSVec2((QT3DSF32)inOriginalCoords.x, (QT3DSF32)inOriginalCoords.y),
         theWindowDimensions, true);
 
-    QT3DSVec2 theLayerMouseCoords = m_UICContext.GetRenderer().GetLayerMouseCoords(
+    QT3DSVec2 theLayerMouseCoords = m_Context.GetRenderer().GetLayerMouseCoords(
         *retval.m_Layer, QT3DSVec2((QT3DSF32)inMouseCoords.x, (QT3DSF32)inMouseCoords.y),
         theWindowDimensions, true);
 
-    QT3DSVec2 thePreviousLayerMouseCoords = m_UICContext.GetRenderer().GetLayerMouseCoords(
+    QT3DSVec2 thePreviousLayerMouseCoords = m_Context.GetRenderer().GetLayerMouseCoords(
         *retval.m_Layer, QT3DSVec2((QT3DSF32)inPreviousMouseCoords.x, (QT3DSF32)inPreviousMouseCoords.y),
         theWindowDimensions, true);
     QT3DSMat44 theGlobalTransform(QT3DSMat44::createIdentity());
@@ -3831,9 +3831,9 @@ SNode *STranslation::GetEditCameraLayer()
 
 PickTargetAreas::Enum STranslation::GetPickArea(CPt inPoint)
 {
-    qt3ds::render::NVRenderRectF displayViewport = m_UICContext.GetDisplayViewport();
+    qt3ds::render::NVRenderRectF displayViewport = m_Context.GetDisplayViewport();
     QT3DSVec2 thePickPoint((QT3DSF32)inPoint.x,
-                        m_UICContext.GetWindowDimensions().m_Height - (QT3DSF32)inPoint.y);
+                        m_Context.GetWindowDimensions().m_Height - (QT3DSF32)inPoint.y);
     QT3DSF32 left = displayViewport.m_X;
     QT3DSF32 right = displayViewport.m_X + displayViewport.m_Width;
     QT3DSF32 top = displayViewport.m_Y + displayViewport.m_Height;
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h
index c6247e2c..94a4a426 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.h
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h
@@ -289,7 +289,7 @@ namespace studio {
 
     struct SDragPreparationResult
     {
-        qt3ds::render::IUICRenderer *m_Renderer;
+        qt3ds::render::IQt3DSRenderer *m_Renderer;
         SNode *m_Node;
         SLayer *m_Layer;
         SCamera *m_Camera;
@@ -323,7 +323,7 @@ namespace studio {
         SPathAnchorDragInitialValue() {}
     };
 
-    struct STranslation : public qt3ds::render::IUICRenderNodeFilter
+    struct STranslation : public qt3ds::render::IQt3DSRenderNodeFilter
     {
         typedef eastl::pair<qt3dsdm::Qt3DSDMInstanceHandle, SGraphObjectTranslator *>
             THandleTranslatorPair;
@@ -334,7 +334,7 @@ namespace studio {
         typedef nvhash_map<qt3dsdm::Qt3DSDMInstanceHandle, THandleTranslatorPairList, eastl::hash<int>>
             TInstanceToTranslatorMap;
         IStudioRenderer &m_Renderer;
-        IUICRenderContext &m_UICContext;
+        IQt3DSRenderContext &m_Context;
         CDoc &m_Doc;
         IDocumentReader &m_Reader;
         SComposerObjectDefinitions &m_ObjectDefinitions;
@@ -389,7 +389,7 @@ namespace studio {
         QT3DSVec4 m_guideFillColor;
         QT3DSVec4 m_selectedGuideFillColor;
 
-        STranslation(IStudioRenderer &inRenderer, IUICRenderContext &inContext);
+        STranslation(IStudioRenderer &inRenderer, IQt3DSRenderContext &inContext);
         void MarkBeginComponentSeconds(qt3dsdm::Qt3DSDMSlideHandle) { ++m_ComponentSecondsDepth; }
 
         void MarkComponentSeconds(qt3dsdm::Qt3DSDMSlideHandle)
@@ -466,7 +466,7 @@ namespace studio {
                 QT3DSVec3 colorVec(color.GetRed() / 255.f,
                                    color.GetGreen() / 255.f,
                                    color.GetBlue() / 255.f);
-                m_UICContext.GetRenderer().RenderLayerRect(
+                m_Context.GetRenderer().RenderLayerRect(
                     static_cast<SLayer &>(inTranslator.GetGraphObject()), colorVec);
             }
         }
@@ -626,7 +626,7 @@ namespace studio {
 
         void RenderZoomRender(SZoomRender &inRender);
 
-        // IUICRenderNodeFilter
+        // IQt3DSRenderNodeFilter
         bool IncludeNode(const SNode &inNode) override;
 
         PickTargetAreas::Enum GetPickArea(CPt inPoint);
diff --git a/src/Authoring/Studio/Render/WGLRenderContext.cpp b/src/Authoring/Studio/Render/WGLRenderContext.cpp
index 7759c75d..23ca77d4 100644
--- a/src/Authoring/Studio/Render/WGLRenderContext.cpp
+++ b/src/Authoring/Studio/Render/WGLRenderContext.cpp
@@ -49,7 +49,7 @@
 /**
  *	Constructor:	Creates the object
  */
-CWGLRenderContext::CWGLRenderContext(UICWindow inWindow)
+CWGLRenderContext::CWGLRenderContext(Qt3DSWindow inWindow)
     : m_qtContext(0)
     , m_Foundation(Q3DStudio::Foundation::SStudioFoundation::Create())
 {
@@ -71,7 +71,7 @@ CWGLRenderContext::~CWGLRenderContext()
  *	@param	inRenderWindow		window handle
  *	@param	inWindowSize		window size
  */
-void CWGLRenderContext::Open(UICWindow inRenderWindow)
+void CWGLRenderContext::Open(Qt3DSWindow inRenderWindow)
 {
     // needed because NVidia cards will fail all the system functions below if there is no window.
     // note: the only time inRenderWindow is nullptr is when CThumbnailGenerator is used. Bug3075.
diff --git a/src/Authoring/Studio/Render/WGLRenderContext.h b/src/Authoring/Studio/Render/WGLRenderContext.h
index a6e5bf79..53e259f7 100644
--- a/src/Authoring/Studio/Render/WGLRenderContext.h
+++ b/src/Authoring/Studio/Render/WGLRenderContext.h
@@ -79,7 +79,7 @@ protected:
 
     // Construction
 public:
-    CWGLRenderContext(UICWindow inRenderWindow);
+    CWGLRenderContext(Qt3DSWindow inRenderWindow);
     ~CWGLRenderContext();
 
     // Access
@@ -98,7 +98,7 @@ public:
 
     // Implementation
 protected:
-    void Open(UICWindow inRenderWindow);
+    void Open(Qt3DSWindow inRenderWindow);
 
     void OpenNormalContext(QOpenGLWidget* inRenderWindow);
     void Close();
diff --git a/src/Authoring/Studio/Utils/CmdLineParser.cpp b/src/Authoring/Studio/Utils/CmdLineParser.cpp
index afe94754..f2567f70 100644
--- a/src/Authoring/Studio/Utils/CmdLineParser.cpp
+++ b/src/Authoring/Studio/Utils/CmdLineParser.cpp
@@ -126,7 +126,7 @@ void CCmdLineParser::ParseArguments(int inArgc, wchar_t **inArgv)
     // If there were no switches modifying m_ExecutionMode, default execution mode
     // according to the file extension found on m_Filename.
     if (0 == m_ExecutionQueue.size()) {
-        CUICFile theFile(m_Filename);
+        Qt3DSFile theFile(m_Filename);
         Q3DStudio::CString theExtension = "." + theFile.GetExtension();
         if (theExtension.CompareNoCase(::LoadResourceString(IDS_FILE_EXT_UIP)))
             m_ExecutionQueue.push_back(OPEN_FILE);
diff --git a/src/Authoring/Studio/Utils/MouseCursor.h b/src/Authoring/Studio/Utils/MouseCursor.h
index a346d597..e4b8d8d9 100644
--- a/src/Authoring/Studio/Utils/MouseCursor.h
+++ b/src/Authoring/Studio/Utils/MouseCursor.h
@@ -49,26 +49,26 @@
 class CMouseCursor
 {
 public:
-    typedef long TUICMouseCursor;
+    typedef long Qt3DSMouseCursor;
 
-    static const TUICMouseCursor CURSOR_ARROW;
-    static const TUICMouseCursor CURSOR_WAIT;
-    static const TUICMouseCursor CURSOR_RESIZE_LEFTRIGHT;
-    static const TUICMouseCursor CURSOR_RESIZE_UPDOWN;
-    static const TUICMouseCursor CURSOR_GROUP_MOVE;
-    static const TUICMouseCursor CURSOR_GROUP_ROTATE;
-    static const TUICMouseCursor CURSOR_GROUP_SCALE;
-    static const TUICMouseCursor CURSOR_ITEM_MOVE;
-    static const TUICMouseCursor CURSOR_ITEM_ROTATE;
-    static const TUICMouseCursor CURSOR_ITEM_SCALE;
-    static const TUICMouseCursor CURSOR_EDIT_CAMERA_PAN;
-    static const TUICMouseCursor CURSOR_EDIT_CAMERA_ROTATE;
-    static const TUICMouseCursor CURSOR_EDIT_CAMERA_ZOOM;
-    static const TUICMouseCursor CURSOR_BLANK;
-    static const TUICMouseCursor CURSOR_DROP_INVALID;
-    static const TUICMouseCursor CURSOR_DROP_MOVE;
-    static const TUICMouseCursor CURSOR_DROP_COPY;
-    static const TUICMouseCursor CURSOR_IBEAM;
+    static const Qt3DSMouseCursor CURSOR_ARROW;
+    static const Qt3DSMouseCursor CURSOR_WAIT;
+    static const Qt3DSMouseCursor CURSOR_RESIZE_LEFTRIGHT;
+    static const Qt3DSMouseCursor CURSOR_RESIZE_UPDOWN;
+    static const Qt3DSMouseCursor CURSOR_GROUP_MOVE;
+    static const Qt3DSMouseCursor CURSOR_GROUP_ROTATE;
+    static const Qt3DSMouseCursor CURSOR_GROUP_SCALE;
+    static const Qt3DSMouseCursor CURSOR_ITEM_MOVE;
+    static const Qt3DSMouseCursor CURSOR_ITEM_ROTATE;
+    static const Qt3DSMouseCursor CURSOR_ITEM_SCALE;
+    static const Qt3DSMouseCursor CURSOR_EDIT_CAMERA_PAN;
+    static const Qt3DSMouseCursor CURSOR_EDIT_CAMERA_ROTATE;
+    static const Qt3DSMouseCursor CURSOR_EDIT_CAMERA_ZOOM;
+    static const Qt3DSMouseCursor CURSOR_BLANK;
+    static const Qt3DSMouseCursor CURSOR_DROP_INVALID;
+    static const Qt3DSMouseCursor CURSOR_DROP_MOVE;
+    static const Qt3DSMouseCursor CURSOR_DROP_COPY;
+    static const Qt3DSMouseCursor CURSOR_IBEAM;
 
     CMouseCursor();
     virtual ~CMouseCursor();
@@ -76,7 +76,7 @@ public:
     void Show();
     void Hide();
     void SetCursorPos(long inXPos, long inYPos);
-    bool Load(TUICMouseCursor inCursor);
+    bool Load(Qt3DSMouseCursor inCursor);
 
 protected:
     void Destroy();
diff --git a/src/Authoring/Studio/Utils/ResourceCache.cpp b/src/Authoring/Studio/Utils/ResourceCache.cpp
index 5a32ec18..e42e1571 100644
--- a/src/Authoring/Studio/Utils/ResourceCache.cpp
+++ b/src/Authoring/Studio/Utils/ResourceCache.cpp
@@ -105,10 +105,10 @@ QPixmap CResourceCache::GetBitmap(const QString &inName)
  * @param inResourceID ID of the cursor to be loaded (see SCursor.h)
  * @return Pointer to the cursor, or NULL if the cursor could not be loaded
  */
-QCursor CResourceCache::GetCursor(CMouseCursor::TUICMouseCursor inResourceID)
+QCursor CResourceCache::GetCursor(CMouseCursor::Qt3DSMouseCursor inResourceID)
 {
     CMouseCursor *theCursor = NULL;
-    CMouseCursor::TUICMouseCursor theKey = inResourceID;
+    CMouseCursor::Qt3DSMouseCursor theKey = inResourceID;
 
     TCursorMap::iterator thePos = m_Cursors.find(theKey);
     if (thePos != m_Cursors.end()) {
diff --git a/src/Authoring/Studio/Utils/ResourceCache.h b/src/Authoring/Studio/Utils/ResourceCache.h
index 6580913f..1a23f232 100644
--- a/src/Authoring/Studio/Utils/ResourceCache.h
+++ b/src/Authoring/Studio/Utils/ResourceCache.h
@@ -44,7 +44,7 @@ class CResImage;
 class CResourceCache
 {
     typedef std::map<QString, QPixmap> TImageMap;
-    typedef std::map<CMouseCursor::TUICMouseCursor, CMouseCursor *> TCursorMap;
+    typedef std::map<CMouseCursor::Qt3DSMouseCursor, CMouseCursor *> TCursorMap;
 
 public:
     CResourceCache();
@@ -53,7 +53,7 @@ public:
     static CResourceCache *GetInstance();
 
     QPixmap GetBitmap(const QString &inName);
-    QCursor GetCursor(CMouseCursor::TUICMouseCursor inResourceID);
+    QCursor GetCursor(CMouseCursor::Qt3DSMouseCursor inResourceID);
 
     void Clear();
 
diff --git a/src/Authoring/Studio/Utils/StringLoader.cpp b/src/Authoring/Studio/Utils/StringLoader.cpp
index 73a5324f..912198c5 100644
--- a/src/Authoring/Studio/Utils/StringLoader.cpp
+++ b/src/Authoring/Studio/Utils/StringLoader.cpp
@@ -80,7 +80,7 @@ Q3DStudio::CString CStringLoader::LoadResourceString(long inStringID)
  * All .stro files in the directory will be processed for strings.
  * @param inDirectory the directory that should be read for strings.
  */
-void CStringLoader::LoadStrings(const CUICFile &inDirectory)
+void CStringLoader::LoadStrings(const Qt3DSFile &inDirectory)
 {
     s_GlobalInstance.LoadResourceStrings(inDirectory);
 }
@@ -91,7 +91,7 @@ void CStringLoader::LoadStrings(const CUICFile &inDirectory)
  * All .stro files in the directory will be processed for strings.
  * @param inDirectory the directory that should be read for strings.
  */
-void CStringLoader::LoadResourceStrings(const CUICFile &inDirectory)
+void CStringLoader::LoadResourceStrings(const Qt3DSFile &inDirectory)
 {
     UnloadResourceStrings();
 
@@ -104,7 +104,7 @@ void CStringLoader::LoadResourceStrings(const CUICFile &inDirectory)
     // Go through all the files in the directory and process them.
     CFileIterator theFiles = inDirectory.GetSubItems();
     for (; !theFiles.IsDone(); ++theFiles) {
-        CUICFile theFile = theFiles.GetCurrent();
+        Qt3DSFile theFile = theFiles.GetCurrent();
         Q3DStudio::CString theFilename = theFile.GetAbsolutePath();
         // Only process .stro files.
         if (theFilename.Find(theExtension) == theFilename.Length() - theExtension.Length()) {
diff --git a/src/Authoring/Studio/Utils/StringLoader.h b/src/Authoring/Studio/Utils/StringLoader.h
index 303337f7..cb269c40 100644
--- a/src/Authoring/Studio/Utils/StringLoader.h
+++ b/src/Authoring/Studio/Utils/StringLoader.h
@@ -40,11 +40,11 @@ public:
     virtual ~CStringLoader();
 
     static Q3DStudio::CString LoadString(long inStringID);
-    static void LoadStrings(const CUICFile &inDirectory);
+    static void LoadStrings(const Qt3DSFile &inDirectory);
     static void UnloadStrings();
 
     Q3DStudio::CString LoadResourceString(long inStringID);
-    void LoadResourceStrings(const CUICFile &inDirectory);
+    void LoadResourceStrings(const Qt3DSFile &inDirectory);
     void UnloadResourceStrings();
 
 protected:
diff --git a/src/Authoring/Studio/Utils/StudioUtils.cpp b/src/Authoring/Studio/Utils/StudioUtils.cpp
index 34522198..16eebd56 100644
--- a/src/Authoring/Studio/Utils/StudioUtils.cpp
+++ b/src/Authoring/Studio/Utils/StudioUtils.cpp
@@ -73,7 +73,7 @@ Q3DStudio::CString FormatTimeString(long inTimeMS)
     // Remainder is MS value
 
     // Format the string
-    theTimeString.Format(_UIC("%d:%0.2d.%0.2d"), theMM, theSS, theTimeMS / 10);
+    theTimeString.Format(_LSTR("%d:%0.2d.%0.2d"), theMM, theSS, theTimeMS / 10);
 
     // If the original time was negative, append the "-" to the front of the time string.
     if (theNegativeFlag) {
diff --git a/src/Authoring/Studio/Workspace/Dialogs.h b/src/Authoring/Studio/Workspace/Dialogs.h
index f6ef0d83..9b00ec95 100644
--- a/src/Authoring/Studio/Workspace/Dialogs.h
+++ b/src/Authoring/Studio/Workspace/Dialogs.h
@@ -111,25 +111,25 @@ public:
     static bool IsPathBufferExtension(const wchar_t *inExt);
     static bool IsSoundFileExtension(const wchar_t *inExt);
 
-    CUICFile GetExportChoice(const Q3DStudio::CString &inExtension,
+    Qt3DSFile GetExportChoice(const Q3DStudio::CString &inExtension,
                              const Q3DStudio::CString &inDefaultName);
 
-    std::pair<CUICFile, bool> GetSaveAsChoice(const Q3DStudio::CString &inDialogTitle = "",
+    std::pair<Qt3DSFile, bool> GetSaveAsChoice(const Q3DStudio::CString &inDialogTitle = "",
                                               bool inFilenameUntitled = false);
     // Returns pair of file along with a boolean indicating the state of the create
     // new directory checkbox.
-    std::pair<CUICFile, bool>
+    std::pair<Qt3DSFile, bool>
     GetNewDocumentChoice(const Q3DStudio::CString &inInitialDirectory = Q3DStudio::CString());
-    CUICFile GetFileOpenChoice(const Q3DStudio::CString &inInitialDirectory = Q3DStudio::CString());
+    Qt3DSFile GetFileOpenChoice(const Q3DStudio::CString &inInitialDirectory = Q3DStudio::CString());
 
     void DisplayImportFailed(const QUrl &inURL, const QString &inDescription,
                              bool inWarningsOnly);
-    void DisplayLoadingPresentationFailed(const CUICFile &inPresentation, long inErrorIDS = -1);
+    void DisplayLoadingPresentationFailed(const Qt3DSFile &inPresentation, long inErrorIDS = -1);
     void DisplaySavingPresentationFailed();
-    void DisplaySaveReadOnlyFailed(const CUICFile &inSavedLocation);
-    CUICMessageBox::EMessageBoxReturn DisplayMessageBox(const Q3DStudio::CString &inTitle,
+    void DisplaySaveReadOnlyFailed(const Qt3DSFile &inSavedLocation);
+    Qt3DSMessageBox::EMessageBoxReturn DisplayMessageBox(const Q3DStudio::CString &inTitle,
                                                         const Q3DStudio::CString &inText,
-                                                        CUICMessageBox::EMessageBoxIcon inIcon,
+                                                        Qt3DSMessageBox::EMessageBoxIcon inIcon,
                                                         bool inShowCancel);
     int DisplayChoiceBox(const Q3DStudio::CString &inTitle, const Q3DStudio::CString &inText,
                          int inIcon);
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
index 8f21b149..83959377 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
 #endif
 
 CStudioApp g_StudioApp;
-long g_UICErrorCode = 0;
+long g_ErrorCode = 0;
 
 using namespace Q3DStudio;
 
@@ -249,7 +249,7 @@ void CStudioApp::PerformShutdown()
     CStringLoader::UnloadStrings();
 
     // Get rid of the temp files
-    CUICFile::ClearCurrentTempCache();
+    Qt3DSFile::ClearCurrentTempCache();
 
     qApp->exit();
 }
@@ -273,7 +273,7 @@ BOOL CStudioApp::InitInstance(int argc, char* argv[])
     // Load the strings used by the app gui
     // This needs to occur prior to parsing command line arguments
     // since access to the strings are required by some of the cases
-    CUICFile theResDir(CString::fromQString(resourcePath() + QStringLiteral("/strings")));
+    Qt3DSFile theResDir(CString::fromQString(resourcePath() + QStringLiteral("/strings")));
     CStringLoader::LoadStrings(theResDir);
     qCInfo(qt3ds::TRACE_INFO) << "Version: "
                               << CStudioPreferences::GetVersionString().GetCharStar();
@@ -314,7 +314,7 @@ BOOL CStudioApp::InitInstance(int argc, char* argv[])
 
     CFilePath thePreferencesPath = CFilePath::GetUserApplicationDirectory();
     thePreferencesPath = CFilePath::CombineBaseAndRelative(
-        thePreferencesPath, CFilePath(L"Qt3DSomposer\\Preferences.setting"));
+        thePreferencesPath, CFilePath(L"Qt3DSComposer\\Preferences.setting"));
     CPreferences::SetPreferencesFile(thePreferencesPath);
 
 #ifdef KDAB_TEMPORARILY_REMOVED
@@ -444,10 +444,10 @@ int CStudioApp::Run()
         PerformShutdown();
 
         QT3DS_LOGSTOP;
-    } catch (CUICExceptionClass &inException) {
-        g_UICErrorCode = inException.GetErrorCode();
+    } catch (Qt3DSExceptionClass &inException) {
+        g_ErrorCode = inException.GetErrorCode();
         throw;
-    } catch (qt3dsdm::UICDMError &uicdmError) {
+    } catch (qt3dsdm::Qt3DSDMError &uicdmError) {
         Q_UNUSED(uicdmError);
 
 #ifdef KDAB_TEMPORARILY_REMOVED
@@ -468,7 +468,7 @@ bool CStudioApp::HandleWelcomeRes(int res, bool recursive)
     int theReturn = true;
     switch (res) {
     case StudioTutorialWidget::createNewResult: {
-        std::pair<CUICFile, bool> theFile = m_Dialogs->
+        std::pair<Qt3DSFile, bool> theFile = m_Dialogs->
             GetNewDocumentChoice(Q3DStudio::CString("."));
         if (theFile.first.GetPath() != "") {
             m_Core->OnNewDocument(theFile.first, theFile.second);
@@ -493,19 +493,19 @@ bool CStudioApp::HandleWelcomeRes(int res, bool recursive)
         // - failing all previous, show Qt3DStudio dir
         Q3DStudio::CFilePath filePath;
 
-        filePath = CUICFile::GetApplicationDirectory().GetPath()+
+        filePath = Qt3DSFile::GetApplicationDirectory().GetPath()+
                 Q3DStudio::CString("../examples/qmldynamickeyframes/presentation");
 
         if (!filePath.Exists()) {
-            filePath = CUICFile::GetApplicationDirectory().GetPath()+
+            filePath = Qt3DSFile::GetApplicationDirectory().GetPath()+
                     Q3DStudio::CString("../examples");
         }
         if (!filePath.Exists()) {
-            filePath =  CUICFile::GetApplicationDirectory().GetPath()+
+            filePath =  Qt3DSFile::GetApplicationDirectory().GetPath()+
                     Q3DStudio::CString(".");
         }
 
-        CUICFile theFile = m_Dialogs->GetFileOpenChoice(filePath);
+        Qt3DSFile theFile = m_Dialogs->GetFileOpenChoice(filePath);
 
         if (theFile.GetPath() != "") {
             OnLoadDocument(theFile);
@@ -592,7 +592,7 @@ bool CStudioApp::ShowStartupDialog()
             break;
 
         case CStartupDlg::EStartupChoice_NewDoc: {
-            std::pair<CUICFile, bool> theFile = m_Dialogs->
+            std::pair<Qt3DSFile, bool> theFile = m_Dialogs->
                 GetNewDocumentChoice(theMostRecentDirectory);
             if (theFile.first.GetPath() != "") {
                 m_Core->OnNewDocument(theFile.first, theFile.second);
@@ -604,7 +604,7 @@ bool CStudioApp::ShowStartupDialog()
         } break;
 
         case CStartupDlg::EStartupChoice_OpenDoc: {
-            CUICFile theFile = m_Dialogs->GetFileOpenChoice(theMostRecentDirectory);
+            Qt3DSFile theFile = m_Dialogs->GetFileOpenChoice(theMostRecentDirectory);
             if (theFile.GetPath() != "") {
                 OnLoadDocument(theFile);
                 theReturn = true;
@@ -615,7 +615,7 @@ bool CStudioApp::ShowStartupDialog()
         } break;
 
         case CStartupDlg::EStartupChoice_OpenRecent: {
-            CUICFile theFile = theStartupDlg.GetRecentDoc();
+            Qt3DSFile theFile = theStartupDlg.GetRecentDoc();
             if (theFile.GetPath() != "") {
                 OnLoadDocument(theFile);
                 // throw SlideNotFound( L"");
@@ -773,7 +773,7 @@ struct SIDeletingReferencedObjectHandler : public Q3DStudio::IDeletingReferenced
         Q3DStudio::CString theMessage;
         theMessage.Format(theFormat, static_cast<const wchar_t *>(inDescription));
 
-        m_Dialogs.DisplayMessageBox(theTitle, theMessage, CUICMessageBox::ICON_WARNING, false);
+        m_Dialogs.DisplayMessageBox(theTitle, theMessage, Qt3DSMessageBox::ICON_WARNING, false);
     }
 };
 
@@ -841,12 +841,12 @@ void CStudioApp::StudioUnhandledCrashHandler(EXCEPTION_POINTERS *pExPtrs)
 
     CStackOps::GetExceptionStackTrace(theTraceBuffer, sizeof(theTraceBuffer),
                                       pExPtrs->ContextRecord);
-    if (g_UICErrorCode != 0) {
-        // switch (g_UICErrorCode)
+    if (g_ErrorCode != 0) {
+        // switch (g_ErrorCode)
         //{
         //	default:
         Q3DStudio::CString description;
-        description.Format(_UIC("Custom error 0x%X "), g_UICErrorCode);
+        description.Format(_LSTR("Custom error 0x%X "), g_ErrorCode);
         errorMessage = CStackOps::GetExceptionDescription(description, pExPtrs);
         //		break;
         //}
@@ -869,7 +869,7 @@ void CStudioApp::StudioUnhandledCrashHandler(EXCEPTION_POINTERS *pExPtrs)
         theSaveFile = theSaveFilePtr->m_Path;
     }
     theSaveFile.DeleteThisFile();
-    theDoc.SaveDocument(CUICFile(theSaveFile));
+    theDoc.SaveDocument(Qt3DSFile(theSaveFile));
     qCInfo(qt3ds::TRACE_INFO) << "Project successfully saved: " << theSaveFile.GetCharStar();
 
     ::CString fileSaveLocationMessage;
@@ -1188,7 +1188,7 @@ void CStudioApp::PlaybackRewind()
 void CStudioApp::OnRevert()
 {
     if (!m_Core->GetDoc()->IsModified() || m_Dialogs->ConfirmRevert()) {
-        CUICFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
+        Qt3DSFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
         OnLoadDocument(theCurrentDoc);
     }
 }
@@ -1206,7 +1206,7 @@ bool CStudioApp::CanRevert()
 /**
  * Handles the recent list.
  */
-void CStudioApp::OnFileOpenRecent(const CUICFile &inDocument)
+void CStudioApp::OnFileOpenRecent(const Qt3DSFile &inDocument)
 {
     if (PerformSavePrompt())
         OnLoadDocument(inDocument);
@@ -1429,7 +1429,7 @@ void CStudioApp::RegisterGlobalKeyboardShortcuts(CHotKeys *inShortcutHandler)
  */
 bool CStudioApp::OnSave()
 {
-    CUICFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
+    Qt3DSFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
     if (!theCurrentDoc.IsFile()) {
         return OnSaveAs();
     } else if (!theCurrentDoc.CanWrite()) {
@@ -1450,7 +1450,7 @@ bool CStudioApp::OnSave()
  */
 bool CStudioApp::OnSaveAs()
 {
-    CUICFile theFile = m_Dialogs->GetSaveAsChoice().first;
+    Qt3DSFile theFile = m_Dialogs->GetSaveAsChoice().first;
     if (theFile.GetPath() != "") {
         m_Core->OnSaveDocument(theFile);
         return true;
@@ -1467,7 +1467,7 @@ bool CStudioApp::OnSaveAs()
  */
 bool CStudioApp::OnSaveCopy()
 {
-    CUICFile theFile = m_Dialogs->GetSaveAsChoice().first;
+    Qt3DSFile theFile = m_Dialogs->GetSaveAsChoice().first;
     if (theFile.GetPath() != "") {
         // Send in a "true" to teh save function to indicate this is a copy
         m_Core->OnSaveDocument(theFile, true);
@@ -1484,7 +1484,7 @@ bool CStudioApp::OnSaveCopy()
  * @param inShowStartupDialogOnError true to show startup dialog if loading document is error
  * @return true if loading was successful
  */
-bool CStudioApp::OnLoadDocument(const CUICFile &inDocument, bool inShowStartupDialogOnError)
+bool CStudioApp::OnLoadDocument(const Qt3DSFile &inDocument, bool inShowStartupDialogOnError)
 {
     m_Core->GetDispatch()->FireOnProgressBegin(CString::fromQString(QObject::tr("Loading ")),
                                                inDocument.GetName());
@@ -1586,7 +1586,7 @@ void CStudioApp::SaveUIAFile()
  * Because of the nature of the error reporting, OnLoadDocument has to have
  * a certain structure that limits it (C type variables, no object destructors).
  */
-void CStudioApp::OnLoadDocumentCatcher(const CUICFile &inDocument)
+void CStudioApp::OnLoadDocumentCatcher(const Qt3DSFile &inDocument)
 {
     {
         CDispatchDataModelNotificationScope __scope(*m_Core->GetDispatch());
@@ -1602,7 +1602,7 @@ void CStudioApp::OnLoadDocumentCatcher(const CUICFile &inDocument)
 void CStudioApp::OnFileOpen()
 {
     if (PerformSavePrompt()) {
-        CUICFile theFile = m_Dialogs->GetFileOpenChoice();
+        Qt3DSFile theFile = m_Dialogs->GetFileOpenChoice();
         if (theFile.GetPath() != "")
             OnLoadDocument(theFile);
     }
@@ -1612,7 +1612,7 @@ using namespace std;
 void CStudioApp::OnFileNew()
 {
     if (PerformSavePrompt()) {
-        pair<CUICFile, bool> theFile = m_Dialogs->GetNewDocumentChoice();
+        pair<Qt3DSFile, bool> theFile = m_Dialogs->GetNewDocumentChoice();
         if (theFile.first.GetPath() != "")
             m_Core->OnNewDocument(theFile.first, theFile.second);
     }
@@ -1668,7 +1668,7 @@ void CStudioApp::OnPasteFail()
 void CStudioApp::OnBuildconfigurationFileParseFail(const Q3DStudio::CString &inMessage)
 {
     m_Dialogs->DisplayMessageBox(::LoadResourceString(IDS_BUILDCONFIGS_ERROR_TITLE), inMessage,
-                                 CUICMessageBox::ICON_ERROR, false);
+                                 Qt3DSMessageBox::ICON_ERROR, false);
 }
 
 void CStudioApp::OnSaveFail(bool inKnownError)
@@ -1691,7 +1691,7 @@ void CStudioApp::OnErrorFail(const Q3DStudio::CString &inText)
 {
     qCCritical(qt3ds::INTERNAL_ERROR) << inText.GetCharStar();
     m_Dialogs->DisplayMessageBox(::LoadResourceString(IDS_PROJNAME), inText,
-                                 CUICMessageBox::ICON_ERROR, false);
+                                 Qt3DSMessageBox::ICON_ERROR, false);
 }
 
 void CStudioApp::OnRefreshResourceFail(const Q3DStudio::CString &inResourceName,
@@ -1715,9 +1715,9 @@ void CStudioApp::OnPresentationModifiedExternally()
 {
     int theUserChoice = m_Dialogs->DisplayChoiceBox(
         ::LoadResourceString(IDS_TITLE_WARNING),
-        ::LoadResourceString(IDS_PRESENTATION_MODIFIED_EXTERNALLY), CUICMessageBox::ICON_WARNING);
+        ::LoadResourceString(IDS_PRESENTATION_MODIFIED_EXTERNALLY), Qt3DSMessageBox::ICON_WARNING);
     if (theUserChoice == IDYES) {
-        CUICFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
+        Qt3DSFile theCurrentDoc = m_Core->GetDoc()->GetDocumentPath();
         OnLoadDocument(theCurrentDoc);
     }
 }
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.h b/src/Authoring/Studio/_Win/Application/StudioApp.h
index 78ca679e..46cd7107 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.h
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.h
@@ -184,7 +184,7 @@ public:
     void PlaybackRewind();
     void OnRevert();
     bool CanRevert();
-    void OnFileOpenRecent(const CUICFile &inDocument);
+    void OnFileOpenRecent(const Qt3DSFile &inDocument);
     bool PerformSavePrompt();
     void PlaybackStop();
     void AdvanceTime();
@@ -197,8 +197,8 @@ public:
     bool OnSave();
     bool OnSaveAs();
     bool OnSaveCopy();
-    bool OnLoadDocument(const CUICFile &inDocument, bool inShowStartupDialogOnError = true);
-    void OnLoadDocumentCatcher(const CUICFile &inLocation);
+    bool OnLoadDocument(const Qt3DSFile &inDocument, bool inShowStartupDialogOnError = true);
+    void OnLoadDocumentCatcher(const Qt3DSFile &inLocation);
     void OnFileOpen();
     void OnFileNew();
     bool IsAuthorZoom();
diff --git a/src/Authoring/Studio/_Win/DragNDrop/DropProxy.cpp b/src/Authoring/Studio/_Win/DragNDrop/DropProxy.cpp
index f05eea76..0ed794ce 100644
--- a/src/Authoring/Studio/_Win/DragNDrop/DropProxy.cpp
+++ b/src/Authoring/Studio/_Win/DragNDrop/DropProxy.cpp
@@ -109,10 +109,10 @@ CDropSource *CDropProxy::GetDropSource(const QMimeData *inDataObject, long inFla
                 // Get the filename of the object being dragged
                 QString theFilename = inDataObject->urls().at(inItem).toLocalFile();
 
-                CUICFile theFile(Q3DStudio::CString::fromQString(theFilename));
+                Qt3DSFile theFile(Q3DStudio::CString::fromQString(theFilename));
                 // Dragging a single file
                 theDropSource =
-                    CDropSourceFactory::Create(QT3DS_FLAVOR_FILE, &theFile, sizeof(CUICFile *));
+                    CDropSourceFactory::Create(QT3DS_FLAVOR_FILE, &theFile, sizeof(Qt3DSFile *));
             }
         }
     } break;
diff --git a/src/Authoring/Studio/_Win/UI/PlayerContainerWnd.cpp b/src/Authoring/Studio/_Win/UI/PlayerContainerWnd.cpp
index b3b87714..23e7b0b8 100644
--- a/src/Authoring/Studio/_Win/UI/PlayerContainerWnd.cpp
+++ b/src/Authoring/Studio/_Win/UI/PlayerContainerWnd.cpp
@@ -349,7 +349,7 @@ void CPlayerContainerWnd::mouseReleaseEvent(QMouseEvent *event)
 void CPlayerContainerWnd::mouseMoveEvent(QMouseEvent* event)
 {
     if (m_IsMouseDown) {
-        UICPROFILE(OnMouseMove);
+        QT3DS_PROFILE(OnMouseMove);
 
         long theModifierKeys = 0;
         if (event->buttons() & Qt::LeftButton)
diff --git a/src/Authoring/Studio/_Win/UI/RecentItems.cpp b/src/Authoring/Studio/_Win/UI/RecentItems.cpp
index b229ff29..e7497d40 100644
--- a/src/Authoring/Studio/_Win/UI/RecentItems.cpp
+++ b/src/Authoring/Studio/_Win/UI/RecentItems.cpp
@@ -56,7 +56,7 @@ CRecentItems::~CRecentItems()
 {
 }
 
-void CRecentItems::AddRecentItem(const CUICFile &inItem)
+void CRecentItems::AddRecentItem(const Qt3DSFile &inItem)
 {
     RemoveRecentItem(inItem);
 
@@ -68,7 +68,7 @@ void CRecentItems::AddRecentItem(const CUICFile &inItem)
     RebuildList();
 }
 
-void CRecentItems::RemoveRecentItem(const CUICFile &inItem)
+void CRecentItems::RemoveRecentItem(const Qt3DSFile &inItem)
 {
     TFileList::iterator thePos = m_RecentItems.begin();
     for (; thePos != m_RecentItems.end(); ++thePos) {
@@ -92,11 +92,11 @@ void CRecentItems::ReconstructList()
 
     for (long theIndex = 0; theIndex < (m_ValidItems > 10 ? 10 : m_ValidItems); ++theIndex) {
         Q3DStudio::CString theKey;
-        theKey.Format(_UIC("%ls%d"), static_cast<const wchar_t *>(m_PreferenceKey), theIndex);
+        theKey.Format(_LSTR("%ls%d"), static_cast<const wchar_t *>(m_PreferenceKey), theIndex);
 
         Q3DStudio::CString theFilename = thePrefs.GetStringValue(theKey, "");
         if (theFilename != "") {
-            CUICFile theFile(theFilename);
+            Qt3DSFile theFile(theFilename);
 
             QAction *act = m_Menu->addAction(theFile.GetName().toQString(),
                                              this, &CRecentItems::onTriggerRecent);
@@ -121,7 +121,7 @@ void CRecentItems::RebuildList()
         act->setData(static_cast<int>(theIndex));
 
         Q3DStudio::CString theKey;
-        theKey.Format(_UIC("%ls%d"), static_cast<const wchar_t *>(m_PreferenceKey), theIndex);
+        theKey.Format(_LSTR("%ls%d"), static_cast<const wchar_t *>(m_PreferenceKey), theIndex);
 
         thePrefs.SetStringValue(theKey, (*thePos).GetAbsolutePath());
     }
@@ -132,7 +132,7 @@ void CRecentItems::ClearMenu()
     m_Menu->clear();
 }
 
-CUICFile CRecentItems::GetItem(long inIndex)
+Qt3DSFile CRecentItems::GetItem(long inIndex)
 {
     return m_RecentItems.at(inIndex);
 }
diff --git a/src/Authoring/Studio/_Win/UI/RecentItems.h b/src/Authoring/Studio/_Win/UI/RecentItems.h
index e08f8c20..bda73999 100644
--- a/src/Authoring/Studio/_Win/UI/RecentItems.h
+++ b/src/Authoring/Studio/_Win/UI/RecentItems.h
@@ -39,7 +39,7 @@
 
 #include <vector>
 
-class CUICFile;
+class Qt3DSFile;
 
 QT_BEGIN_NAMESPACE
 class QMenu;
@@ -49,7 +49,7 @@ class CRecentItems : public QObject
 {
     Q_OBJECT
 
-    typedef std::vector<CUICFile> TFileList;
+    typedef std::vector<Qt3DSFile> TFileList;
 
 public:
     static const Q3DStudio::CString RECENTITEM_KEY;
@@ -63,10 +63,10 @@ public:
                  Q3DStudio::CString inPreferenceKey = RECENTITEM_KEY);
     virtual ~CRecentItems();
 
-    void AddRecentItem(const CUICFile &inItem);
-    void RemoveRecentItem(const CUICFile &inItem);
+    void AddRecentItem(const Qt3DSFile &inItem);
+    void RemoveRecentItem(const Qt3DSFile &inItem);
 
-    CUICFile GetItem(long inIndex);
+    Qt3DSFile GetItem(long inIndex);
     long GetItemCount() const { return (long)m_RecentItems.size(); }
 
 protected:
diff --git a/src/Authoring/Studio/_Win/UI/StartupDlg.cpp b/src/Authoring/Studio/_Win/UI/StartupDlg.cpp
index fc9cabae..e08fa7d7 100644
--- a/src/Authoring/Studio/_Win/UI/StartupDlg.cpp
+++ b/src/Authoring/Studio/_Win/UI/StartupDlg.cpp
@@ -66,7 +66,7 @@ CStartupDlg::~CStartupDlg()
     delete m_palette;
 }
 
-static QString GetFileTimeReadable(const CUICFile &inFile)
+static QString GetFileTimeReadable(const Qt3DSFile &inFile)
 {
     QFileInfo finfo(inFile.GetAbsolutePath().toQString());
     if (!finfo.exists())
@@ -121,7 +121,7 @@ void CStartupDlg::OnInitDialog()
     }
 }
 
-void CStartupDlg::AddRecentItem(const CUICFile &inRecentItem)
+void CStartupDlg::AddRecentItem(const Qt3DSFile &inRecentItem)
 {
     m_RecentDocs.push_back(inRecentItem);
 }
@@ -131,7 +131,7 @@ CStartupDlg::EStartupChoice CStartupDlg::GetChoice()
     return m_Choice;
 }
 
-CUICFile CStartupDlg::GetRecentDoc() const
+Qt3DSFile CStartupDlg::GetRecentDoc() const
 {
     return m_RecentDocSelected;
 }
diff --git a/src/Authoring/Studio/_Win/UI/StartupDlg.h b/src/Authoring/Studio/_Win/UI/StartupDlg.h
index bf7fd0d8..8b04ff3c 100644
--- a/src/Authoring/Studio/_Win/UI/StartupDlg.h
+++ b/src/Authoring/Studio/_Win/UI/StartupDlg.h
@@ -99,14 +99,14 @@ private:
     EStartupChoice m_Choice = EStartupChoice_Invalid;
 
     // Recent Docs
-    std::vector<CUICFile> m_RecentDocs;
-    CUICFile m_RecentDocSelected;
+    std::vector<Qt3DSFile> m_RecentDocs;
+    Qt3DSFile m_RecentDocSelected;
 
 public:
     void OnInitDialog();
-    void AddRecentItem(const CUICFile &inRecentItem);
+    void AddRecentItem(const Qt3DSFile &inRecentItem);
     EStartupChoice GetChoice();
-    CUICFile GetRecentDoc() const;
+    Qt3DSFile GetRecentDoc() const;
 
 private:
     QScopedPointer<Ui::StartupDlg> m_ui;
diff --git a/src/Authoring/Studio/_Win/Utils/MouseCursor.cpp b/src/Authoring/Studio/_Win/Utils/MouseCursor.cpp
index 9cd7328d..65452611 100644
--- a/src/Authoring/Studio/_Win/Utils/MouseCursor.cpp
+++ b/src/Authoring/Studio/_Win/Utils/MouseCursor.cpp
@@ -42,24 +42,24 @@
 #include <QDebug>
 
 //#ifdef WIN32
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_ARROW = 0; // IDC_ARROW
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_WAIT = 1; // IDC_WAIT
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_RESIZE_LEFTRIGHT = 2; // IDC_SIZEWE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_RESIZE_UPDOWN = 3; // IDC_SIZENS
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_GROUP_MOVE = 4; // IDC_GROUP_MOVE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_GROUP_ROTATE = 5; // IDC_GROUP_ROTATE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_GROUP_SCALE = 6; // IDC_GROUP_SCALE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_ITEM_MOVE = 7; // IDC_ITEM_MOVE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_ITEM_ROTATE = 8; // IDC_ITEM_ROTATE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_ITEM_SCALE = 9; // IDC_ITEM_SCALE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_PAN =
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_ARROW = 0; // IDC_ARROW
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_WAIT = 1; // IDC_WAIT
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_RESIZE_LEFTRIGHT = 2; // IDC_SIZEWE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_RESIZE_UPDOWN = 3; // IDC_SIZENS
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_GROUP_MOVE = 4; // IDC_GROUP_MOVE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_GROUP_ROTATE = 5; // IDC_GROUP_ROTATE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_GROUP_SCALE = 6; // IDC_GROUP_SCALE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_ITEM_MOVE = 7; // IDC_ITEM_MOVE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_ITEM_ROTATE = 8; // IDC_ITEM_ROTATE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_ITEM_SCALE = 9; // IDC_ITEM_SCALE
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_PAN =
     10; // IDC_EDIT_CAMERA_PAN
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_ROTATE =
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_ROTATE =
     11; // IDC_EDIT_CAMERA_ROTATE
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_ZOOM =
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_EDIT_CAMERA_ZOOM =
     12; // IDC_EDIT_CAMERA_ZOOM
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_BLANK = 13; // blank cursor
-const CMouseCursor::TUICMouseCursor CMouseCursor::CURSOR_IBEAM = 14;
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_BLANK = 13; // blank cursor
+const CMouseCursor::Qt3DSMouseCursor CMouseCursor::CURSOR_IBEAM = 14;
 
 //=============================================================================
 /**
@@ -129,7 +129,7 @@ void CMouseCursor::Destroy()
  * @param inCursor ID of the cursor to be loaded
  * @return true if the cursor was successfully loaded, otherwise false
  */
-bool CMouseCursor::Load(TUICMouseCursor inCursor)
+bool CMouseCursor::Load(Qt3DSMouseCursor inCursor)
 {
     // Convert from our cursors to Windows specific cursors
     switch (inCursor) {
diff --git a/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp b/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp
index cc7fd2e0..04df6ac9 100644
--- a/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp
+++ b/src/Authoring/Studio/_Win/Workspace/Dialogs.cpp
@@ -70,7 +70,7 @@
 CDialogs::CDialogs(bool inShowGUI /*= true*/)
     : m_ProgressPalette(nullptr)
     , m_ShowGUI(inShowGUI)
-    , m_LastSaveFile(CUICFile::GetApplicationDirectory().GetAbsolutePath())
+    , m_LastSaveFile(Qt3DSFile::GetApplicationDirectory().GetAbsolutePath())
 {
 }
 
@@ -147,7 +147,7 @@ void CDialogs::DisplayAssetDeleteFailed()
     Q3DStudio::CString theTitle = ::LoadResourceString(IDS_ERROR_MSGTITLE);
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theMessage, CUICMessageBox::ICON_ERROR, false,
+        Qt3DSMessageBox::Show(theTitle, theMessage, Qt3DSMessageBox::ICON_ERROR, false,
                              qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << theMessage.GetCharStar() << std::endl;
@@ -158,10 +158,10 @@ void CDialogs::DisplayAssetDeleteFailed()
 /**
  *	Get the export choice.
  */
-CUICFile CDialogs::GetExportChoice(const Q3DStudio::CString &, const Q3DStudio::CString &)
+Qt3DSFile CDialogs::GetExportChoice(const Q3DStudio::CString &, const Q3DStudio::CString &)
 {
     // Need to fix this for windows if we decide to use it
-    return CUICFile("", false, false);
+    return Qt3DSFile("", false, false);
 }
 
 //==============================================================================
@@ -181,7 +181,7 @@ void CDialogs::DisplayRefreshResourceFailed(const Q3DStudio::CString &inResource
         theText += inDescription;
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theText, CUICMessageBox::ICON_WARNING, false,
+        Qt3DSMessageBox::Show(theTitle, theText, Qt3DSMessageBox::ICON_WARNING, false,
                              qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << theText.GetCharStar() << std::endl << std::endl;
@@ -264,14 +264,14 @@ void CDialogs::DisplayImportFailed(const QUrl &inURL, const QString &inDescripti
     Q3DStudio::CString theFormatString(
         !inWarningsOnly ? ::LoadResourceString(IDS_ERROR_IMPORTRESOURCETEXT_FAILED)
                         : ::LoadResourceString(IDS_ERROR_IMPORTRESOURCETEXT_COMPLETEWITHWARNING));
-    theFormatString += _UIC("\n%ls\n\n");
+    theFormatString += _LSTR("\n%ls\n\n");
     std::wstring wstr = inURL.path().toStdWString();
     theMsgText.Format(theFormatString, static_cast<const wchar_t *>(wstr.c_str()));
     theMsgText += theText;
 
     // Display the failed import resource message.
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theMsgText, CUICMessageBox::ICON_WARNING, false,
+        Qt3DSMessageBox::Show(theTitle, theMsgText, Qt3DSMessageBox::ICON_WARNING, false,
                              qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << theMsgText.GetCharStar() << std::endl;
@@ -385,7 +385,7 @@ QString CDialogs::ConfirmRefreshModelFile(const QString &inFile)
  *	Notify the user that the presentation we tried to load has failed.
  *	@param	inPresentation	The AKFile that we failed to load.
  */
-void CDialogs::DisplayLoadingPresentationFailed(const CUICFile &inPresentation,
+void CDialogs::DisplayLoadingPresentationFailed(const Qt3DSFile &inPresentation,
                                                 long inErrorIDS /*= -1 */)
 {
     Q_UNUSED(inPresentation);
@@ -398,7 +398,7 @@ void CDialogs::DisplayLoadingPresentationFailed(const CUICFile &inPresentation,
     Q3DStudio::CString theErrorTitle(::LoadResourceString(IDS_ERROR_LOADPRESENTATION_TITLE));
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theErrorTitle, theErrorMessage, CUICMessageBox::ICON_WARNING, false,
+        Qt3DSMessageBox::Show(theErrorTitle, theErrorMessage, Qt3DSMessageBox::ICON_WARNING, false,
                              qApp->activeWindow());
     else {
         std::cout << theErrorTitle.GetCharStar() << ": " << theErrorMessage.GetCharStar() << std::endl;
@@ -417,7 +417,7 @@ void CDialogs::DisplaySavingPresentationFailed()
     Q3DStudio::CString theErrorTitle = ::LoadResourceString(IDS_PROJNAME);
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theErrorTitle, theErrorMessage, CUICMessageBox::ICON_WARNING, false,
+        Qt3DSMessageBox::Show(theErrorTitle, theErrorMessage, Qt3DSMessageBox::ICON_WARNING, false,
                              qApp->activeWindow());
     else {
         std::cout << theErrorTitle.GetCharStar() << ": " << theErrorMessage.GetCharStar() << std::endl;
@@ -433,7 +433,7 @@ void CDialogs::DisplaySavingPresentationFailed()
  *
  *	@return	void
  */
-void CDialogs::DisplaySaveReadOnlyFailed(const CUICFile &inSavedLocation)
+void CDialogs::DisplaySaveReadOnlyFailed(const Qt3DSFile &inSavedLocation)
 {
     Q3DStudio::CString theMsg = ::LoadResourceString(IDS_SAVE_READONLY_WARNING);
     Q3DStudio::CString theTitle = ::LoadResourceString(IDS_PROJNAME);
@@ -442,7 +442,7 @@ void CDialogs::DisplaySaveReadOnlyFailed(const CUICFile &inSavedLocation)
     theFormattedText.Format(theMsg, static_cast<const wchar_t *>(inSavedLocation.GetName()));
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theFormattedText, CUICMessageBox::ICON_WARNING, false,
+        Qt3DSMessageBox::Show(theTitle, theFormattedText, Qt3DSMessageBox::ICON_WARNING, false,
                              qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << theFormattedText.GetCharStar() << std::endl;
@@ -451,7 +451,7 @@ void CDialogs::DisplaySaveReadOnlyFailed(const CUICFile &inSavedLocation)
 
 //==============================================================================
 /**
- *	Displays a CUICMessageBox using the specified parameters.  The message box
+ *	Displays a Qt3DSMessageBox using the specified parameters.  The message box
  *	is modal to the main frame.  This provides an easy way to place modal dialogs
  * 	to the user, without requiring your class to know about the main frame or
  *	window refs.
@@ -461,18 +461,18 @@ void CDialogs::DisplaySaveReadOnlyFailed(const CUICFile &inSavedLocation)
  *	@param inShowCancel true to show a Cancel button, false only show an OK button
  *	@return Indication of which button was pressed to dismiss the dialog
  */
-CUICMessageBox::EMessageBoxReturn
+Qt3DSMessageBox::EMessageBoxReturn
 CDialogs::DisplayMessageBox(const Q3DStudio::CString &inTitle, const Q3DStudio::CString &inText,
-                            CUICMessageBox::EMessageBoxIcon inIcon, bool inShowCancel)
+                            Qt3DSMessageBox::EMessageBoxIcon inIcon, bool inShowCancel)
 {
-    CUICMessageBox::EMessageBoxReturn theUserChoice;
+    Qt3DSMessageBox::EMessageBoxReturn theUserChoice;
 
     if (m_ShowGUI) {
         theUserChoice =
-            CUICMessageBox::Show(inTitle, inText, inIcon, inShowCancel, qApp->activeWindow());
+            Qt3DSMessageBox::Show(inTitle, inText, inIcon, inShowCancel, qApp->activeWindow());
     } else {
         std::cout << inTitle.GetCharStar() << ": " << inText.GetCharStar() << std::endl;
-        theUserChoice = CUICMessageBox::MSGBX_OK;
+        theUserChoice = Qt3DSMessageBox::MSGBX_OK;
     }
 
     return theUserChoice;
@@ -486,13 +486,13 @@ int CDialogs::DisplayChoiceBox(const Q3DStudio::CString &inTitle, const Q3DStudi
         box.setWindowTitle(inTitle.toQString());
         box.setText(inText.toQString());
         switch (inIcon) {
-        case CUICMessageBox::ICON_WARNING:
+        case Qt3DSMessageBox::ICON_WARNING:
             box.setIcon(QMessageBox::Warning);
             break;
-        case CUICMessageBox::ICON_ERROR:
+        case Qt3DSMessageBox::ICON_ERROR:
             box.setIcon(QMessageBox::Critical);
             break;
-        case CUICMessageBox::ICON_INFO:
+        case Qt3DSMessageBox::ICON_INFO:
             box.setIcon(QMessageBox::Information);
             break;
         default:
@@ -704,7 +704,7 @@ void CDialogs::DisplayKnownErrorDialog(const Q3DStudio::CString &inErrorText)
     {
         Q3DStudio::CString theTitle(::LoadResourceString(IDS_PROJNAME));
         if (m_ShowGUI)
-            CUICMessageBox::Show(theTitle, inErrorText, CUICMessageBox::ICON_ERROR, false,
+            Qt3DSMessageBox::Show(theTitle, inErrorText, Qt3DSMessageBox::ICON_ERROR, false,
                                  qApp->activeWindow());
         else
             std::cout << inErrorText.GetCharStar() << ": " << inErrorText.GetCharStar() << std::endl;
@@ -722,7 +722,7 @@ CDialogs::ESavePromptResult CDialogs::PromptForSave()
 {
     Q3DStudio::CString theDocTitle;
 
-    CUICFile theCurrentDoc = g_StudioApp.GetCore()->GetDoc()->GetDocumentPath();
+    Qt3DSFile theCurrentDoc = g_StudioApp.GetCore()->GetDoc()->GetDocumentPath();
     if (theCurrentDoc.IsFile())
         theDocTitle = theCurrentDoc.GetName();
     else // if the current doc has not been saved then use the default title.
@@ -758,10 +758,10 @@ CDialogs::ESavePromptResult CDialogs::PromptForSave()
  *	Prompt the user for a file to save to from the SaveAs menu option.
  *	@return	an invalid file if the user cancels the save dialog.
  */
-std::pair<CUICFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &inDialogTitle,
+std::pair<Qt3DSFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &inDialogTitle,
                                                     bool inFilenameUntitled)
 {
-    CUICFile theFile("");
+    Qt3DSFile theFile("");
     Q3DStudio::CString theFileExt;
     Q3DStudio::CString theImportFilter;
 
@@ -789,7 +789,7 @@ std::pair<CUICFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &in
 
     while (theShowDialog && theFileDlg.exec()) {
         theShowDialog = false;
-        theFile = CUICFile(Q3DStudio::CString::fromQString(theFileDlg.selectedFiles().front()));
+        theFile = Qt3DSFile(Q3DStudio::CString::fromQString(theFileDlg.selectedFiles().front()));
 
         m_LastSaveFile = theFile.GetAbsolutePath();
         // customising a dialog box will force us to use non-native.
@@ -818,7 +818,7 @@ std::pair<CUICFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &in
                 auto result = QMessageBox::question(nullptr, theTitle, theString);
                 if (result != QMessageBox::Yes) {
                     // Reset the file and show the file dialog again
-                    theFile = CUICFile("");
+                    theFile = Qt3DSFile("");
                     theShowDialog = true;
                     continue;
                 }
@@ -834,7 +834,7 @@ std::pair<CUICFile, bool> CDialogs::GetSaveAsChoice(const Q3DStudio::CString &in
  *	Prompt the user for a file to create.
  *	@return	an invalid file if the user cancels the save dialog.
  */
-std::pair<CUICFile, bool>
+std::pair<Qt3DSFile, bool>
 CDialogs::GetNewDocumentChoice(const Q3DStudio::CString &inInitialDirectory)
 {
     if (inInitialDirectory.size())
@@ -847,9 +847,9 @@ CDialogs::GetNewDocumentChoice(const Q3DStudio::CString &inInitialDirectory)
  * Prompt the user for a file to open.
  * This will return an invalid file if the user cancels the save dialog.
  */
-CUICFile CDialogs::GetFileOpenChoice(const Q3DStudio::CString &inInitialDirectory)
+Qt3DSFile CDialogs::GetFileOpenChoice(const Q3DStudio::CString &inInitialDirectory)
 {
-    CUICFile theFile("");
+    Qt3DSFile theFile("");
     Q3DStudio::CString theFileExt;
     Q3DStudio::CString theImportFilter;
 
@@ -865,7 +865,7 @@ CUICFile CDialogs::GetFileOpenChoice(const Q3DStudio::CString &inInitialDirector
         QFileInfo fi(theFileDlg.selectedFiles().first());
         Q3DStudio::CString thePath = Q3DStudio::CString::fromQString(fi.absolutePath());
         Q3DStudio::CString theName = Q3DStudio::CString::fromQString(fi.fileName());
-        theFile = CUICFile(thePath, theName);
+        theFile = Qt3DSFile(thePath, theName);
 
         m_LastSaveFile = theFile.GetAbsolutePath();
     }
@@ -884,18 +884,18 @@ bool CDialogs::ConfirmRevert()
     Q3DStudio::CString thePrompt = ::LoadResourceString(IDS_PROMPT_FOR_REVERT);
     Q3DStudio::CString theTitle = ::LoadResourceString(IDS_PROJNAME);
 
-    CUICMessageBox::EMessageBoxReturn theChoice;
+    Qt3DSMessageBox::EMessageBoxReturn theChoice;
 
     if (m_ShowGUI)
-        theChoice = CUICMessageBox::Show(theTitle, thePrompt, CUICMessageBox::ICON_WARNING, true,
+        theChoice = Qt3DSMessageBox::Show(theTitle, thePrompt, Qt3DSMessageBox::ICON_WARNING, true,
                                          qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << thePrompt.GetCharStar() << std::endl;
-        theChoice = CUICMessageBox::MSGBX_OK;
+        theChoice = Qt3DSMessageBox::MSGBX_OK;
     }
 
     // user decided to go ahead and delete all unused resources
-    if (theChoice == CUICMessageBox::MSGBX_OK)
+    if (theChoice == Qt3DSMessageBox::MSGBX_OK)
         theConfirmation = true;
 
     return theConfirmation;
@@ -970,7 +970,7 @@ void CDialogs::DisplayProfilingStatistics()
     }
 #endif // #ifdef PERFORM_PROFILE
     if (m_ShowGUI)
-        CUICMessageBox::Show("Profiling Statistics", theStatistics, CUICMessageBox::ICON_INFO);
+        Qt3DSMessageBox::Show("Profiling Statistics", theStatistics, Qt3DSMessageBox::ICON_INFO);
     else {
         std::cout << "Profiling Statistics"
                   << ": " << theStatistics.GetCharStar() << std::endl;
@@ -990,7 +990,7 @@ void CDialogs::DisplayEnvironmentVariablesError(const Q3DStudio::CString &inErro
     theMessage += inErrorMessage;
     theMessage += ::LoadResourceString(IDS_PROJECT_VARIABLES_FORMAT);
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theMessage, CUICMessageBox::ICON_ERROR, false,
+        Qt3DSMessageBox::Show(theTitle, theMessage, Qt3DSMessageBox::ICON_ERROR, false,
                              qApp->activeWindow());
     else {
         std::cout << theTitle.GetCharStar() << ": " << theMessage.GetCharStar() << std::endl;
@@ -1033,7 +1033,7 @@ void CDialogs::DisplayPasteFailed()
     Q3DStudio::CString theMessage(::LoadResourceString(IDS_ERROR_PATHOLOGICAL_PASTE_MESSAGE));
 
     if (m_ShowGUI)
-        CUICMessageBox::Show(theTitle, theMessage, CUICMessageBox::ICON_ERROR, false,
+        Qt3DSMessageBox::Show(theTitle, theMessage, Qt3DSMessageBox::ICON_ERROR, false,
                              qApp->activeWindow());
     else
         std::cout << theTitle.GetCharStar() << ": " << theMessage.GetCharStar() << std::endl;
diff --git a/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h b/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
index b1631d23..84c7d5a0 100644
--- a/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
+++ b/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
@@ -63,7 +63,7 @@ namespace Q3DStudio {
 using namespace qt3ds::foundation;
 
 //==============================================================================
-// Redifinition of UICDM::DataModelDataType::Value
+// Redifinition of qt3dsdm::DataModelDataType::Value
 //==============================================================================
 enum ERuntimeDataModelDataType {
     ERuntimeDataModelDataTypeNone,
@@ -80,7 +80,7 @@ enum ERuntimeDataModelDataType {
 };
 
 //==============================================================================
-// Redifinition of UICDM::EAdditionalMetaDataType
+// Redifinition of qt3dsdm::AdditionalMetaDataType
 //==============================================================================
 enum ERuntimeAdditionalMetaDataType {
     ERuntimeAdditionalMetaDataTypeNone,
diff --git a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
index beb47928..8d1a5e46 100644
--- a/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
+++ b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
@@ -158,9 +158,9 @@ private:
     eastl::basic_string<qt3ds::foundation::TWCharEASTLConverter::TCharType> m_Buf[4];
 
 public:
-    static void SimpleUICDMLogger(const char *inMessage)
+    static void SimpleDataModelLogger(const char *inMessage)
     {
-        qCInfo(TRACE_INFO) << SRuntimeMetaDataImpl::SimpleUICDMLogger
+        qCInfo(TRACE_INFO) << SRuntimeMetaDataImpl::SimpleDataModelLogger
                                << inMessage;
     }
     //==============================================================================
@@ -171,7 +171,7 @@ public:
         : m_InputStreamFactory(inFactory)
     {
         // Use this to enable some simple uicdm debug logging.  Beware of a *lot* of log output.
-        // g_UICDMDebugLogger = SimpleUICDMLogger;
+        // g_DataModelDebugLogger = SimpleDataModelLogger;
         try {
             // need to pause here to hook up the debugger
             m_StrTable = qt3dsdm::IStringTable::CreateStringTable();
@@ -180,8 +180,8 @@ public:
 
             m_Objects = std::make_shared<SComposerObjectDefinitions>(std::ref(*m_DataCore),
                                                                        std::ref(*m_NewMetaData));
-        } catch (qt3dsdm::UICDMError &error) {
-            qCCritical(INTERNAL_ERROR) << "SRuntimeMetaDataImpl UICDMError: "
+        } catch (qt3dsdm::Qt3DSDMError &error) {
+            qCCritical(INTERNAL_ERROR) << "SRuntimeMetaDataImpl Qt3DSDMError: "
                                        << m_StrTable->GetNarrowStr(error.m_Message);
         } catch (std::runtime_error &exc) {
             if (exc.what()) {
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
index 3046a332..225d7eea 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
@@ -57,21 +57,21 @@ namespace render {
         CreateRenderContext(qt3ds::NVFoundationBase &foundat, qt3ds::foundation::IStringTable &strt) = 0;
     };
 
-    class IUICRenderFactory;
+    class IQt3DSRenderFactory;
 
-    class IUICRenderFactoryCore : public Q3DStudio::IRuntimeFactoryCore
+    class IQt3DSRenderFactoryCore : public Q3DStudio::IRuntimeFactoryCore
     {
     public:
-        virtual IUICRenderFactory &
+        virtual IQt3DSRenderFactory &
         CreateRenderFactory(const QSurfaceFormat &format) = 0;
 
-        static IUICRenderFactoryCore &
+        static IQt3DSRenderFactoryCore &
         CreateRenderFactoryCore(const char8_t *inApplicationDirectory,
                                 Q3DStudio::IWindowSystem &inWindowSystem,
                                 Q3DStudio::ITimeProvider &inTimeProvider);
     };
 
-    class IUICRenderFactory : public Q3DStudio::IRuntimeFactory
+    class IQt3DSRenderFactory : public Q3DStudio::IRuntimeFactory
     {
     public:
         virtual Q3DStudio::ITegraApplicationRenderEngine &CreateRenderEngine() = 0;
diff --git a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
index dbd03523..feac7278 100644
--- a/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
@@ -90,9 +90,9 @@ namespace render {
         QT3DSU8 *m_FlowData;
         NVScopedRefCounted<NVFoundation> m_Foundation;
         NVScopedRefCounted<IStringTable> m_StringTable;
-        NVScopedRefCounted<IUICRenderContextCore> m_CoreContext;
+        NVScopedRefCounted<IQt3DSRenderContextCore> m_CoreContext;
         NVScopedRefCounted<NVRenderContext> m_RenderContext;
-        NVScopedRefCounted<IUICRenderContext> m_UICContext;
+        NVScopedRefCounted<IQt3DSRenderContext> m_Context;
         SWindowDimensions m_WindowDimensions;
         eastl::string m_PrimitivePath;
         bool m_RenderRotationsEnabled;
@@ -107,7 +107,7 @@ namespace render {
             , m_FlowData(NULL)
             , m_Foundation(NVCreateFoundation(QT3DS_FOUNDATION_VERSION, m_Allocator))
             , m_StringTable(IStringTable::CreateStringTable(m_Foundation->getAllocator()))
-            , m_CoreContext(IUICRenderContextCore::Create(*m_Foundation, *m_StringTable))
+            , m_CoreContext(IQt3DSRenderContextCore::Create(*m_Foundation, *m_StringTable))
             , m_PrimitivePath(inPrimitivePath)
             , m_RenderRotationsEnabled(false)
             , m_WriteOutShaderCache(false)
@@ -124,7 +124,7 @@ namespace render {
         virtual ~SBindingCore()
         {
             m_CoreContext = NULL;
-            m_UICContext = NULL;
+            m_Context = NULL;
             m_RenderContext = NULL;
             if (m_FlowData)
                 m_Allocator.deallocate(m_FlowData);
@@ -135,7 +135,7 @@ namespace render {
         {
             m_RenderContext = inContextFactory.CreateRenderContext(*m_Foundation, *m_StringTable);
             if (m_RenderContext)
-                m_UICContext =
+                m_Context =
                     m_CoreContext->CreateRenderContext(*m_RenderContext, m_PrimitivePath.c_str());
         }
 
@@ -155,7 +155,7 @@ namespace render {
     //  TODO - get rid of the virtual functions and just do dispatch
     //	on the m_RenderObject.m_Type.
     ////////////////////////////////////////
-    class CUICTranslator
+    class Qt3DSTranslator
     {
     public:
         QT3DSU32 m_DirtyIndex;
@@ -163,25 +163,25 @@ namespace render {
         SGraphObject *m_RenderObject;
         STranslatorContext *m_TranslatorContext;
 
-        CUICTranslator(Q3DStudio::TElement &inElement, SGraphObject &inRenderObject);
+        Qt3DSTranslator(Q3DStudio::TElement &inElement, SGraphObject &inRenderObject);
         GraphObjectTypes::Enum GetUIPType() const { return m_RenderObject->m_Type; }
         Q3DStudio::TElement &Element() { return *m_Element; }
         SGraphObject &RenderObject() { return *m_RenderObject; }
 
         // This function is done via a dispatch mechanism on the graph object type.
-        void OnElementChanged(SPresentation &inPresentation, IUICRenderContext &inRenderContext,
+        void OnElementChanged(SPresentation &inPresentation, IQt3DSRenderContext &inRenderContext,
                               Q3DStudio::IPresentation &inStudioPresentation);
 
         void Save(SWriteBuffer &inWriteBuffer, QT3DSU32 inGraphObjectOffset);
         // Most translators don't need an extra allocation but effects due because the mapping from
         // effect property
         // to runtime property is too complex to do quickly.
-        static CUICTranslator *LoadTranslator(SDataReader &inReader, size_t inElemOffset,
+        static Qt3DSTranslator *LoadTranslator(SDataReader &inReader, size_t inElemOffset,
                                               NVDataRef<QT3DSU8> inSGSection,
                                               NVAllocatorCallback &inAllocator);
 
-        static CUICTranslator *GetTranslatorFromGraphNode(SGraphObject &inObject);
-        static CUICTranslator *CreateTranslatorForElement(Q3DStudio::TElement &inElement,
+        static Qt3DSTranslator *GetTranslatorFromGraphNode(SGraphObject &inObject);
+        static Qt3DSTranslator *CreateTranslatorForElement(Q3DStudio::TElement &inElement,
                                                           SGraphObject &inGraphObject,
                                                           NVAllocatorCallback &inAlloc);
         static Q3DStudio::IPresentation *
@@ -193,17 +193,17 @@ namespace render {
 
     struct STranslatorGetOp
     {
-        QT3DSU32 operator()(const CUICTranslator &translator) { return translator.m_DirtyIndex; }
+        QT3DSU32 operator()(const Qt3DSTranslator &translator) { return translator.m_DirtyIndex; }
     };
     struct STranslatorSetOp
     {
-        void operator()(CUICTranslator &translator, QT3DSU32 value)
+        void operator()(Qt3DSTranslator &translator, QT3DSU32 value)
         {
             translator.m_DirtyIndex = value;
         }
     };
 
-    typedef InvasiveSet<CUICTranslator, STranslatorGetOp, STranslatorSetOp> TTranslatorDirytSet;
+    typedef InvasiveSet<Qt3DSTranslator, STranslatorGetOp, STranslatorSetOp> TTranslatorDirytSet;
 }
 }
 
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
index 1313c15b..50892d06 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
@@ -97,12 +97,12 @@ namespace render {
 }
 }
 namespace {
-struct SUICRenderScene;
+struct Qt3DSRenderScene;
 
-struct UICRenderSceneSubPresRenderer : public CSubPresentationRenderer
+struct Qt3DSRenderSceneSubPresRenderer : public CSubPresentationRenderer
 {
-    SUICRenderScene &m_Scene;
-    UICRenderSceneSubPresRenderer(SUICRenderScene &inScene, IUICRenderContext &inRenderContext,
+    Qt3DSRenderScene &m_Scene;
+    Qt3DSRenderSceneSubPresRenderer(Qt3DSRenderScene &inScene, IQt3DSRenderContext &inRenderContext,
                                   SPresentation &inPresentation)
         : CSubPresentationRenderer(inRenderContext, inPresentation)
         , m_Scene(inScene)
@@ -123,7 +123,7 @@ struct SSceneLoadData
     SPresentation *m_Presentation;
     NVDataRef<QT3DSU8> m_TranslatorData;
     NVDataRef<QT3DSU8> m_SceneGraphData;
-    eastl::vector<CUICTranslator *> m_Translators;
+    eastl::vector<Qt3DSTranslator *> m_Translators;
     SPoolingAllocator m_AutoAllocator;
     Q3DStudio::IPresentation *m_RuntimePresentation;
     QT3DSI32 mRefCount;
@@ -140,10 +140,10 @@ struct SSceneLoadData
     QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Allocator)
 };
 
-struct SUICRenderScene : public Q3DStudio::IScene
+struct Qt3DSRenderScene : public Q3DStudio::IScene
 {
     SBindingCore &m_BindingCore;
-    NVScopedRefCounted<IUICRenderContext> m_Context;
+    NVScopedRefCounted<IQt3DSRenderContext> m_Context;
     NVScopedRefCounted<SSceneLoadData> m_LoadData;
     // The scene graph gets allocated kind of on its own
     // So do the smaller translation objects that translate TElement properties
@@ -160,7 +160,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
     NVRenderRect m_LastRenderViewport;
     CRegisteredString m_PathSubPathType;
 
-    SUICRenderScene(SBindingCore &inBindingCore, IUICRenderContext &inContext,
+    Qt3DSRenderScene(SBindingCore &inBindingCore, IQt3DSRenderContext &inContext,
                     SSceneLoadData &inLoadData)
         : m_BindingCore(inBindingCore)
         , m_Context(inContext)
@@ -168,11 +168,11 @@ struct SUICRenderScene : public Q3DStudio::IScene
         , m_Presentation(inLoadData.m_Presentation)
         , m_RuntimePresentation(inLoadData.m_RuntimePresentation)
         , m_UserData(NULL)
-        , m_DirtySet(inContext.GetAllocator(), "SUICRenderScene::m_DirtySet")
+        , m_DirtySet(inContext.GetAllocator(), "Qt3DSRenderScene::m_DirtySet")
         , m_OffscreenRenderer(NULL)
         , m_SubPresentationType(
               inContext.GetStringTable().RegisterStr(CSubPresentationRenderer::GetRendererName()))
-        , m_GraphObjectList(inContext.GetAllocator(), "SUICDSRenderScene::m_GraphObjectList")
+        , m_GraphObjectList(inContext.GetAllocator(), "Qt3DSDSRenderScene::m_GraphObjectList")
         , m_LoggedPickLastFrame(false)
     {
         for (QT3DSU32 idx = 0, end = inLoadData.m_Translators.size(); idx < end; ++idx) {
@@ -181,7 +181,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
         m_PathSubPathType = inContext.GetStringTable().RegisterStr("PathAnchorPoint");
     }
 
-    virtual ~SUICRenderScene()
+    virtual ~Qt3DSRenderScene()
     {
         if (m_OffscreenRenderer)
             m_Context->GetOffscreenRenderManager().ReleaseOffscreenRenderer(m_OffscreenRendererId);
@@ -203,12 +203,12 @@ struct SUICRenderScene : public Q3DStudio::IScene
             m_RuntimePresentation->GetFrameData().GetDirtyList();
         for (QT3DSU32 idx = 0, end = theDirtyList.GetCount(); idx < end; ++idx) {
             Q3DStudio::TElement &theElement = *theDirtyList[idx];
-            CUICTranslator *theTranslator =
-                reinterpret_cast<CUICTranslator *>(theElement.GetAssociation());
+            Qt3DSTranslator *theTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(theElement.GetAssociation());
             if (!theTranslator && theElement.GetType() == m_PathSubPathType) {
                 Q3DStudio::TElement *theParent = theElement.GetParent();
                 if (theParent) {
-                    theTranslator = reinterpret_cast<CUICTranslator *>(theParent->GetAssociation());
+                    theTranslator = reinterpret_cast<Qt3DSTranslator *>(theParent->GetAssociation());
                     // The path translator responds to anchor point changes as well as its own data
                     // changes.
                     if (theTranslator
@@ -272,7 +272,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
         // Thus we have to add it back.
         QT3DSVec2 mousePos(mouseX + m_LastRenderViewport.m_X, mouseY + m_LastRenderViewport.m_Y);
 
-        SUICRenderPickResult thePickResult = m_Context->GetRenderer().Pick(
+        Qt3DSRenderPickResult thePickResult = m_Context->GetRenderer().Pick(
             *m_Presentation->m_Scene->m_FirstChild, m_Context->GetMousePickViewport()
             // GetMousePickMouseCoords is called by the renderer to setup the pick frame.
             // This is so that the presentation's lastMouseX and lastMouseY variables are correctly
@@ -283,7 +283,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
         if (thePickResult.m_HitObject != NULL) {
             SModel *theHitModel =
                 static_cast<SModel *>(const_cast<SGraphObject *>(thePickResult.m_HitObject));
-            return &CUICTranslator::GetTranslatorFromGraphNode(*theHitModel)->Element();
+            return &Qt3DSTranslator::GetTranslatorFromGraphNode(*theHitModel)->Element();
         }
         return NULL;
     }
@@ -296,8 +296,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
             && inMapperElements.size() == 0) {
             return Empty();
         }
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement.GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement.GetAssociation());
         if (theTranslator == NULL)
             return Empty();
         bool isValidPickObject =
@@ -310,8 +310,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
         QT3DSVec2 mousePos(mouseX + m_LastRenderViewport.m_X, mouseY + m_LastRenderViewport.m_Y);
         eastl::vector<SGraphObject *> theMapperObjects(inMapperElements.size());
         for (QT3DSU32 idx = 0, end = inMapperElements.size(); idx < end; ++idx) {
-            CUICTranslator *theMapperTranslator =
-                reinterpret_cast<CUICTranslator *>(inMapperElements[idx]->GetAssociation());
+            Qt3DSTranslator *theMapperTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(inMapperElements[idx]->GetAssociation());
             SGraphObject *theMapperObject = NULL;
             if (theMapperTranslator) {
                 theMapperObject = theMapperTranslator->m_RenderObject;
@@ -352,7 +352,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
             // If we have not already found a valid pick on a previous layer
             if (!ioPickFrame.m_ResultValid && m_Presentation && m_Presentation->m_Scene
                 && m_Presentation->m_Scene->m_FirstChild) {
-                SUICRenderPickResult thePickResult = m_Context->GetRenderer().Pick(
+                Qt3DSRenderPickResult thePickResult = m_Context->GetRenderer().Pick(
                     *m_Presentation->m_Scene->m_FirstChild, m_Context->GetMousePickViewport()
                     // GetMousePickMouseCoords is called by the renderer to setup the pick frame.
                     // This is so that the presentation's lastMouseX and lastMouseY variables are
@@ -365,7 +365,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
                     SModel *theHitModel = static_cast<SModel *>(
                         const_cast<SGraphObject *>(thePickResult.m_HitObject));
                     ioPickFrame.m_Model =
-                        &CUICTranslator::GetTranslatorFromGraphNode(*theHitModel)->Element();
+                        &Qt3DSTranslator::GetTranslatorFromGraphNode(*theHitModel)->Element();
                     // I don't think local hit is used any more, but not sure.  If they are used,
                     // then the code below is probably wrong.
                     ioPickFrame.m_LocalHit[0] = thePickResult.m_LocalUVCoords.x;
@@ -385,8 +385,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
                 } else {
                     // The scene is always picked if it is pickable; nothing else really makes
                     // sense.
-                    CUICTranslator *theTranslator =
-                        CUICTranslator::GetTranslatorFromGraphNode(*m_Presentation->m_Scene);
+                    Qt3DSTranslator *theTranslator =
+                        Qt3DSTranslator::GetTranslatorFromGraphNode(*m_Presentation->m_Scene);
 
                     if (theTranslator) {
                         ioPickFrame.m_Model = &theTranslator->Element();
@@ -417,8 +417,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
             QT3DS_ASSERT(false);
             return;
         }
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         if (theTranslator && GraphObjectTypes::IsNodeType(theTranslator->GetUIPType())) {
             Update();
             TransferDirtyProperties();
@@ -442,8 +442,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
             return;
         }
 
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         if (theTranslator && GraphObjectTypes::IsNodeType(theTranslator->GetUIPType())) {
             SNode *theNode = static_cast<SNode *>(&theTranslator->RenderObject());
             QT3DSMat44 transform;
@@ -474,8 +474,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
             QT3DS_ASSERT(false);
             return retval;
         }
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         if (theTranslator && GraphObjectTypes::IsNodeType(theTranslator->GetUIPType())) {
             Update();
             TransferDirtyProperties();
@@ -509,8 +509,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
         retval.SetEmpty();
         NVBounds3 theLocalBox = GetNodeLocalBoundingBox(inElement, inSelfOnly);
         if (theLocalBox.isEmpty() == false) {
-            CUICTranslator *theTranslator =
-                reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+            Qt3DSTranslator *theTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
             if (theTranslator && GraphObjectTypes::IsNodeType(theTranslator->GetUIPType())) {
                 SNode *theNode = static_cast<SNode *>(&theTranslator->RenderObject());
                 theLocalBox.transform(theNode->m_GlobalTransform);
@@ -545,7 +545,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
 
     Q3DStudio::SCameraRect GetCameraBounds(Q3DStudio::TElement &inElem) override
     {
-        CUICTranslator *theTranslator = reinterpret_cast<CUICTranslator *>(inElem.GetAssociation());
+        Qt3DSTranslator *theTranslator = reinterpret_cast<Qt3DSTranslator *>(inElem.GetAssociation());
         if (theTranslator && theTranslator->m_RenderObject) {
             Option<qt3ds::render::SCuboidRect> theRectOpt =
                 m_Context->GetRenderer().GetCameraBounds(*theTranslator->m_RenderObject);
@@ -560,8 +560,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
 
     void PositionToScreen(Q3DStudio::TElement &inElement, QT3DSVec3 &inPos, QT3DSVec3 &outScreen) override
     {
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement.GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement.GetAssociation());
         if (theTranslator && theTranslator->m_RenderObject) {
             SNode *theNode = reinterpret_cast<SNode *>(theTranslator->m_RenderObject);
             QT3DSVec3 thePos = theNode->m_GlobalTransform.transform(inPos);
@@ -571,8 +571,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
 
     void ScreenToPosition(Q3DStudio::TElement &inElement, QT3DSVec3 &inScreen, QT3DSVec3 &outPos) override
     {
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement.GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement.GetAssociation());
         if (theTranslator && theTranslator->m_RenderObject) {
             SNode *theNode = reinterpret_cast<SNode *>(theTranslator->m_RenderObject);
             QT3DSVec3 objPos = theNode->GetGlobalPos();
@@ -602,13 +602,13 @@ struct SUICRenderScene : public Q3DStudio::IScene
                                     Q3DStudio::INT32 inBufferLength, Q3DStudio::INT32 inWidth,
                                     Q3DStudio::INT32 inHeight,
                                     qt3ds::render::NVRenderTextureFormats::Enum inFormat,
-                                    IUICRenderContext *theContext)
+                                    IQt3DSRenderContext *theContext)
     {
         NVRenderTextureFormats::Enum destFormat = qt3ds::render::NVRenderTextureFormats::RGBA16F;
 
-        UICRenderPrefilterTexture *theBSDFMipMap = theImage->m_TextureData.m_BSDFMipMap;
+        Qt3DSRenderPrefilterTexture *theBSDFMipMap = theImage->m_TextureData.m_BSDFMipMap;
         if (theBSDFMipMap == NULL) {
-            theBSDFMipMap = UICRenderPrefilterTexture::Create(
+            theBSDFMipMap = Qt3DSRenderPrefilterTexture::Create(
                 &theContext->GetRenderContext(), inWidth, inHeight,
                 *theImage->m_TextureData.m_Texture, destFormat, theContext->GetFoundation());
             theImage->m_TextureData.m_BSDFMipMap = theBSDFMipMap;
@@ -625,8 +625,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
                                 qt3ds::render::NVRenderTextureFormats::Enum inFormat,
                                 Q3DStudio::INT32 inHasTransparency) override
     {
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         if (theTranslator && theTranslator->GetUIPType() == GraphObjectTypes::Image) {
             SImage *theImage = static_cast<SImage *>(&theTranslator->RenderObject());
             // Attempt to resolve the image's path
@@ -682,8 +682,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
 
     Q3DStudio::STextSizes MeasureText(Q3DStudio::TElement *inElement, const char *inTextStr) override
     {
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         Q3DStudio::STextSizes retval;
         if (theTranslator && theTranslator->GetUIPType() == GraphObjectTypes::Text) {
             if (inElement->IsDirty()) {
@@ -724,8 +724,8 @@ struct SUICRenderScene : public Q3DStudio::IScene
     {
         ioWidth = 0;
         ioHeight = 0;
-        CUICTranslator *theTranslator =
-            reinterpret_cast<CUICTranslator *>(inElement->GetAssociation());
+        Qt3DSTranslator *theTranslator =
+            reinterpret_cast<Qt3DSTranslator *>(inElement->GetAssociation());
         if (theTranslator->GetUIPType() == GraphObjectTypes::Image) {
             SImage *theImage = static_cast<SImage *>(&theTranslator->RenderObject());
             if (theImage) {
@@ -770,7 +770,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
 
     void RegisterOffscreenRenderer(const char *inKey) override
     {
-        m_OffscreenRenderer = QT3DS_NEW(m_Context->GetAllocator(), UICRenderSceneSubPresRenderer)(
+        m_OffscreenRenderer = QT3DS_NEW(m_Context->GetAllocator(), Qt3DSRenderSceneSubPresRenderer)(
             *this, *m_Context, *m_Presentation);
         m_OffscreenRendererId = m_Context->GetStringTable().RegisterStr(inKey);
         m_Context->GetOffscreenRenderManager().RegisterOffscreenRenderer(m_OffscreenRendererId,
@@ -781,14 +781,14 @@ struct SUICRenderScene : public Q3DStudio::IScene
 };
 
 SOffscreenRenderFlags
-UICRenderSceneSubPresRenderer::NeedsRender(const SOffscreenRendererEnvironment &inEnvironment,
+Qt3DSRenderSceneSubPresRenderer::NeedsRender(const SOffscreenRendererEnvironment &inEnvironment,
                                            QT3DSVec2 inPresScale)
 {
     m_Scene.TransferDirtyProperties();
     return CSubPresentationRenderer::NeedsRender(inEnvironment, inPresScale);
 }
 
-void UICRenderSceneSubPresRenderer::Render(const SOffscreenRendererEnvironment &inEnvironment,
+void Qt3DSRenderSceneSubPresRenderer::Render(const SOffscreenRendererEnvironment &inEnvironment,
                                            NVRenderContext &inRenderContext, QT3DSVec2 inPresScale,
                                            SScene::RenderClearCommand inClearBuffer)
 {
@@ -799,13 +799,13 @@ void UICRenderSceneSubPresRenderer::Render(const SOffscreenRendererEnvironment &
 // Scene Manager
 //////////////////////////////////////////////////////////////////
 
-struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
+struct Qt3DSRenderSceneManager : public Q3DStudio::ISceneManager,
                                 public Q3DStudio::ISceneBinaryLoader
 {
     typedef nvhash_map<CRegisteredString, bool> TStrBoolMap;
 
     NVScopedRefCounted<SBindingCore> m_Context;
-    nvvector<pair<Q3DStudio::IPresentation *, SUICRenderScene *>> m_Scenes;
+    nvvector<pair<Q3DStudio::IPresentation *, Qt3DSRenderScene *>> m_Scenes;
     nvvector<pair<qt3ds::foundation::CRegisteredString, long>> m_RenderPlugins;
     Q3DStudio::INT32 m_ViewWidth;
     Q3DStudio::INT32 m_ViewHeight;
@@ -815,7 +815,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
     nvvector<eastl::pair<CRegisteredString, bool>> m_SourcePaths;
     eastl::hash_set<CRegisteredString> m_SourcePathSet;
 
-    SUICRenderScene *m_LastRenderedScene;
+    Qt3DSRenderScene *m_LastRenderedScene;
     Q3DStudio::IWindowSystem &m_WindowSystem;
     Mutex m_LoadingScenesMutex;
     eastl::vector<NVScopedRefCounted<SSceneLoadData>> m_LoadingScenes;
@@ -824,13 +824,13 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
     bool m_ProjectInitialized;
     QT3DSI32 mRefCount;
 
-    SUICRenderSceneManager(SBindingCore &ctx, Q3DStudio::IWindowSystem &inWindowSystem)
+    Qt3DSRenderSceneManager(SBindingCore &ctx, Q3DStudio::IWindowSystem &inWindowSystem)
         : m_Context(ctx)
-        , m_Scenes(ctx.GetAllocator(), "SUICRenderSceneManager::m_Scenes")
-        , m_RenderPlugins(ctx.GetAllocator(), "SUICRenderSceneManager::m_RenderPlugins")
+        , m_Scenes(ctx.GetAllocator(), "Qt3DSRenderSceneManager::m_Scenes")
+        , m_RenderPlugins(ctx.GetAllocator(), "Qt3DSRenderSceneManager::m_RenderPlugins")
         , m_ViewWidth(0)
         , m_ViewHeight(0)
-        , m_SourcePaths(ctx.GetAllocator(), "SUICRenderSceneManager::m_SourcePaths")
+        , m_SourcePaths(ctx.GetAllocator(), "Qt3DSRenderSceneManager::m_SourcePaths")
         , m_LastRenderedScene(NULL)
         , m_WindowSystem(inWindowSystem)
         , m_LoadingScenesMutex(ctx.GetAllocator())
@@ -839,7 +839,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
     {
         memZero(&m_PickFrame, sizeof(m_PickFrame));
     }
-    virtual ~SUICRenderSceneManager()
+    virtual ~Qt3DSRenderSceneManager()
     {
         for (QT3DSU32 idx = 0, end = m_Scenes.size(); idx < end; ++idx)
             m_Scenes[idx].second->Release();
@@ -870,13 +870,13 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         return stricmp(ending, "mesh") == 0;
     }
 
-    void FinalizeScene(Q3DStudio::IPresentation &inPresentation, SUICRenderScene &inScene)
+    void FinalizeScene(Q3DStudio::IPresentation &inPresentation, Qt3DSRenderScene &inScene)
     {
         inPresentation.SetScene(&inScene);
         if (m_ProjectInitialized == false) {
             m_ProjectInitialized = true;
-            if (m_Context->m_UICContext->GetTextRenderer())
-                m_Context->m_UICContext->GetTextRenderer()->AddProjectFontDirectory(
+            if (m_Context->m_Context->GetTextRenderer())
+                m_Context->m_Context->GetTextRenderer()->AddProjectFontDirectory(
                     inScene.m_Presentation->m_PresentationDirectory);
             eastl::string theBinaryPath(inPresentation.GetFilePath().toLatin1().constData());
             qt3ds::foundation::CFileTools::AppendDirectoryInPathToFile(theBinaryPath, "binary");
@@ -887,7 +887,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         }
         inScene.m_RuntimePresentation = &inPresentation;
         m_Scenes.push_back(make_pair(&inPresentation, &inScene));
-        CUICTranslator::AssignUserData(inPresentation, *inScene.m_Presentation);
+        Qt3DSTranslator::AssignUserData(inPresentation, *inScene.m_Presentation);
     }
 
     static const char *GetBinaryExtension() { return "uibsg"; }
@@ -902,13 +902,13 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         void CreateTable(lua_State *inState) override { m_Instance.CreateLuaProxy(inState); }
     };
 
-    void InitializeTranslator(CUICTranslator &inTranslator, Q3DStudio::IScriptBridge &inBridge)
+    void InitializeTranslator(Qt3DSTranslator &inTranslator, Q3DStudio::IScriptBridge &inBridge)
     {
         if (inTranslator.m_RenderObject->m_Type == GraphObjectTypes::RenderPlugin) {
             SRenderPlugin &theRenderPlugin =
                 static_cast<SRenderPlugin &>(*inTranslator.m_RenderObject);
             IRenderPluginInstance *thePluginInstance =
-                m_Context->m_UICContext->GetRenderPluginManager().GetOrCreateRenderPluginInstance(
+                m_Context->m_Context->GetRenderPluginManager().GetOrCreateRenderPluginInstance(
                     theRenderPlugin.m_PluginPath, &theRenderPlugin);
             if (thePluginInstance) {
                 SPluginInstanceTableProvider theProvider(*thePluginInstance);
@@ -943,10 +943,10 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
     {
         // We have to initialize the tags late so that we can load flow data before adding anything
         // to the string table.
-        CUICTranslator::InitializePointerTags(m_Context->m_RenderContext->GetStringTable());
+        Qt3DSTranslator::InitializePointerTags(m_Context->m_RenderContext->GetStringTable());
         NVScopedRefCounted<SSceneLoadData> theScene =
             QT3DS_NEW(m_Context->GetAllocator(), SSceneLoadData)(m_Context->GetAllocator());
-        SUICRenderScene *theIScene = NULL;
+        Qt3DSRenderScene *theIScene = NULL;
         if (inParser) {
             QString thePath(inPresentation->GetFilePath());
             QFileInfo fileInfo(thePath);
@@ -960,20 +960,20 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
                 m_Context->m_CoreContext->GetStringTable(),
                 m_Context->m_RenderContext->GetFoundation(),
                 theScene->m_AutoAllocator, theObjMap,
-                m_Context->m_UICContext->GetBufferManager(),
-                m_Context->m_UICContext->GetEffectSystem(),
+                m_Context->m_Context->GetBufferManager(),
+                m_Context->m_Context->GetEffectSystem(),
                 fileInfo.path().toLatin1().constData(),
-                m_Context->m_UICContext->GetRenderPluginManager(),
-                m_Context->m_UICContext->GetCustomMaterialSystem(),
-                m_Context->m_UICContext->GetDynamicObjectSystem(),
-                m_Context->m_UICContext->GetPathManager(), &theResolver, false);
+                m_Context->m_Context->GetRenderPluginManager(),
+                m_Context->m_Context->GetCustomMaterialSystem(),
+                m_Context->m_Context->GetDynamicObjectSystem(),
+                m_Context->m_Context->GetPathManager(), &theResolver, false);
             if (!theScene->m_Presentation) {
                 QT3DS_ASSERT(false);
                 return NULL;
             }
 
             NVConstDataRef<eastl::string> theSourcePathData(inParser->GetSourcePaths());
-            IBufferManager &theManager(m_Context->m_UICContext->GetBufferManager());
+            IBufferManager &theManager(m_Context->m_Context->GetBufferManager());
             // List of image paths to be loaded in parallel at the end.
             eastl::vector<CRegisteredString> theSourcePathList;
             for (QT3DSU32 idx = 0, end = theSourcePathData.size(); idx < end; ++idx) {
@@ -997,14 +997,14 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
             }
 
             // Fire off parallel loading of the source paths
-            QT3DSU64 imageBatchId = m_Context->m_UICContext->GetImageBatchLoader().LoadImageBatch(
+            QT3DSU64 imageBatchId = m_Context->m_Context->GetImageBatchLoader().LoadImageBatch(
                 toConstDataRef(theSourcePathList.data(), theSourcePathList.size()),
                 CRegisteredString(), NULL);
-            m_Context->m_UICContext->GetImageBatchLoader().BlockUntilLoaded(
+            m_Context->m_Context->GetImageBatchLoader().BlockUntilLoaded(
                 static_cast<TImageBatchId>(imageBatchId));
 
             theIScene = QT3DS_NEW(m_Context->GetAllocator(),
-                               SUICRenderScene)(*m_Context, *m_Context->m_UICContext, *theScene);
+                               Qt3DSRenderScene)(*m_Context, *m_Context->m_Context, *theScene);
             // Now we need to associate the presentation with everything else.
             NVAllocatorCallback &translatorAllocator = theScene->m_AutoAllocator;
             for (TIdObjectMap::iterator iter = theObjMap.begin(), end = theObjMap.end();
@@ -1014,7 +1014,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
                     inParser->GetElementForID(iter->first.c_str());
                 if (theElement.m_Element
                     && theElement.m_Type != Q3DStudio::UIPElementTypes::Unknown) {
-                    CUICTranslator *theTranslator = CUICTranslator::CreateTranslatorForElement(
+                    Qt3DSTranslator *theTranslator = Qt3DSTranslator::CreateTranslatorForElement(
                         *theElement.m_Element, *iter->second, translatorAllocator);
                     if (theTranslator) {
                         theIScene->m_DirtySet.insert(*theTranslator);
@@ -1128,7 +1128,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         theScene->m_Translators.resize(theNumTranslators);
         theScene->m_RuntimePresentation = &inPresentation;
         for (QT3DSU32 idx = 0, end = theNumTranslators; idx < end; ++idx) {
-            CUICTranslator *theTranslator = CUICTranslator::LoadTranslator(
+            Qt3DSTranslator *theTranslator = Qt3DSTranslator::LoadTranslator(
                 theReader, inElementMemoryOffset, theScene->m_SceneGraphData,
                 theScene->m_AutoAllocator);
             if (theTranslator) {
@@ -1140,10 +1140,10 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
     void OnGraphicsInitialized()
     {
-        QT3DS_ASSERT(m_Context->m_UICContext.mPtr);
+        QT3DS_ASSERT(m_Context->m_Context.mPtr);
         // this means graphics have been initialized
         eastl::string theSourcePathStr;
-        IBufferManager &theManager(m_Context->m_UICContext->GetBufferManager());
+        IBufferManager &theManager(m_Context->m_Context->GetBufferManager());
         nvvector<CRegisteredString> theSourcePathList(m_Context->GetAllocator(),
                                                       "TempSourcePathList");
         for (QT3DSU32 idx = 0, end = m_SourcePaths.size(); idx < end; ++idx) {
@@ -1166,7 +1166,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
             SStackPerfTimer __perfTimer(m_Context->m_CoreContext->GetPerfTimer(),
                                         "Initial Batch Image Load");
 
-            m_Context->m_UICContext->GetImageBatchLoader().LoadImageBatch(
+            m_Context->m_Context->GetImageBatchLoader().LoadImageBatch(
                 toConstDataRef(theSourcePathList.data(), theSourcePathList.size()),
                 CRegisteredString(), NULL);
         }
@@ -1179,8 +1179,8 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
                 SSceneLoadData &theScene = *m_LoadingScenes[idx];
                 // m_Context->m_Foundation->error( QT3DS_WARN, "Finalizing scene %d", (int)idx+1 );
                 if (theScene.m_RuntimePresentation) {
-                    SUICRenderScene *theIScene = QT3DS_NEW(m_Context->GetAllocator(), SUICRenderScene)(
-                        *m_Context, *m_Context->m_UICContext, theScene);
+                    Qt3DSRenderScene *theIScene = QT3DS_NEW(m_Context->GetAllocator(), Qt3DSRenderScene)(
+                        *m_Context, *m_Context->m_Context, theScene);
                     FinalizeScene(*theScene.m_RuntimePresentation, *theIScene);
                 } else {
                     qCWarning(WARNING, "Failed to finalize scene %d", (int)idx + 1);
@@ -1197,11 +1197,11 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         if (theHandle >= 0) {
             qt3ds::render::IOffscreenRenderer *theOffscreenRenderer =
                 QT3DS_NEW(m_Context->GetAllocator(),
-                       qt3ds::render::COldNBustedPluginRenderer)(*m_Context->m_UICContext, theHandle);
+                       qt3ds::render::COldNBustedPluginRenderer)(*m_Context->m_Context, theHandle);
             qt3ds::foundation::CRegisteredString theAssetString =
                 m_Context->m_CoreContext->GetStringTable().RegisterStr(inAssetIDString);
 
-            m_Context->m_UICContext->GetOffscreenRenderManager().RegisterOffscreenRenderer(
+            m_Context->m_Context->GetOffscreenRenderManager().RegisterOffscreenRenderer(
                 theAssetString, *theOffscreenRenderer);
 
             PROC_Initialize theInitializeProc =
@@ -1232,11 +1232,11 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
     {
         qt3ds::render::IOffscreenRenderer *theOffscreenRenderer =
             QT3DS_NEW(m_Context->GetAllocator(),
-                   Q3DSQmlRender)(*m_Context->m_UICContext, inAssetIDString);
+                   Q3DSQmlRender)(*m_Context->m_Context, inAssetIDString);
         if (theOffscreenRenderer) {
             qt3ds::foundation::CRegisteredString theAssetString =
                 m_Context->m_CoreContext->GetStringTable().RegisterStr(inAssetIDString);
-            m_Context->m_UICContext->GetOffscreenRenderManager().RegisterOffscreenRenderer(
+            m_Context->m_Context->GetOffscreenRenderManager().RegisterOffscreenRenderer(
                 SOffscreenRendererKey(theAssetString), *theOffscreenRenderer);
 
             m_RenderPlugins.push_back(make_pair(theAssetString, 0));
@@ -1245,7 +1245,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
     void BinarySave(Q3DStudio::IScene &inScene) override
     {
-        SUICRenderScene &theScene = static_cast<SUICRenderScene &>(inScene);
+        Qt3DSRenderScene &theScene = static_cast<Qt3DSRenderScene &>(inScene);
         qt3ds::render::SWriteBuffer theWriteBuffer(m_Context->GetAllocator(), "BinarySaveBuffer");
         qt3ds::render::SPtrOffsetMap theSGOffsetMap(m_Context->GetAllocator(), "PointerOffsetMap");
         // Start with some versioning and sanity checks.
@@ -1260,8 +1260,8 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         // These offsets are after we have read in the data section
         SGraphObjectSerializer::Save(
             m_Context->m_RenderContext->GetFoundation(), *theScene.m_Presentation, theWriteBuffer,
-            m_Context->m_UICContext->GetDynamicObjectSystem(),
-            m_Context->m_UICContext->GetPathManager(), theSGOffsetMap,
+            m_Context->m_Context->GetDynamicObjectSystem(),
+            m_Context->m_Context->GetPathManager(), theSGOffsetMap,
             m_Context->m_CoreContext->GetStringTable(), theScene.m_GraphObjectList);
 
         theWriteBuffer.align(sizeof(void *));
@@ -1274,8 +1274,8 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         // from old element ptr->new element ptr.
         QT3DSU32 theTranslatorCount = 0;
         for (QT3DSU32 idx = 0, end = theScene.m_GraphObjectList.size(); idx < end; ++idx) {
-            CUICTranslator *theTranslator =
-                CUICTranslator::GetTranslatorFromGraphNode(*theScene.m_GraphObjectList[idx]);
+            Qt3DSTranslator *theTranslator =
+                Qt3DSTranslator::GetTranslatorFromGraphNode(*theScene.m_GraphObjectList[idx]);
             // Presentation nodes don't have translator
             if (theTranslator) {
                 qt3ds::render::SPtrOffsetMap::iterator theIter =
@@ -1340,15 +1340,15 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         theWriteBuffer.writeZeros(4); // String system offset
         // string system last.
         QT3DSU32 theOffsetStart = theWriteBuffer.size();
-        m_Context->m_UICContext->GetDynamicObjectSystem().Save(
+        m_Context->m_Context->GetDynamicObjectSystem().Save(
             theWriteBuffer, theStrTable.GetRemapMap(), theProjectDir.c_str());
         theWriteBuffer.align(sizeof(void *));
         QT3DSU32 theEffectSystemOffset = theWriteBuffer.size() - theOffsetStart;
-        m_Context->m_UICContext->GetEffectSystem().Save(theWriteBuffer, theStrTable.GetRemapMap(),
+        m_Context->m_Context->GetEffectSystem().Save(theWriteBuffer, theStrTable.GetRemapMap(),
                                                         theProjectDir.c_str());
         theWriteBuffer.align(sizeof(void *));
         QT3DSU32 theMaterialSystemOffset = theWriteBuffer.size() - theOffsetStart;
-        m_Context->m_UICContext->GetCustomMaterialSystem().Save(
+        m_Context->m_Context->GetCustomMaterialSystem().Save(
             theWriteBuffer, theStrTable.GetRemapMap(), theProjectDir.c_str());
         QT3DSU32 theBinaryPathOffset = theWriteBuffer.size() - theOffsetStart;
 
@@ -1365,7 +1365,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
         QT3DSU32 thePluginManagerOffset = theWriteBuffer.size() - theOffsetStart;
 
-        m_Context->m_UICContext->GetRenderPluginManager().Save(
+        m_Context->m_Context->GetRenderPluginManager().Save(
             theWriteBuffer, theStrTable.GetRemapMap(), theProjectDir.c_str());
 
         QT3DSU32 theStringTableOffset = theWriteBuffer.size() - theOffsetStart;
@@ -1500,7 +1500,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
         bool theResult = false;
         long theSceneCount = m_Scenes.size();
         for (long theSceneIndex = 0; theSceneIndex < theSceneCount; ++theSceneIndex) {
-            SUICRenderScene *theScene = m_Scenes[theSceneIndex].second;
+            Qt3DSRenderScene *theScene = m_Scenes[theSceneIndex].second;
             theResult |= theScene->Update();
         }
         return theResult;
@@ -1508,7 +1508,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
     Q3DStudio::BOOL RenderPresentation(Q3DStudio::IPresentation *inPresentation) override
     {
-        SUICRenderScene *theFirstScene = NULL;
+        Qt3DSRenderScene *theFirstScene = NULL;
         for (QT3DSU32 idx = 0, end = m_Scenes.size(); idx < end && theFirstScene == NULL; ++idx)
             if (m_Scenes[idx].second->m_RuntimePresentation == inPresentation)
                 theFirstScene = m_Scenes[idx].second;
@@ -1517,25 +1517,25 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
             m_LastRenderedScene = theFirstScene;
             if (theFirstScene->m_Presentation->m_Scene
                 && theFirstScene->m_Presentation->m_Scene->m_UseClearColor) {
-                m_Context->m_UICContext->SetSceneColor(
+                m_Context->m_Context->SetSceneColor(
                     QT3DSVec4(theFirstScene->m_Presentation->m_Scene->m_ClearColor, 1.0f));
             } else
-                m_Context->m_UICContext->SetSceneColor(QT3DSVec4(0.0f, 0.0f, 0.0f, 0.0f));
+                m_Context->m_Context->SetSceneColor(QT3DSVec4(0.0f, 0.0f, 0.0f, 0.0f));
 
             // Setup the render rotation *before* rendering so that the magic can happen on begin
             // render.
             if (m_Context->m_RenderRotationsEnabled)
-                m_Context->m_UICContext->SetRenderRotation(
+                m_Context->m_Context->SetRenderRotation(
                     theFirstScene->m_Presentation->m_PresentationRotation);
             else
-                m_Context->m_UICContext->SetRenderRotation(RenderRotationValues::NoRotation);
+                m_Context->m_Context->SetRenderRotation(RenderRotationValues::NoRotation);
 
-            m_Context->m_UICContext->SetPresentationDimensions(SWindowDimensions(
+            m_Context->m_Context->SetPresentationDimensions(SWindowDimensions(
                 (QT3DSU32)theFirstScene->m_Presentation->m_PresentationDimensions.x,
                 (QT3DSU32)theFirstScene->m_Presentation->m_PresentationDimensions.y));
         }
 
-        m_Context->m_UICContext->BeginFrame();
+        m_Context->m_Context->BeginFrame();
         m_Context->m_RenderContext->ResetBlendState();
 
         // How exactly does this work, I have no idea.
@@ -1548,11 +1548,11 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
             m_Context->m_RenderContext->Clear(qt3ds::render::NVRenderClearFlags(
                 NVRenderClearValues::Color | NVRenderClearValues::Depth));
         }
-        m_Context->m_UICContext->RunRenderTasks();
+        m_Context->m_Context->RunRenderTasks();
         if (theFirstScene)
             theFirstScene->Render();
 
-        m_Context->m_UICContext->EndFrame();
+        m_Context->m_Context->EndFrame();
 
         return wasDirty;
     }
@@ -1570,16 +1570,16 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
     Q3DStudio::STextSizes GetDisplayDimensions(Q3DStudio::IPresentation *inPresentation) override
     {
-        SUICRenderScene *theFirstScene = NULL;
+        Qt3DSRenderScene *theFirstScene = NULL;
         for (QT3DSU32 idx = 0, end = m_Scenes.size(); idx < end && theFirstScene == NULL; ++idx)
             if (m_Scenes[idx].second->m_RuntimePresentation == inPresentation)
                 theFirstScene = m_Scenes[idx].second;
         if (theFirstScene) {
-            m_Context->m_UICContext->SetPresentationDimensions(SWindowDimensions(
+            m_Context->m_Context->SetPresentationDimensions(SWindowDimensions(
                 (QT3DSU32)theFirstScene->m_Presentation->m_PresentationDimensions.x,
                 (QT3DSU32)theFirstScene->m_Presentation->m_PresentationDimensions.y));
             render::NVRenderRectF theDisplayViewport =
-                m_Context->m_UICContext->GetDisplayViewport();
+                m_Context->m_Context->GetDisplayViewport();
             return Q3DStudio::STextSizes(
                 static_cast<Q3DStudio::INT32>(theDisplayViewport.m_Width),
                 static_cast<Q3DStudio::INT32>(theDisplayViewport.m_Height));
@@ -1668,13 +1668,13 @@ public:
                         qt3ds::state::IScriptContext &inScriptContext) override;
 };
 
-struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
+struct SRenderFactory : public IQt3DSRenderFactoryCore, public IQt3DSRenderFactory
 {
     NVScopedRefCounted<SBindingCore> m_Context;
 
     NVScopedRefCounted<Q3DStudio::CLuaEngine> m_ScriptBridge;
     NVScopedRefCounted<Q3DStudio::CQmlEngine> m_ScriptBridgeQml;
-    NVScopedRefCounted<SUICRenderSceneManager> m_SceneManager;
+    NVScopedRefCounted<Qt3DSRenderSceneManager> m_SceneManager;
     NVScopedRefCounted<qt3ds::state::IVisualStateContext> m_VisualStateContext;
     NVScopedRefCounted<qt3ds::evt::IEventSystem> m_EventSystem;
     qt3ds::runtime::IApplicationCore *m_ApplicationCore;
@@ -1714,7 +1714,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
         }
     }
 
-    qt3ds::render::IUICRenderContextCore &GetUICRenderContextCore() override
+    qt3ds::render::IQt3DSRenderContextCore &GetRenderContextCore() override
     {
         return *m_Context->m_CoreContext;
     }
@@ -1729,7 +1729,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
     {
         if (m_SceneManager == NULL)
             m_SceneManager = QT3DS_NEW(m_Context->GetAllocator(),
-                                    SUICRenderSceneManager)(*m_Context, m_Context->m_WindowSystem);
+                                    Qt3DSRenderSceneManager)(*m_Context, m_Context->m_WindowSystem);
         return *m_SceneManager;
     }
 
@@ -1741,7 +1741,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
     {
         if (m_SceneManager == NULL)
             m_SceneManager = QT3DS_NEW(m_Context->GetAllocator(),
-                                    SUICRenderSceneManager)(*m_Context, m_Context->m_WindowSystem);
+                                    Qt3DSRenderSceneManager)(*m_Context, m_Context->m_WindowSystem);
         return *m_SceneManager;
     }
     Q3DStudio::IScriptBridge &GetScriptEngine() override
@@ -1768,9 +1768,9 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
         return m_Context->m_CoreContext->GetInputStreamFactory();
     }
 
-    qt3ds::render::IUICRenderContext &GetUICRenderContext() override
+    qt3ds::render::IQt3DSRenderContext &GetQt3DSRenderContext() override
     {
-        return *m_Context->m_UICContext;
+        return *m_Context->m_Context;
     }
     qt3ds::state::IVisualStateContext &GetVisualStateContext() override
     {
@@ -1851,7 +1851,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
         }
     };
 
-    IUICRenderFactory &CreateRenderFactory(const QSurfaceFormat& format) override
+    IQt3DSRenderFactory &CreateRenderFactory(const QSurfaceFormat& format) override
     {
 
         SContextTypeRenderFactory theContextFactory(format);
@@ -1986,8 +1986,8 @@ void SVisualStateHandler::Handle(const qt3ds::state::SVisualStateCommand &inComm
 }
 }
 
-IUICRenderFactoryCore &
-IUICRenderFactoryCore::CreateRenderFactoryCore(const char8_t *inApplicationDirectory,
+IQt3DSRenderFactoryCore &
+IQt3DSRenderFactoryCore::CreateRenderFactoryCore(const char8_t *inApplicationDirectory,
                                                Q3DStudio::IWindowSystem &inWindowSystem,
                                                Q3DStudio::ITimeProvider &inTimeProvider)
 {
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
index 60a673f1..3963de9a 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
@@ -58,7 +58,7 @@ public:
 struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
 {
     NVScopedRefCounted<SBindingCore> m_BindingCore;
-    NVScopedRefCounted<IUICRenderContext> m_UICContext;
+    NVScopedRefCounted<IQt3DSRenderContext> m_Context;
     NVRenderRect m_Viewport;
     nvvector<NVRenderRect> m_StateStack;
     SWindowDimensions m_PresentationDimensions;
@@ -67,12 +67,12 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
 
     SRenderer(SBindingCore &inCore, Q3DStudio::IWindowSystem &inWindowSystem)
         : m_BindingCore(inCore)
-        , m_UICContext(*inCore.m_UICContext)
-        , m_StateStack(inCore.m_UICContext->GetAllocator(), "SRenderer::m_StateStack")
+        , m_Context(*inCore.m_Context)
+        , m_StateStack(inCore.m_Context->GetAllocator(), "SRenderer::m_StateStack")
         , m_RSM(*this)
         , m_WindowSystem(inWindowSystem)
     {
-        m_UICContext->SetSceneColor(QT3DSVec4(0, 0, 0, 0.0f));
+        m_Context->SetSceneColor(QT3DSVec4(0, 0, 0, 0.0f));
         if (m_BindingCore->m_RenderContext) {
             m_BindingCore->m_RenderContext->SetDefaultRenderTarget(
                 m_WindowSystem.GetDefaultRenderTargetID());
@@ -92,7 +92,7 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
         Q3DStudio::SSize theWindowDims(m_WindowSystem.GetWindowDimensions());
         m_BindingCore->m_WindowDimensions =
             SWindowDimensions(theWindowDims.m_Width, theWindowDims.m_Height);
-        m_BindingCore->m_UICContext->SetWindowDimensions(m_BindingCore->m_WindowDimensions);
+        m_BindingCore->m_Context->SetWindowDimensions(m_BindingCore->m_WindowDimensions);
     }
     Q3DStudio::BOOL LoadShaderCache(const char * /*inFilePath*/) override { return true; }
 
@@ -114,14 +114,14 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
 
     void SetScaleMode(Q3DStudio::TegraRenderScaleModes::Enum inScale) override
     {
-        if (m_BindingCore && m_BindingCore->m_UICContext)
-            m_BindingCore->m_UICContext->SetScaleMode(static_cast<ScaleModes::Enum>(inScale));
+        if (m_BindingCore && m_BindingCore->m_Context)
+            m_BindingCore->m_Context->SetScaleMode(static_cast<ScaleModes::Enum>(inScale));
     }
     Q3DStudio::TegraRenderScaleModes::Enum GetScaleMode() const override
     {
-        if (m_BindingCore && m_BindingCore->m_UICContext)
+        if (m_BindingCore && m_BindingCore->m_Context)
             return static_cast<Q3DStudio::TegraRenderScaleModes::Enum>(
-                const_cast<SRenderer &>(*this).m_BindingCore->m_UICContext->GetScaleMode());
+                const_cast<SRenderer &>(*this).m_BindingCore->m_Context->GetScaleMode());
 
         QT3DS_ASSERT(false);
         return Q3DStudio::TegraRenderScaleModes::ExactSize;
@@ -129,8 +129,8 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
 
     void SetShadeMode(Q3DStudio::TegraRenderShadeModes::Enum inShade) override
     {
-        if (m_BindingCore && m_BindingCore->m_UICContext) {
-            m_BindingCore->m_UICContext->SetWireframeMode(
+        if (m_BindingCore && m_BindingCore->m_Context) {
+            m_BindingCore->m_Context->SetWireframeMode(
                 (inShade == Q3DStudio::TegraRenderShadeModes::Shaded) ? false : true);
         }
     }
@@ -155,7 +155,7 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
     {
         // Ensure the core doesn't die until after we do.
         NVScopedRefCounted<SBindingCore> theContext(m_BindingCore);
-        NVDelete(m_UICContext->GetAllocator(), this);
+        NVDelete(m_Context->GetAllocator(), this);
     }
 
     void SetViewport(Q3DStudio::INT32 inX, Q3DStudio::INT32 inY, Q3DStudio::INT32 inWidth,
@@ -166,10 +166,10 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
     }
     void SetApplicationViewport(const qt3ds::render::NVRenderRect &inViewport) override
     {
-        m_BindingCore->m_UICContext->SetViewport(inViewport);
+        m_BindingCore->m_Context->SetViewport(inViewport);
     }
 
-    void SetMatteColor(Option<QT3DSVec4> inColor) override { m_UICContext->SetMatteColor(inColor); }
+    void SetMatteColor(Option<QT3DSVec4> inColor) override { m_Context->SetMatteColor(inColor); }
     virtual void PushState() { m_StateStack.push_back(m_Viewport); }
     virtual void PopState()
     {
@@ -181,13 +181,13 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
     void RenderText2D(Q3DStudio::FLOAT x, Q3DStudio::FLOAT y,
                               qt3ds::foundation::Option<qt3ds::QT3DSVec3> inColor, const char *text) override
     {
-        m_UICContext->RenderText2D(x, y, inColor, text);
+        m_Context->RenderText2D(x, y, inColor, text);
     }
 
     void RenderGpuProfilerStats(Q3DStudio::FLOAT x, Q3DStudio::FLOAT y,
                                         qt3ds::foundation::Option<qt3ds::QT3DSVec3> inColor) override
     {
-        m_UICContext->RenderGpuProfilerStats(x, y, inColor);
+        m_Context->RenderGpuProfilerStats(x, y, inColor);
     }
 
     bool SetWatermarkTextureDataDDS(const unsigned char *inTextureData, size_t inDataSize) override
@@ -240,7 +240,7 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
                         theTexture->SetMinFilter(NVRenderTextureMinifyingOp::Linear);
 
                     theLoadedTexture->ReleaseDecompressedTexture(theDecompressedImage);
-                    m_BindingCore->m_UICContext->SetWatermark(*theTexture);
+                    m_BindingCore->m_Context->SetWatermark(*theTexture);
                     retval = true;
                 }
                 theLoadedTexture->release();
@@ -251,7 +251,7 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine
 
     void SetWatermarkLocation(float x, float y) override
     {
-        m_BindingCore->m_UICContext->SetWatermarkLocation(QT3DSVec2(x, y));
+        m_BindingCore->m_Context->SetWatermarkLocation(QT3DSVec2(x, y));
     }
 };
 
@@ -284,8 +284,8 @@ void SRendererRSM::RestoreAllState()
 Q3DStudio::ITegraApplicationRenderEngine &SBindingCore::CreateRenderer()
 {
     SRenderer *retval = NULL;
-    if (m_UICContext)
-        retval = QT3DS_NEW(m_UICContext->GetAllocator(), SRenderer)(*this, this->m_WindowSystem);
+    if (m_Context)
+        retval = QT3DS_NEW(m_Context->GetAllocator(), SRenderer)(*this, this->m_WindowSystem);
 
     return *retval;
 }
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
index af5ca40e..6b8ac800 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
@@ -64,7 +64,7 @@ QT3DSU32 g_PresentationTag;
 namespace qt3ds {
 namespace render {
     template <>
-    struct SPointerTag<CUICTranslator>
+    struct SPointerTag<Qt3DSTranslator>
     {
         static QT3DSU32 GetTag() { return g_TranslatorTag; }
     };
@@ -78,18 +78,18 @@ namespace render {
 
 namespace {
 
-template <UICRenderDirtyFlags::Enum TDirtyType>
+template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
 struct SDirtySetter
 {
 };
 
 template <>
-struct SDirtySetter<UICRenderDirtyFlags::Dirty>
+struct SDirtySetter<Qt3DSRenderDirtyFlags::Dirty>
 {
     static void Set(bool &dirty, bool & /*transformDirty*/, bool & /*textDirty*/) { dirty = true; }
 };
 template <>
-struct SDirtySetter<UICRenderDirtyFlags::TransformDirty>
+struct SDirtySetter<Qt3DSRenderDirtyFlags::TransformDirty>
 {
     static void Set(bool &dirty, bool &transformDirty, bool & /*textDirty*/)
     {
@@ -98,7 +98,7 @@ struct SDirtySetter<UICRenderDirtyFlags::TransformDirty>
     }
 };
 template <>
-struct SDirtySetter<UICRenderDirtyFlags::TextDirty>
+struct SDirtySetter<Qt3DSRenderDirtyFlags::TextDirty>
 {
     static void Set(bool &dirty, bool & /*transformDirty*/, bool &textDirty)
     {
@@ -107,7 +107,7 @@ struct SDirtySetter<UICRenderDirtyFlags::TextDirty>
     }
 };
 template <>
-struct SDirtySetter<UICRenderDirtyFlags::Unknown>
+struct SDirtySetter<Qt3DSRenderDirtyFlags::Unknown>
 {
     static void Set(bool & /*dirty*/, bool & /*transformDirty*/, bool & /*textDirty*/) {}
 };
@@ -120,12 +120,12 @@ struct SRuntimePropertyParser
     Q3DStudio::EAttributeType m_Type;
     Q3DStudio::TElement &m_Element;
     SPresentation &m_Presentation;
-    IUICRenderContext &m_RenderContext;
+    IQt3DSRenderContext &m_RenderContext;
     bool m_Dirty;
     bool m_TransformDirty;
     bool m_TextDirty;
 
-    SRuntimePropertyParser(SPresentation &inPresentation, IUICRenderContext &inRenderContext,
+    SRuntimePropertyParser(SPresentation &inPresentation, IQt3DSRenderContext &inRenderContext,
                            Q3DStudio::TElement &inElement)
         : m_PropertyName(0)
         , m_Type((Q3DStudio::EAttributeType)0)
@@ -144,12 +144,12 @@ struct SRuntimePropertyParser
         m_Value = inValue;
         m_Type = inType;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     void SetDirty()
     {
         SDirtySetter<TDirtyType>::Set(m_Dirty, m_TransformDirty, m_TextDirty);
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(QT3DSF32 &outValue)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_FLOAT) {
@@ -164,7 +164,7 @@ struct SRuntimePropertyParser
         }
         return false;
     };
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(QT3DSU32 &outValue)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_INT32) {
@@ -179,7 +179,7 @@ struct SRuntimePropertyParser
         }
         return false;
     };
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(SGraphObject *&outValue)
     {
         Q3DStudio::TElement *theElem = NULL;
@@ -196,8 +196,8 @@ struct SRuntimePropertyParser
 
         SGraphObject *newValue = NULL;
         if (theElem) {
-            CUICTranslator *theTranslator =
-                reinterpret_cast<CUICTranslator *>(theElem->GetAssociation());
+            Qt3DSTranslator *theTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(theElem->GetAssociation());
             if (theTranslator)
                 newValue = theTranslator->m_RenderObject;
         }
@@ -208,7 +208,7 @@ struct SRuntimePropertyParser
         }
         return false;
     };
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseRadianProperty(QT3DSF32 &outValue)
     {
         if (ParseProperty<TDirtyType>(outValue)) {
@@ -217,7 +217,7 @@ struct SRuntimePropertyParser
         }
         return false;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseOpacityProperty(QT3DSF32 &outValue)
     {
         if (ParseProperty<TDirtyType>(outValue)) {
@@ -227,7 +227,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseOrientationProperty(bool &ioCurrent)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_STRING) {
@@ -245,7 +245,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(bool &ioCurrent)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_BOOL || m_Type == Q3DStudio::ATTRIBUTETYPE_INT32) {
@@ -260,7 +260,7 @@ struct SRuntimePropertyParser
         }
         return false;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseInverseBoolean(bool &ioCurrent)
     {
         bool temp = !ioCurrent;
@@ -270,7 +270,7 @@ struct SRuntimePropertyParser
         }
         return false;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(QT3DSVec3 &outValue)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_FLOAT3) {
@@ -286,7 +286,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(CRegisteredString &outValue)
     {
         if (m_Type == Q3DStudio::ATTRIBUTETYPE_STRING) {
@@ -303,11 +303,11 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseRotationOrder(QT3DSU32 &outValue)
     {
         CRegisteredString theString;
-        ParseProperty<UICRenderDirtyFlags::Unknown>(theString);
+        ParseProperty<Qt3DSRenderDirtyFlags::Unknown>(theString);
         if (theString.IsValid()) {
             QT3DSU32 newRotationOrder = MapRotationOrder(theString);
             if (newRotationOrder != outValue) {
@@ -319,7 +319,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseOrientation(NodeFlags &outValue)
     {
         bool temp = false;
@@ -332,11 +332,11 @@ struct SRuntimePropertyParser
         }
         return false;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseNodeFlagsProperty(NodeFlags &outValue, NodeFlagValues::Enum inFlag)
     {
         bool temp = false;
-        ParseProperty<UICRenderDirtyFlags::Unknown>(temp);
+        ParseProperty<Qt3DSRenderDirtyFlags::Unknown>(temp);
         bool wasSet = outValue & inFlag;
         if (temp != wasSet) {
             outValue.ClearOrSet(temp, inFlag);
@@ -346,11 +346,11 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseNodeFlagsInverseProperty(NodeFlags &outValue, NodeFlagValues::Enum inFlag)
     {
         bool temp = false;
-        ParseProperty<UICRenderDirtyFlags::Unknown>(temp);
+        ParseProperty<Qt3DSRenderDirtyFlags::Unknown>(temp);
         temp = !temp;
         bool wasSet = outValue & inFlag;
         if (temp != wasSet) {
@@ -361,11 +361,11 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType, typename TEnumType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType, typename TEnumType>
     bool ParseEnumProperty(TEnumType &outValue)
     {
         CRegisteredString theString;
-        ParseProperty<UICRenderDirtyFlags::Unknown>(theString);
+        ParseProperty<Qt3DSRenderDirtyFlags::Unknown>(theString);
         if (theString.IsValid()) {
             SEnumNameMap *theMap = SEnumParseMap<TEnumType>::GetMap();
             for (SEnumNameMap *theItem = theMap; theItem->m_Name && *theItem->m_Name; ++theItem) {
@@ -381,11 +381,11 @@ struct SRuntimePropertyParser
         }
         return false;
     }
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseAndResolveSourcePath(CRegisteredString &outValue)
     {
         CRegisteredString theTemp;
-        ParseProperty<UICRenderDirtyFlags::Unknown>(theTemp);
+        ParseProperty<Qt3DSRenderDirtyFlags::Unknown>(theTemp);
         CRegisteredString theNewStr = theTemp;
         if (outValue.c_str() != theNewStr.c_str()) {
             SetDirty<TDirtyType>();
@@ -395,7 +395,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(SImage *&ioImagePtr)
     {
         Q3DStudio::TElement *theElem =
@@ -404,8 +404,8 @@ struct SRuntimePropertyParser
         // Try to be very careful in here as casting things around like crazy is a sure
         // way to crash the runtime at a bad point.
         if (theElem != NULL) {
-            CUICTranslator *theTranslator =
-                reinterpret_cast<CUICTranslator *>(theElem->GetAssociation());
+            Qt3DSTranslator *theTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(theElem->GetAssociation());
             if (theTranslator != NULL && theTranslator->GetUIPType() == GraphObjectTypes::Image) {
                 SImage *theImage = static_cast<SImage *>(theTranslator->m_RenderObject);
                 if (ioImagePtr != theImage) {
@@ -418,7 +418,7 @@ struct SRuntimePropertyParser
         return false;
     }
 
-    template <UICRenderDirtyFlags::Enum TDirtyType>
+    template <Qt3DSRenderDirtyFlags::Enum TDirtyType>
     bool ParseProperty(SNode *&ioNodePtr)
     {
         Q3DStudio::TElement *theElem =
@@ -429,8 +429,8 @@ struct SRuntimePropertyParser
         SNode *theNode = NULL;
         if (theElem != NULL
             && theElem->GetBelongedPresentation() == m_Element.GetBelongedPresentation()) {
-            CUICTranslator *theTranslator =
-                reinterpret_cast<CUICTranslator *>(theElem->GetAssociation());
+            Qt3DSTranslator *theTranslator =
+                reinterpret_cast<Qt3DSTranslator *>(theElem->GetAssociation());
             if (theTranslator != NULL
                 && GraphObjectTypes::IsNodeType(theTranslator->GetUIPType())) {
                 theNode = static_cast<SNode *>(theTranslator->m_RenderObject);
@@ -646,128 +646,128 @@ struct SRuntimePropertyParser
 // Fill in implementations for the actual parse tables.
 #define HANDLE_QT3DS_RENDER_PROPERTY(type, name, dirty)                                              \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);                      \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                      \
         break;
 
 #define HANDLE_QT3DS_RENDER_VEC3_PROPERTY(type, name, dirty)                                         \
     case Q3DStudio::type##_##name##_X:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Y:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Z:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
         break;
 
 #define HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(type, name, dirty)                                    \
     case Q3DStudio::type##_##name##_X:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Y:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
         break;
 
 #define HANDLE_QT3DS_RENDER_COLOR_PROPERTY(type, name, dirty)                                        \
     case Q3DStudio::type##_##name##_R:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_G:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_B:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
         break;
 
 #define HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(type, name, dirty)                                   \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);                      \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                      \
         break;
 
 #define HANDLE_QT3DS_RENDER_TRANSFORM_VEC3_PROPERTY(type, name, dirty)                               \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);                      \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                      \
         break;
 
 #define HANDLE_QT3DS_RENDER_RADIAN_PROPERTY(type, name, dirty)                                       \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseRadianProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);                \
+        inParser.ParseRadianProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                \
         break;
 
 // The runtime converts rotations for us.
 #define HANDLE_QT3DS_RENDER_VEC3_RADIAN_PROPERTY(type, name, dirty)                                  \
     case Q3DStudio::type##_##name##_X:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Y:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Z:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.z);                    \
         break;
 
 #define HANDLE_QT3DS_RENDER_OPACITY_PROPERTY(type, name, dirty)                                      \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseOpacityProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);               \
+        inParser.ParseOpacityProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);               \
         break;
 
 #define HANDLE_QT3DS_ROTATION_ORDER_PROPERTY(type, name, dirty)                                      \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseRotationOrder<UICRenderDirtyFlags::dirty>(theItem.m_##name);                 \
+        inParser.ParseRotationOrder<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                 \
         break;
 
 #define HANDLE_QT3DS_NODE_ORIENTATION_PROPERTY(type, name, dirty)                                    \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseOrientation<UICRenderDirtyFlags::dirty>(theItem.m_Flags);                    \
+        inParser.ParseOrientation<Qt3DSRenderDirtyFlags::dirty>(theItem.m_Flags);                    \
         break;
 
 #define HANDLE_QT3DS_RENDER_DEPTH_TEST_PROPERTY(type, name, dirty)                                   \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseInverseBoolean<UICRenderDirtyFlags::dirty>(theItem.m_##name);                \
+        inParser.ParseInverseBoolean<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                \
         break;
 
 #define HANDLE_QT3DS_NODE_FLAGS_PROPERTY(type, name, dirty)                                          \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseNodeFlagsProperty<UICRenderDirtyFlags::dirty>(theItem.m_Flags,               \
+        inParser.ParseNodeFlagsProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_Flags,               \
                                                                     NodeFlagValues::name);         \
         break;
 
 #define HANDLE_QT3DS_NODE_FLAGS_INVERSE_PROPERTY(type, name, dirty)                                  \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseNodeFlagsInverseProperty<UICRenderDirtyFlags::dirty>(theItem.m_Flags,        \
+        inParser.ParseNodeFlagsInverseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_Flags,        \
                                                                            NodeFlagValues::name);  \
         break;
 
 #define HANDLE_QT3DS_RENDER_ENUM_PROPERTY(type, name, dirty)                                         \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseEnumProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name);                  \
+        inParser.ParseEnumProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);                  \
         break;
 
 #define HANDLE_QT3DS_RENDER_SOURCEPATH_PROPERTY(type, name, dirty)                                   \
     case Q3DStudio::type##_##name:                                                                 \
-        inParser.ParseAndResolveSourcePath<UICRenderDirtyFlags::dirty>(theItem.m_##name);          \
+        inParser.ParseAndResolveSourcePath<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name);          \
         break;
 
 #define HANDLE_QT3DS_RENDER_ARRAY_PROPERTY(type, name, index, dirty)                                 \
     case Q3DStudio::type##_##name##_##index:                                                       \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name[index]);               \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name[index]);               \
         break;
 
 #define HANDLE_QT3DS_RENDER_VEC2_PROPERTY(type, name, dirty)                                         \
     case Q3DStudio::type##_##name##_X:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.x);                    \
         break;                                                                                     \
     case Q3DStudio::type##_##name##_Y:                                                             \
-        inParser.ParseProperty<UICRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
+        inParser.ParseProperty<Qt3DSRenderDirtyFlags::dirty>(theItem.m_##name.y);                    \
         break;
 
 const float g_DegToRad = float(M_PI / 180.0);
 
-struct SSceneTranslator : public CUICTranslator
+struct SSceneTranslator : public Qt3DSTranslator
 {
     typedef SScene TNodeType;
     SSceneTranslator(Q3DStudio::TElement &inElement, SScene &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
     }
     // Ignored, scenes are always active
@@ -794,11 +794,11 @@ struct SSceneTranslator : public CUICTranslator
     void PostPropertyChanged(const SRuntimePropertyParser &, Q3DStudio::IPresentation &) {}
 };
 
-struct SNodeTranslator : public CUICTranslator
+struct SNodeTranslator : public Qt3DSTranslator
 {
     typedef SNode TNodeType;
     SNodeTranslator(Q3DStudio::TElement &inElement, SNode &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
         SNode &theItem = *static_cast<SNode *>(m_RenderObject);
         theItem.m_Flags.SetLocallyPickable(false);
@@ -950,13 +950,13 @@ struct SPathTranslator : public SNodeTranslator
     }
 };
 
-struct SPathSubPathTranslator : public CUICTranslator
+struct SPathSubPathTranslator : public Qt3DSTranslator
 {
 
     typedef SPathSubPath TNodeType;
 
     SPathSubPathTranslator(Q3DStudio::TElement &inElement, SPathSubPath &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
     }
 
@@ -1032,11 +1032,11 @@ struct SPathSubPathTranslator : public CUICTranslator
     }
 };
 
-struct SDefaultMaterialTranslator : public CUICTranslator
+struct SDefaultMaterialTranslator : public Qt3DSTranslator
 {
     typedef SDefaultMaterial TNodeType;
     SDefaultMaterialTranslator(Q3DStudio::TElement &inElement, SDefaultMaterial &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
     }
     // Right now materials do not respect the active flag
@@ -1069,11 +1069,11 @@ struct SDefaultMaterialTranslator : public CUICTranslator
     }
 };
 
-struct SImageTranslator : public CUICTranslator
+struct SImageTranslator : public Qt3DSTranslator
 {
     typedef SImage TNodeType;
     SImageTranslator(Q3DStudio::TElement &inElement, SImage &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
     }
 
@@ -1103,11 +1103,11 @@ struct SImageTranslator : public CUICTranslator
     }
 };
 
-struct SReferencedMaterialTranslator : public CUICTranslator
+struct SReferencedMaterialTranslator : public Qt3DSTranslator
 {
     typedef SReferencedMaterial TNodeType;
     SReferencedMaterialTranslator(Q3DStudio::TElement &inElement, TNodeType &inRenderObject)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
     }
 
@@ -1273,7 +1273,7 @@ struct SDynamicObjectTranslatorContext : public STranslatorContext
             }
         }
     }
-    void ApplyChanges(SPresentation &inPresentation, IUICRenderContext &inRenderContext,
+    void ApplyChanges(SPresentation &inPresentation, IQt3DSRenderContext &inRenderContext,
                       SDynamicObject &inObject, Q3DStudio::TElement &element,
                       IDynamicObjectSystem &inSystem)
     {
@@ -1328,17 +1328,17 @@ struct SDynamicObjectTranslatorContext : public STranslatorContext
     }
 };
 
-struct SEffectTranslator : public CUICTranslator
+struct SEffectTranslator : public Qt3DSTranslator
 {
     typedef SEffect TNodeType;
     SEffectTranslator(Q3DStudio::TElement &inElement, SEffect &inRenderObject,
                       NVAllocatorCallback &inCallback)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
         m_TranslatorContext = QT3DS_NEW(inCallback, SDynamicObjectTranslatorContext)(inCallback);
     }
 
-    void OnElementChanged(SPresentation &inPresentation, IUICRenderContext &inRenderContext,
+    void OnElementChanged(SPresentation &inPresentation, IQt3DSRenderContext &inRenderContext,
                           Q3DStudio::IPresentation &)
     {
         SRuntimePropertyParser theParser(inPresentation, inRenderContext, *m_Element);
@@ -1350,17 +1350,17 @@ struct SEffectTranslator : public CUICTranslator
     }
 };
 
-struct SCustomMaterialTranslator : public CUICTranslator
+struct SCustomMaterialTranslator : public Qt3DSTranslator
 {
     typedef SCustomMaterial TNodeType;
     SCustomMaterialTranslator(Q3DStudio::TElement &inElement, SCustomMaterial &inRenderObject,
                               NVAllocatorCallback &inCallback)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
         m_TranslatorContext = QT3DS_NEW(inCallback, SDynamicObjectTranslatorContext)(inCallback);
     }
 
-    void OnElementChanged(SPresentation &inPresentation, IUICRenderContext &inRenderContext,
+    void OnElementChanged(SPresentation &inPresentation, IQt3DSRenderContext &inRenderContext,
                           Q3DStudio::IPresentation &)
     {
         SRuntimePropertyParser theParser(inPresentation, inRenderContext, *m_Element);
@@ -1395,17 +1395,17 @@ struct SRenderPluginTranslatorContext : public STranslatorContext
     }
 };
 
-struct SRenderPluginTranslator : public CUICTranslator
+struct SRenderPluginTranslator : public Qt3DSTranslator
 {
     typedef SRenderPlugin TNodeType;
     SRenderPluginTranslator(Q3DStudio::TElement &inElement, SRenderPlugin &inRenderObject,
                             NVAllocatorCallback &inCallback)
-        : CUICTranslator(inElement, inRenderObject)
+        : Qt3DSTranslator(inElement, inRenderObject)
     {
         m_TranslatorContext = QT3DS_NEW(inCallback, SRenderPluginTranslatorContext)(inCallback);
     }
 
-    void OnElementChanged(SPresentation & /*inPresentation*/, IUICRenderContext &inRenderContext,
+    void OnElementChanged(SPresentation & /*inPresentation*/, IQt3DSRenderContext &inRenderContext,
                           Q3DStudio::IPresentation &)
     {
         SRenderPlugin &theItem = *static_cast<SRenderPlugin *>(m_RenderObject);
@@ -1500,7 +1500,7 @@ struct SRenderPluginTranslator : public CUICTranslator
 };
 }
 
-CUICTranslator::CUICTranslator(Q3DStudio::TElement &inElement, SGraphObject &inRenderObject)
+Qt3DSTranslator::Qt3DSTranslator(Q3DStudio::TElement &inElement, SGraphObject &inRenderObject)
     : m_DirtyIndex(QT3DS_MAX_U32)
     , m_Element(&inElement)
     , m_RenderObject(&inRenderObject)
@@ -1510,14 +1510,14 @@ CUICTranslator::CUICTranslator(Q3DStudio::TElement &inElement, SGraphObject &inR
     inRenderObject.m_UserData = STaggedPointer(this);
 }
 
-void CUICTranslator::Save(SWriteBuffer &inWriteBuffer, QT3DSU32 inGraphObjectOffset)
+void Qt3DSTranslator::Save(SWriteBuffer &inWriteBuffer, QT3DSU32 inGraphObjectOffset)
 {
     // We have to start on pointer aligned boundaries.
     QT3DS_ASSERT(inWriteBuffer.size() % sizeof(void *) == 0);
     QT3DSU32 theOffset = inWriteBuffer.size();
     inWriteBuffer.write(*this);
-    CUICTranslator *theNewTranslator =
-        reinterpret_cast<CUICTranslator *>(inWriteBuffer.begin() + theOffset);
+    Qt3DSTranslator *theNewTranslator =
+        reinterpret_cast<Qt3DSTranslator *>(inWriteBuffer.begin() + theOffset);
     theNewTranslator->m_DirtyIndex = QT3DS_MAX_U32;
     if (theNewTranslator->m_Element)
         theNewTranslator->m_Element = m_Element->GetBelongedPresentation()
@@ -1528,9 +1528,9 @@ void CUICTranslator::Save(SWriteBuffer &inWriteBuffer, QT3DSU32 inGraphObjectOff
     *graphObjPtr = inGraphObjectOffset;
 }
 
-CUICTranslator *CUICTranslator::GetTranslatorFromGraphNode(SGraphObject &inObject)
+Qt3DSTranslator *Qt3DSTranslator::GetTranslatorFromGraphNode(SGraphObject &inObject)
 {
-    return inObject.m_UserData.DynamicCast<CUICTranslator>();
+    return inObject.m_UserData.DynamicCast<Qt3DSTranslator>();
 }
 
 namespace {
@@ -1545,10 +1545,10 @@ struct STranslatorCreator
         typedef typename TTranslatorType::TNodeType TNodeType;
         // This assert needs to be here because we serialize all translators generically without
         // regard for type.
-        StaticAssert<sizeof(TTranslatorType) == sizeof(CUICTranslator)>::valid_expression();
+        StaticAssert<sizeof(TTranslatorType) == sizeof(Qt3DSTranslator)>::valid_expression();
         return QT3DS_NEW(inAllocator, TTranslatorType)(inElement, static_cast<TNodeType &>(inObject));
     }
-    static void InitializeTranslator(CUICTranslator &inTranslator, NVAllocatorCallback &)
+    static void InitializeTranslator(Qt3DSTranslator &inTranslator, NVAllocatorCallback &)
     {
         typedef typename TTranslatorType::TNodeType TNodeType;
         // Initialize the vtable.
@@ -1556,8 +1556,8 @@ struct STranslatorCreator
                                             static_cast<TNodeType &>(inTranslator.RenderObject()));
     }
 
-    static void OnElementChanged(CUICTranslator &inTranslator, SPresentation &inPresentation,
-                                 IUICRenderContext &inRenderContext,
+    static void OnElementChanged(Qt3DSTranslator &inTranslator, SPresentation &inPresentation,
+                                 IQt3DSRenderContext &inRenderContext,
                                  Q3DStudio::IPresentation &inStudioPresentation)
     {
         TTranslatorType &theTranslator(static_cast<TTranslatorType &>(inTranslator));
@@ -1594,15 +1594,15 @@ struct STranslatorCreator
 template <>
 struct STranslatorCreator<SPresentationTranslator>
 {
-    static CUICTranslator *Create(Q3DStudio::TElement &, SGraphObject &, NVAllocatorCallback &)
+    static Qt3DSTranslator *Create(Q3DStudio::TElement &, SGraphObject &, NVAllocatorCallback &)
     {
         return NULL;
     }
-    static void InitializeTranslator(CUICTranslator &, NVAllocatorCallback &) {}
-    static void OnElementChanged(CUICTranslator & /*inTranslator*/,
+    static void InitializeTranslator(Qt3DSTranslator &, NVAllocatorCallback &) {}
+    static void OnElementChanged(Qt3DSTranslator & /*inTranslator*/,
                                  SPresentation & /*inPresentation*/
                                  ,
-                                 IUICRenderContext & /*inRenderContext*/,
+                                 IQt3DSRenderContext & /*inRenderContext*/,
                                  Q3DStudio::IPresentation & /*inStudioPresentation*/)
     {
         QT3DS_ASSERT(false);
@@ -1618,12 +1618,12 @@ struct STranslatorCreator<SEffectTranslator>
         typedef SEffectTranslator::TNodeType TNodeType;
         // This assert needs to be here because we serialize all translators generically without
         // regard for type.
-        StaticAssert<sizeof(SEffectTranslator) == sizeof(CUICTranslator)>::valid_expression();
+        StaticAssert<sizeof(SEffectTranslator) == sizeof(Qt3DSTranslator)>::valid_expression();
         return QT3DS_NEW(inAllocator, SEffectTranslator)(inElement, static_cast<TNodeType &>(inObject),
                                                       inAllocator);
     }
 
-    static void InitializeTranslator(CUICTranslator &inTranslator, NVAllocatorCallback &inAllocator)
+    static void InitializeTranslator(Qt3DSTranslator &inTranslator, NVAllocatorCallback &inAllocator)
     {
         typedef SEffectTranslator::TNodeType TNodeType;
         // Initialize the vtable.
@@ -1631,8 +1631,8 @@ struct STranslatorCreator<SEffectTranslator>
             SEffectTranslator(inTranslator.Element(),
                               static_cast<TNodeType &>(inTranslator.RenderObject()), inAllocator);
     }
-    static void OnElementChanged(CUICTranslator &inTranslator, SPresentation &inPresentation,
-                                 IUICRenderContext &inRenderContext,
+    static void OnElementChanged(Qt3DSTranslator &inTranslator, SPresentation &inPresentation,
+                                 IQt3DSRenderContext &inRenderContext,
                                  Q3DStudio::IPresentation &inStudioPresentation)
     {
         static_cast<SEffectTranslator &>(inTranslator)
@@ -1650,12 +1650,12 @@ struct STranslatorCreator<SCustomMaterialTranslator>
         // This assert needs to be here because we serialize all translators generically without
         // regard for type.
         StaticAssert<sizeof(SCustomMaterialTranslator)
-                     == sizeof(CUICTranslator)>::valid_expression();
+                     == sizeof(Qt3DSTranslator)>::valid_expression();
         return QT3DS_NEW(inAllocator, SCustomMaterialTranslator)(
             inElement, static_cast<TNodeType &>(inObject), inAllocator);
     }
 
-    static void InitializeTranslator(CUICTranslator &inTranslator, NVAllocatorCallback &inAllocator)
+    static void InitializeTranslator(Qt3DSTranslator &inTranslator, NVAllocatorCallback &inAllocator)
     {
         typedef SCustomMaterialTranslator::TNodeType TNodeType;
         // Initialize the vtable.
@@ -1664,8 +1664,8 @@ struct STranslatorCreator<SCustomMaterialTranslator>
             inAllocator);
     }
 
-    static void OnElementChanged(CUICTranslator &inTranslator, SPresentation &inPresentation,
-                                 IUICRenderContext &inRenderContext,
+    static void OnElementChanged(Qt3DSTranslator &inTranslator, SPresentation &inPresentation,
+                                 IQt3DSRenderContext &inRenderContext,
                                  Q3DStudio::IPresentation &inStudioPresentation)
     {
         static_cast<SCustomMaterialTranslator &>(inTranslator)
@@ -1682,12 +1682,12 @@ struct STranslatorCreator<SRenderPluginTranslator>
         typedef SRenderPluginTranslator::TNodeType TNodeType;
         // This assert needs to be here because we serialize all translators generically without
         // regard for type.
-        StaticAssert<sizeof(SRenderPluginTranslator) == sizeof(CUICTranslator)>::valid_expression();
+        StaticAssert<sizeof(SRenderPluginTranslator) == sizeof(Qt3DSTranslator)>::valid_expression();
         return QT3DS_NEW(inAllocator, SRenderPluginTranslator)(
             inElement, static_cast<TNodeType &>(inObject), inAllocator);
     }
 
-    static void InitializeTranslator(CUICTranslator &inTranslator, NVAllocatorCallback &inAllocator)
+    static void InitializeTranslator(Qt3DSTranslator &inTranslator, NVAllocatorCallback &inAllocator)
     {
         typedef SRenderPluginTranslator::TNodeType TNodeType;
         // Initialize the vtable.
@@ -1695,8 +1695,8 @@ struct STranslatorCreator<SRenderPluginTranslator>
             inTranslator.Element(), static_cast<TNodeType &>(inTranslator.RenderObject()),
             inAllocator);
     }
-    static void OnElementChanged(CUICTranslator &inTranslator, SPresentation &inPresentation,
-                                 IUICRenderContext &inRenderContext,
+    static void OnElementChanged(Qt3DSTranslator &inTranslator, SPresentation &inPresentation,
+                                 IQt3DSRenderContext &inRenderContext,
                                  Q3DStudio::IPresentation &inStudioPresentation)
     {
         static_cast<SRenderPluginTranslator &>(inTranslator)
@@ -1704,11 +1704,11 @@ struct STranslatorCreator<SRenderPluginTranslator>
     }
 };
 }
-CUICTranslator *CUICTranslator::CreateTranslatorForElement(Q3DStudio::TElement &inElement,
+Qt3DSTranslator *Qt3DSTranslator::CreateTranslatorForElement(Q3DStudio::TElement &inElement,
                                                            SGraphObject &inObject,
                                                            NVAllocatorCallback &inAlloc)
 {
-    CUICTranslator *theTranslator = NULL;
+    Qt3DSTranslator *theTranslator = NULL;
     switch (inObject.m_Type) {
 #define QT3DS_RENDER_HANDL_GRAPH_OBJECT_TYPE(type)                                                   \
     case GraphObjectTypes::type:                                                                   \
@@ -1724,8 +1724,8 @@ CUICTranslator *CUICTranslator::CreateTranslatorForElement(Q3DStudio::TElement &
     return theTranslator;
 }
 
-void CUICTranslator::OnElementChanged(SPresentation &inPresentation,
-                                      IUICRenderContext &inRenderContext,
+void Qt3DSTranslator::OnElementChanged(SPresentation &inPresentation,
+                                      IQt3DSRenderContext &inRenderContext,
                                       Q3DStudio::IPresentation &inStudioPresentation)
 {
     switch (m_RenderObject->m_Type) {
@@ -1742,7 +1742,7 @@ void CUICTranslator::OnElementChanged(SPresentation &inPresentation,
     }
 }
 
-CUICTranslator *CUICTranslator::LoadTranslator(SDataReader &inReader, size_t inElemOffset,
+Qt3DSTranslator *Qt3DSTranslator::LoadTranslator(SDataReader &inReader, size_t inElemOffset,
                                                NVDataRef<QT3DSU8> inSGSection,
                                                NVAllocatorCallback &inAllocator)
 {
@@ -1751,7 +1751,7 @@ CUICTranslator *CUICTranslator::LoadTranslator(SDataReader &inReader, size_t inE
     // Make sure things are aligned
     (void)theTranslatorStart;
     QT3DS_ASSERT((size_t)theTranslatorStart % sizeof(void *) == 0);
-    CUICTranslator *theTranslator = inReader.Load<CUICTranslator>();
+    Qt3DSTranslator *theTranslator = inReader.Load<Qt3DSTranslator>();
     if (theTranslator) {
         size_t *elemPtr = reinterpret_cast<size_t *>(&theTranslator->m_Element);
         *elemPtr += inElemOffset;
@@ -1775,18 +1775,18 @@ CUICTranslator *CUICTranslator::LoadTranslator(SDataReader &inReader, size_t inE
     return theTranslator;
 }
 Q3DStudio::IPresentation *
-CUICTranslator::GetPresentationFromPresentation(SPresentation &inPresentation)
+Qt3DSTranslator::GetPresentationFromPresentation(SPresentation &inPresentation)
 {
     return inPresentation.m_UserData.DynamicCast<Q3DStudio::IPresentation>();
 }
 
-void CUICTranslator::InitializePointerTags(IStringTable &)
+void Qt3DSTranslator::InitializePointerTags(IStringTable &)
 {
     g_TranslatorTag = 0x0044FEED;
     g_PresentationTag = 0x0022ABBA;
 }
 
-void CUICTranslator::AssignUserData(Q3DStudio::IPresentation &inPresentation,
+void Qt3DSTranslator::AssignUserData(Q3DStudio::IPresentation &inPresentation,
                                     SPresentation &inGraphPresentation)
 {
     inGraphPresentation.m_UserData = STaggedPointer(&inPresentation);
diff --git a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
index 1ec96c04..953999ad 100644
--- a/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
@@ -146,12 +146,12 @@ private:
     ITegraApplicationRenderEngine *m_RenderEngine; ///< Handles all rendering functions
     CTegraInputEngine *m_InputEngine; ///< Handles all user input events
     // Pre graphics init objects
-    NVScopedRefCounted<qt3ds::render::IUICRenderFactoryCore> m_RuntimeFactoryCore;
+    NVScopedRefCounted<qt3ds::render::IQt3DSRenderFactoryCore> m_RuntimeFactoryCore;
     NVScopedRefCounted<qt3ds::runtime::IApplicationCore>
     m_ApplicationCore; ///< Base application before graphis
 
     // Post graphics init objects
-    NVScopedRefCounted<qt3ds::render::IUICRenderFactory> m_RuntimeFactory;
+    NVScopedRefCounted<qt3ds::render::IQt3DSRenderFactory> m_RuntimeFactory;
     NVScopedRefCounted<qt3ds::runtime::IApplication> m_Application; ///< Application after graphics
     CPresentation *m_Presentation; ///< Currently loaded presentation, this should be removed in the future
 
@@ -341,7 +341,7 @@ void CNDDView::Render()
         manager.SetViewport(0, 0, dim.m_Width, dim.m_Height);
 
         QPair<QT3DSF32, QT3DSF32> fps
-                = m_RuntimeFactory->GetUICRenderContext().GetFPS();
+                = m_RuntimeFactory->GetQt3DSRenderContext().GetFPS();
 
         QString text;
         QTextStream stream(&text);
@@ -654,7 +654,7 @@ void CNDDView::BootupPreGraphicsInitObjects()
     // Create engines and runtime
     const eastl::string &theAppDir = QCoreApplication::applicationDirPath().toLatin1().constData();
 
-    m_RuntimeFactoryCore = qt3ds::render::IUICRenderFactoryCore::CreateRenderFactoryCore(
+    m_RuntimeFactoryCore = qt3ds::render::IQt3DSRenderFactoryCore::CreateRenderFactoryCore(
                 theAppDir.c_str(), m_WindowSystem, m_TimeProvider);
     m_ApplicationCore = qt3ds::runtime::IApplicationCore::CreateApplicationCore(*m_RuntimeFactoryCore,
                                                                               theAppDir.c_str());
diff --git a/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h b/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h
index bf24bf00..33e0b91c 100644
--- a/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h
+++ b/src/Runtime/Source/HDR/Include/CUDABSDFMipmap.h
@@ -47,7 +47,6 @@ struct cudaGraphicsResource;
 
 #endif
 using namespace qt3ds::render;
-using namespace uic::render;
 
 class CUDABSDFMipMap : public BSDFMipMap
 {
@@ -62,7 +61,7 @@ public:
     QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Foundation);
 
 private:
-    void CreateBsdfMipMaps(uic::render::SLoadedTexture &inLoadedImage, void **result, int width,
+    void CreateBsdfMipMaps(qt3ds::render::SLoadedTexture &inLoadedImage, void **result, int width,
                            int height); //, qt3ds::foundation::IPerfTimer& inPerfTimer);
 
     void BindTexture();
@@ -75,4 +74,4 @@ private:
     bool m_TextureBinded;
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/HDR/Include/GLComputeMipMap.h b/src/Runtime/Source/HDR/Include/GLComputeMipMap.h
index 4f56cb4e..a1a7ce5f 100644
--- a/src/Runtime/Source/HDR/Include/GLComputeMipMap.h
+++ b/src/Runtime/Source/HDR/Include/GLComputeMipMap.h
@@ -39,7 +39,6 @@
 #include "Qt3DSTypes.h"
 
 using namespace qt3ds::render;
-using namespace uic::render;
 
 class qt3ds::render::NVRenderContext;
 class qt3ds::render::NVRenderShaderProgram;
diff --git a/src/Runtime/Source/HDR/Include/MipmapBSDF.h b/src/Runtime/Source/HDR/Include/MipmapBSDF.h
index 28084750..be8f1366 100644
--- a/src/Runtime/Source/HDR/Include/MipmapBSDF.h
+++ b/src/Runtime/Source/HDR/Include/MipmapBSDF.h
@@ -47,7 +47,6 @@
 
 #endif
 using namespace qt3ds::render;
-using namespace uic::render;
 
 class BSDFMipMap : public NVRefCounted
 {
diff --git a/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp b/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
index 4e197715..dc1aaa6e 100644
--- a/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
+++ b/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
@@ -126,15 +126,15 @@ int main(int c, char **v)
     SNullTimeProvider theNullTimeProvider;
     SNullWindowSystem theNullWindowSystem;
 
-    NVScopedRefCounted<IUICRenderFactoryCore> theRenderFactoryCore =
-        IUICRenderFactoryCore::CreateRenderFactoryCore(theApplicationDirectory.c_str(),
+    NVScopedRefCounted<IQt3DSRenderFactoryCore> theRenderFactoryCore =
+        IQt3DSRenderFactoryCore::CreateRenderFactoryCore(theApplicationDirectory.c_str(),
                                                        theNullWindowSystem, theNullTimeProvider);
 
-    NVScopedRefCounted<IUICRenderFactory> theRenderFactory(
+    NVScopedRefCounted<IQt3DSRenderFactory> theRenderFactory(
         theRenderFactoryCore->CreateRenderFactory(QSurfaceFormat::defaultFormat()));
 
     // Ensure we aren't compiling any shaders.
-    theRenderFactory->GetUICRenderContext().GetShaderCache().SetShaderCompilationEnabled(false);
+    theRenderFactory->GetQt3DSRenderContext().GetShaderCache().SetShaderCompilationEnabled(false);
     Q3DStudio::CInputEngine theInputEngine;
 
     NVScopedRefCounted<qt3ds::runtime::IApplicationCore> theAppCore =
diff --git a/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h b/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
index 5197ca4b..a9e3dbc5 100644
--- a/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
+++ b/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
@@ -36,7 +36,7 @@
 namespace qt3ds {
 namespace evt {
 
-    typedef TUICEventSystemStr TEventStr;
+    typedef Qt3DSEventSystemStr TEventStr;
 
     // Factory from the provider's perspective.
     class IEventFactory
@@ -44,13 +44,13 @@ namespace evt {
     protected:
         virtual ~IEventFactory() {}
     public:
-        virtual SUICEventSystemEvent &CreateEvent(int numData) = 0;
-        // Guaranteed to be at least 4K - sizeof(SUICEventSystemEvent)
+        virtual Qt3DSEventSystemEvent &CreateEvent(int numData) = 0;
+        // Guaranteed to be at least 4K - sizeof(Qt3DSEventSystemEvent)
         virtual size_t GetMaxNumEventData() = 0;
         // Guaranteed to be at least 4K
         virtual size_t GetMaxStrLength() = 0;
 
-        virtual SUICEventSystemRegisteredStr RegisterStr(TEventStr inSrc) = 0;
+        virtual Qt3DSEventSystemRegisteredStr RegisterStr(TEventStr inSrc) = 0;
         // Null terminates if strlen(inSrc) > getMaxStrLength
         virtual TEventStr AllocateStr(TEventStr inSrc) = 0;
         // Returns null if inLength > getMaxStrLength
@@ -63,7 +63,7 @@ namespace evt {
         virtual ~IEventProvider() {}
     public:
         // Return the next N events, placed into the event buffer.
-        virtual size_t GetNextEvents(IEventFactory &inFactory, SUICEventSystemEvent **outBuffer,
+        virtual size_t GetNextEvents(IEventFactory &inFactory, Qt3DSEventSystemEvent **outBuffer,
                                      size_t bufLen) = 0;
         virtual void Release() = 0;
     };
diff --git a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
index cec621e9..2517eae4 100644
--- a/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
+++ b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
@@ -40,94 +40,94 @@ extern "C" {
 #endif
 
 // Obnoxious long names to void namespace conflicts
-enum EUICEventSystemEventTypes {
-    EUICEventSystemEventTypesNoData = 0,
-    EUICEventSystemEventTypesString = 1,
-    EUICEventSystemEventTypesNumber = 2,
+enum QT3DSEventSystemEventTypes {
+    QT3DSEventSystemEventTypesNoData = 0,
+    QT3DSEventSystemEventTypesString = 1,
+    QT3DSEventSystemEventTypesNumber = 2,
 };
 
-typedef const char *TUICEventSystemStr;
+typedef const char *Qt3DSEventSystemStr;
 
-typedef struct _SUICEventSystemEventValue
+typedef struct _Qt3DSEventSystemEventValue
 {
-    EUICEventSystemEventTypes m_Type;
+    QT3DSEventSystemEventTypes m_Type;
     double m_Number;
-    TUICEventSystemStr m_String;
-} SUICEventSystemEventValue;
+    Qt3DSEventSystemStr m_String;
+} Qt3DSEventSystemEventValue;
 
-typedef struct _SUICEventSystemRegisteredStr
+typedef struct _Qt3DSEventSystemRegisteredStr
 {
-    TUICEventSystemStr m_Data;
-} SUICEventSystemRegisteredStr;
+    Qt3DSEventSystemStr m_Data;
+} Qt3DSEventSystemRegisteredStr;
 
-typedef struct _SUICEventSystemEventData
+typedef struct _Qt3DSEventSystemEventData
 {
-    SUICEventSystemRegisteredStr m_Name;
-    SUICEventSystemEventValue m_Value;
-} SUICEventSystemEventData;
+    Qt3DSEventSystemRegisteredStr m_Name;
+    Qt3DSEventSystemEventValue m_Value;
+} Qt3DSEventSystemEventData;
 
-typedef struct _SUICEventSystemEvent
+typedef struct _Qt3DSEventSystemEvent
 {
-    SUICEventSystemEventData *m_Data; // contiguous block of event data.
+    Qt3DSEventSystemEventData *m_Data; // contiguous block of event data.
     int m_NumData;
-} SUICEventSystemEvent;
+} Qt3DSEventSystemEvent;
 
-typedef SUICEventSystemEvent *(*TUICEventSystemEventFactoryCreateEventFn)(void *inFactory,
+typedef Qt3DSEventSystemEvent *(*Qt3DSEventSystemEventFactoryCreateEventFn)(void *inFactory,
                                                                           int numData);
-typedef size_t (*TUICEventSystemEventFactoryMaxNumEventDataFn)(void *inFactory);
-typedef size_t (*TUICEventSystemEventFactoryMaxStrLenFn)(void *inFactory);
-typedef SUICEventSystemRegisteredStr (*TUICEventSystemEventFactoryRegisterStrFn)(
-    void *inFactory, TUICEventSystemStr inStr);
-typedef TUICEventSystemStr (*TUICEventSystemEventFactoryAllocateStrFn)(void *inFactory,
-                                                                       TUICEventSystemStr inStr);
-typedef TUICEventSystemStr (*TUICEventSystemEventFactoryAllocateStrLenFn)(void *inFactory, int len);
+typedef size_t (*Qt3DSEventSystemEventFactoryMaxNumEventDataFn)(void *inFactory);
+typedef size_t (*Qt3DSEventSystemEventFactoryMaxStrLenFn)(void *inFactory);
+typedef Qt3DSEventSystemRegisteredStr (*Qt3DSEventSystemEventFactoryRegisterStrFn)(
+    void *inFactory, Qt3DSEventSystemStr inStr);
+typedef Qt3DSEventSystemStr (*Qt3DSEventSystemEventFactoryAllocateStrFn)(void *inFactory,
+                                                                       Qt3DSEventSystemStr inStr);
+typedef Qt3DSEventSystemStr (*Qt3DSEventSystemEventFactoryAllocateStrLenFn)(void *inFactory, int len);
 
 // Factory from the provider's perspective.
-typedef struct _SUICEventSystemEventFactory
+typedef struct _Qt3DSEventSystemEventFactory
 {
     void *m_Factory;
-    TUICEventSystemEventFactoryCreateEventFn createEvent;
-    TUICEventSystemEventFactoryMaxNumEventDataFn getMaxNumEventData;
-    TUICEventSystemEventFactoryMaxStrLenFn getMaxStrLength;
-    TUICEventSystemEventFactoryRegisterStrFn registerStr;
-    TUICEventSystemEventFactoryAllocateStrFn allocateStr;
-    TUICEventSystemEventFactoryAllocateStrLenFn allocateStrLen;
-
-} SUICEventSystemEventFactory;
-
-typedef size_t (*TUICEventSystemProviderGetNextEventsFn)(void *inProvider,
-                                                         SUICEventSystemEventFactory inFactory,
-                                                         SUICEventSystemEvent **outBuffer,
+    Qt3DSEventSystemEventFactoryCreateEventFn createEvent;
+    Qt3DSEventSystemEventFactoryMaxNumEventDataFn getMaxNumEventData;
+    Qt3DSEventSystemEventFactoryMaxStrLenFn getMaxStrLength;
+    Qt3DSEventSystemEventFactoryRegisterStrFn registerStr;
+    Qt3DSEventSystemEventFactoryAllocateStrFn allocateStr;
+    Qt3DSEventSystemEventFactoryAllocateStrLenFn allocateStrLen;
+
+} Qt3DSEventSystemEventFactory;
+
+typedef size_t (*Qt3DSEventSystemProviderGetNextEventsFn)(void *inProvider,
+                                                         Qt3DSEventSystemEventFactory inFactory,
+                                                         Qt3DSEventSystemEvent **outBuffer,
                                                          size_t outBufLen);
-typedef void (*TUICEventSystemProviderReleaseFn)(void *inProvider);
+typedef void (*Qt3DSEventSystemProviderReleaseFn)(void *inProvider);
 
-typedef struct _SUICEventSystemEventProvider
+typedef struct _Qt3DSEventSystemEventProvider
 {
     void *m_Provider;
-    TUICEventSystemProviderGetNextEventsFn getNextEvents;
-    TUICEventSystemProviderReleaseFn release;
-} SUICEventSystemEventProvider;
-
-typedef void (*TUICEventSystemPollerAddProviderFn)(void *inPoller,
-                                                   SUICEventSystemEventProvider inProvider);
-typedef void (*TUICEventSystemPollerRemoveProviderFn)(void *inPoller,
-                                                      SUICEventSystemEventProvider inProvider);
-typedef int (*TUICEventSystemPollerignoreProviderFn)(void *inPoller,
-                                                     SUICEventSystemEventProvider inProvider);
-typedef int (*TUICEventSystemPolleractivateProviderFn)(void *inPoller,
-                                                       SUICEventSystemEventProvider inProvider);
-
-typedef struct _SUICEventSystemEventPoller
+    Qt3DSEventSystemProviderGetNextEventsFn getNextEvents;
+    Qt3DSEventSystemProviderReleaseFn release;
+} Qt3DSEventSystemEventProvider;
+
+typedef void (*Qt3DSEventSystemPollerAddProviderFn)(void *inPoller,
+                                                   Qt3DSEventSystemEventProvider inProvider);
+typedef void (*Qt3DSEventSystemPollerRemoveProviderFn)(void *inPoller,
+                                                      Qt3DSEventSystemEventProvider inProvider);
+typedef int (*Qt3DSEventSystemPollerignoreProviderFn)(void *inPoller,
+                                                     Qt3DSEventSystemEventProvider inProvider);
+typedef int (*Qt3DSEventSystemPolleractivateProviderFn)(void *inPoller,
+                                                       Qt3DSEventSystemEventProvider inProvider);
+
+typedef struct _Qt3DSEventSystemEventPoller
 {
     void *m_Poller;
     // Providers, once added, will be released by the event poller unless removed
-    TUICEventSystemPollerAddProviderFn addProvider;
+    Qt3DSEventSystemPollerAddProviderFn addProvider;
     // Callers are responsible for releasing removed providers.
-    TUICEventSystemPollerRemoveProviderFn removeProvider;
-    TUICEventSystemPollerignoreProviderFn ignoreProvider;
-    TUICEventSystemPolleractivateProviderFn activateProvider;
+    Qt3DSEventSystemPollerRemoveProviderFn removeProvider;
+    Qt3DSEventSystemPollerignoreProviderFn ignoreProvider;
+    Qt3DSEventSystemPolleractivateProviderFn activateProvider;
 
-} SUICEventSystemEventPoller;
+} Qt3DSEventSystemEventPoller;
 
 extern const char *PROVIDER_TABLE_ENTRY;
 extern const char *POLLER_TABLE_ENTRY;
diff --git a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
index 46442b78..4d414066 100644
--- a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
+++ b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
@@ -64,12 +64,12 @@ namespace evt {
         // provider
         // for events and then begin returning the set of events.
         // Note: this interface needs to set the event fetched flag.
-        virtual size_t GetNextEvents(SUICEventSystemEvent **outBuffer, size_t bufLen) = 0;
+        virtual size_t GetNextEvents(Qt3DSEventSystemEvent **outBuffer, size_t bufLen) = 0;
 
         // Get the event factory used for this poller.
         virtual IEventFactory &GetEventFactory() = 0;
 
-        virtual SUICEventSystemEventPoller *GetCInterface() = 0;
+        virtual Qt3DSEventSystemEventPoller *GetCInterface() = 0;
 
         // Get and clear the flag indicates whether GetNextEvents has been called after last call of
         // this interface
diff --git a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h
index df970186..142108ef 100644
--- a/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h
+++ b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h
@@ -41,7 +41,7 @@ namespace evt {
     {
         // Returns with an object with on the top of the stack.
         // The object has two methods, getCInterface and getNextEvents
-        // getCInterface returns userdata that is a pointer to a SUICEventSystemEventPoller (the 'c'
+        // getCInterface returns userdata that is a pointer to a Qt3DSEventSystemEventPoller (the 'c'
         // interface).
         // getNextEvents returns an array of the next events.
         static void WrapEventPoller(lua_State *inState, IEventSystem &inPoller);
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
index 71cd99ca..4bf776c6 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
@@ -39,7 +39,7 @@ using namespace qt3ds::evt;
 typedef char TEventChar;
 using qt3ds::QT3DSU32;
 
-class CInitableRegisteredStr : public SUICEventSystemRegisteredStr
+class CInitableRegisteredStr : public Qt3DSEventSystemRegisteredStr
 {
 public:
     CInitableRegisteredStr(const TEventStr inString) { m_Data = inString; }
@@ -61,24 +61,24 @@ CFactory::~CFactory()
 {
 }
 
-SUICEventSystemEvent &CFactory::CreateEvent(int inNumData)
+Qt3DSEventSystemEvent &CFactory::CreateEvent(int inNumData)
 {
     // Ensure num data is in range
     inNumData = qt3ds::NVMax(0, inNumData);
     // Ensure we can actually allocate something that big
     QT3DSU32 dataSize = static_cast<QT3DSU32>(
-        qt3ds::NVMin((size_t)inNumData * sizeof(SUICEventSystemEventData),
-                  TEventAllocator::getSlabSize() - sizeof(SUICEventSystemEvent)));
+        qt3ds::NVMin((size_t)inNumData * sizeof(Qt3DSEventSystemEventData),
+                  TEventAllocator::getSlabSize() - sizeof(Qt3DSEventSystemEvent)));
     // get the actual num data after safety checks.
-    inNumData = (int)(dataSize / sizeof(SUICEventSystemEventData));
+    inNumData = (int)(dataSize / sizeof(Qt3DSEventSystemEventData));
 
-    QT3DSU32 allocSize = sizeof(SUICEventSystemEvent) + inNumData * sizeof(SUICEventSystemEventData);
+    QT3DSU32 allocSize = sizeof(Qt3DSEventSystemEvent) + inNumData * sizeof(Qt3DSEventSystemEventData);
 
-    SUICEventSystemEvent *theEvent = (SUICEventSystemEvent *)m_Allocator.allocate(
+    Qt3DSEventSystemEvent *theEvent = (Qt3DSEventSystemEvent *)m_Allocator.allocate(
         allocSize, "Event allocation", __FILE__, __LINE__);
     theEvent->m_NumData = inNumData;
-    theEvent->m_Data = reinterpret_cast<SUICEventSystemEventData *>(((qt3ds::QT3DSU8 *)theEvent)
-                                                                    + sizeof(SUICEventSystemEvent));
+    theEvent->m_Data = reinterpret_cast<Qt3DSEventSystemEventData *>(((qt3ds::QT3DSU8 *)theEvent)
+                                                                    + sizeof(Qt3DSEventSystemEvent));
 
     // Initialize the event data to zero so that a free event won't cause a calamity.
     qt3ds::intrinsics::memZero(theEvent->m_Data, dataSize);
@@ -88,7 +88,7 @@ SUICEventSystemEvent &CFactory::CreateEvent(int inNumData)
 
 size_t CFactory::GetMaxNumEventData()
 {
-    return m_Allocator.getSlabSize() - sizeof(SUICEventSystemEvent);
+    return m_Allocator.getSlabSize() - sizeof(Qt3DSEventSystemEvent);
 }
 
 size_t CFactory::GetMaxStrLength()
@@ -101,7 +101,7 @@ void CFactory::ReleaseOutstandingEvents()
     m_Allocator.reset();
 }
 
-SUICEventSystemRegisteredStr CFactory::RegisterStr(TEventStr inSrc)
+Qt3DSEventSystemRegisteredStr CFactory::RegisterStr(TEventStr inSrc)
 {
     return CInitableRegisteredStr(m_StringTable->RegisterStr(inSrc));
 }
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
index fa82c710..10fe6b72 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
@@ -58,11 +58,11 @@ namespace evt {
         CFactory &operator=(const CFactory &) { return *this; }
     public:
         // Interfaces from IEventFactory
-        SUICEventSystemEvent &CreateEvent(int inNumData) override;
+        Qt3DSEventSystemEvent &CreateEvent(int inNumData) override;
         size_t GetMaxNumEventData() override;
         size_t GetMaxStrLength() override;
 
-        SUICEventSystemRegisteredStr RegisterStr(TEventStr inSrc) override;
+        Qt3DSEventSystemRegisteredStr RegisterStr(TEventStr inSrc) override;
         // Null terminates if strlen(inSrc) > getMaxStrLength
         TEventStr AllocateStr(TEventStr inSrc) override;
 
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
index 118ab0fb..a8115953 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
@@ -70,13 +70,13 @@ void CPoller::ReleaseEvents()
     m_EventIndex = 0;
 }
 
-static void AddProviderFn(void *inPoller, SUICEventSystemEventProvider inProvider)
+static void AddProviderFn(void *inPoller, Qt3DSEventSystemEventProvider inProvider)
 {
     CPoller *thePoller = reinterpret_cast<CPoller *>(inPoller);
     thePoller->AddProvider(*thePoller->GetOrCreateEventProviderWrapper(inProvider));
 }
 
-static void RemoveProviderFn(void *inPoller, SUICEventSystemEventProvider inProvider)
+static void RemoveProviderFn(void *inPoller, Qt3DSEventSystemEventProvider inProvider)
 {
     CPoller *thePoller = reinterpret_cast<CPoller *>(inPoller);
     CPoller::TProvider theProvider = thePoller->GetEventProviderWrapper(inProvider);
@@ -85,7 +85,7 @@ static void RemoveProviderFn(void *inPoller, SUICEventSystemEventProvider inProv
     thePoller->ReleaseEventProviderWrapper(inProvider);
 }
 
-static int IgnoreProviderFn(void *inPoller, SUICEventSystemEventProvider inProvider)
+static int IgnoreProviderFn(void *inPoller, Qt3DSEventSystemEventProvider inProvider)
 {
     CPoller *thePoller = reinterpret_cast<CPoller *>(inPoller);
     CPoller::TProvider theProvider = thePoller->GetEventProviderWrapper(inProvider);
@@ -94,7 +94,7 @@ static int IgnoreProviderFn(void *inPoller, SUICEventSystemEventProvider inProvi
     return 0;
 }
 
-static int ActivateProviderFn(void *inPoller, SUICEventSystemEventProvider inProvider)
+static int ActivateProviderFn(void *inPoller, Qt3DSEventSystemEventProvider inProvider)
 {
     CPoller *thePoller = reinterpret_cast<CPoller *>(inPoller);
     CPoller::TProvider theProvider = thePoller->GetEventProviderWrapper(inProvider);
@@ -170,10 +170,10 @@ bool CPoller::ActivateProvider(IEventProvider &inProvider)
     return false;
 }
 
-SUICEventSystemEvent *CPoller::GetNextEvent(bool inAllowResetBuffer)
+Qt3DSEventSystemEvent *CPoller::GetNextEvent(bool inAllowResetBuffer)
 {
     if (m_EventIndex < m_EventList.size()) {
-        SUICEventSystemEvent *retval = m_EventList[m_EventIndex];
+        Qt3DSEventSystemEvent *retval = m_EventList[m_EventIndex];
         ++m_EventIndex;
         return retval;
     }
@@ -183,7 +183,7 @@ SUICEventSystemEvent *CPoller::GetNextEvent(bool inAllowResetBuffer)
     size_t theNewEventCount = 0;
     for (QT3DSU32 idx = 0, end = m_Providers.size(); idx < end; ++idx) {
         if (m_Providers[idx].second) {
-            SUICEventSystemEvent *evtBuffer[MAX_EVENTS];
+            Qt3DSEventSystemEvent *evtBuffer[MAX_EVENTS];
             for (QT3DSU32 numEvents = (QT3DSU32)(m_Providers[idx].first)
                                        ->GetNextEvents(m_EventFactory, evtBuffer, MAX_EVENTS);
                  numEvents;
@@ -200,13 +200,13 @@ SUICEventSystemEvent *CPoller::GetNextEvent(bool inAllowResetBuffer)
     return NULL;
 }
 
-size_t CPoller::GetNextEvents(SUICEventSystemEvent **outBuffer, size_t bufLen)
+size_t CPoller::GetNextEvents(Qt3DSEventSystemEvent **outBuffer, size_t bufLen)
 {
     m_EventFetched = true;
     size_t bufIdx = 0;
     bool theAllowResetBuffer = true;
     for (; bufIdx < bufLen; ++bufIdx) {
-        SUICEventSystemEvent *evt = GetNextEvent(theAllowResetBuffer);
+        Qt3DSEventSystemEvent *evt = GetNextEvent(theAllowResetBuffer);
         if (!evt)
             break;
         theAllowResetBuffer = false;
@@ -220,7 +220,7 @@ IEventFactory &CPoller::GetEventFactory()
     return m_EventFactory;
 }
 
-SUICEventSystemEventPoller *CPoller::GetCInterface()
+Qt3DSEventSystemEventPoller *CPoller::GetCInterface()
 {
     return &m_CInterface;
 }
@@ -237,7 +237,7 @@ void CPoller::PurgeEvents()
     // Get events from providers and drop,
     // so the providers need not to provide an additional interface for clear events
     static const size_t EVENTS_NUM_ONCE_CLEAR = 512;
-    SUICEventSystemEvent *theEvents[EVENTS_NUM_ONCE_CLEAR];
+    Qt3DSEventSystemEvent *theEvents[EVENTS_NUM_ONCE_CLEAR];
     GetNextEvents(theEvents, EVENTS_NUM_ONCE_CLEAR);
     ReleaseEvents();
 }
@@ -272,7 +272,7 @@ struct SProviderFinder
     }
 };
 
-static SUICEventSystemEvent *CreateEventFn(void *inFactory, int numData)
+static Qt3DSEventSystemEvent *CreateEventFn(void *inFactory, int numData)
 {
     IEventFactory *theFactory = reinterpret_cast<IEventFactory *>(inFactory);
     return &theFactory->CreateEvent(numData);
@@ -290,19 +290,19 @@ static size_t MaxStrLenFn(void *inFactory)
     return theFactory->GetMaxStrLength();
 }
 
-static SUICEventSystemRegisteredStr RegisterStrFn(void *inFactory, TUICEventSystemStr inStr)
+static Qt3DSEventSystemRegisteredStr RegisterStrFn(void *inFactory, Qt3DSEventSystemStr inStr)
 {
     IEventFactory *theFactory = reinterpret_cast<IEventFactory *>(inFactory);
     return theFactory->RegisterStr(inStr);
 }
 
-static TUICEventSystemStr AllocateStrFn(void *inFactory, TUICEventSystemStr inStr)
+static Qt3DSEventSystemStr AllocateStrFn(void *inFactory, Qt3DSEventSystemStr inStr)
 {
     IEventFactory *theFactory = reinterpret_cast<IEventFactory *>(inFactory);
     return theFactory->AllocateStr(inStr);
 }
 
-static TUICEventSystemStr AllocateStrLenFn(void *inFactory, int len)
+static Qt3DSEventSystemStr AllocateStrLenFn(void *inFactory, int len)
 {
     IEventFactory *theFactory = reinterpret_cast<IEventFactory *>(inFactory);
     return theFactory->AllocateStr(len);
@@ -310,17 +310,17 @@ static TUICEventSystemStr AllocateStrLenFn(void *inFactory, int len)
 
 struct SWrappedProvider : public IEventProvider
 {
-    SUICEventSystemEventProvider m_Provider;
-    SWrappedProvider(SUICEventSystemEventProvider prov)
+    Qt3DSEventSystemEventProvider m_Provider;
+    SWrappedProvider(Qt3DSEventSystemEventProvider prov)
         : m_Provider(prov)
     {
     }
 
-    size_t GetNextEvents(IEventFactory &inFactory, SUICEventSystemEvent **outBuffer,
+    size_t GetNextEvents(IEventFactory &inFactory, Qt3DSEventSystemEvent **outBuffer,
                                  size_t bufLen) override
     {
         if (m_Provider.m_Provider) {
-            SUICEventSystemEventFactory theFactory;
+            Qt3DSEventSystemEventFactory theFactory;
             theFactory.m_Factory = &inFactory;
             theFactory.createEvent = CreateEventFn;
             theFactory.getMaxNumEventData = MaxNumEventDataFn;
@@ -341,7 +341,7 @@ struct SWrappedProvider : public IEventProvider
     }
 };
 
-CPoller::TProvider CPoller::GetEventProviderWrapper(SUICEventSystemEventProvider inProvider)
+CPoller::TProvider CPoller::GetEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider)
 {
     TCEventProviderList::iterator iter = eastl::find_if(
         m_CEventProviders.begin(), m_CEventProviders.end(), SProviderFinder(inProvider.m_Provider));
@@ -350,7 +350,7 @@ CPoller::TProvider CPoller::GetEventProviderWrapper(SUICEventSystemEventProvider
     return TProvider();
 }
 
-CPoller::TProvider CPoller::GetOrCreateEventProviderWrapper(SUICEventSystemEventProvider inProvider)
+CPoller::TProvider CPoller::GetOrCreateEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider)
 {
     TCEventProviderList::iterator iter = eastl::find_if(
         m_CEventProviders.begin(), m_CEventProviders.end(), SProviderFinder(inProvider.m_Provider));
@@ -362,7 +362,7 @@ CPoller::TProvider CPoller::GetOrCreateEventProviderWrapper(SUICEventSystemEvent
     return iter->second;
 }
 
-void CPoller::ReleaseEventProviderWrapper(SUICEventSystemEventProvider inProvider)
+void CPoller::ReleaseEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider)
 {
     TCEventProviderList::iterator iter = eastl::find_if(
         m_CEventProviders.begin(), m_CEventProviders.end(), SProviderFinder(inProvider.m_Provider));
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
index c247b2ea..99ac27d6 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
@@ -53,7 +53,7 @@ namespace evt {
     public:
         typedef IEventProvider *TProvider;
         typedef qt3ds::foundation::nvvector<eastl::pair<TProvider, bool>> TProviderList;
-        typedef qt3ds::foundation::nvvector<SUICEventSystemEvent *> TEventList;
+        typedef qt3ds::foundation::nvvector<Qt3DSEventSystemEvent *> TEventList;
         typedef eastl::pair<void *, TProvider> TCEventProviderPair;
         typedef eastl::vector<TCEventProviderPair> TCEventProviderList;
 
@@ -67,9 +67,9 @@ namespace evt {
         void RemoveProvider(IEventProvider &inProvider) override;
         bool IgnoreProvider(IEventProvider &inProvider) override;
         bool ActivateProvider(IEventProvider &inProvider) override;
-        size_t GetNextEvents(SUICEventSystemEvent **outBuffer, size_t bufLen) override;
+        size_t GetNextEvents(Qt3DSEventSystemEvent **outBuffer, size_t bufLen) override;
         IEventFactory &GetEventFactory() override;
-        SUICEventSystemEventPoller *GetCInterface() override;
+        Qt3DSEventSystemEventPoller *GetCInterface() override;
         bool GetAndClearEventFetchedFlag() override;
         void PurgeEvents() override;
 
@@ -78,14 +78,14 @@ namespace evt {
         void addRef() override;
         void release() override;
 
-        TProvider GetEventProviderWrapper(SUICEventSystemEventProvider inProvider);
-        TProvider GetOrCreateEventProviderWrapper(SUICEventSystemEventProvider inProvider);
-        void ReleaseEventProviderWrapper(SUICEventSystemEventProvider inProvider);
+        TProvider GetEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider);
+        TProvider GetOrCreateEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider);
+        void ReleaseEventProviderWrapper(Qt3DSEventSystemEventProvider inProvider);
 
         static CPoller &Create(qt3ds::NVFoundationBase &inFoundation);
 
     private:
-        SUICEventSystemEvent *GetNextEvent(bool inAllowResetBuffer /* = true*/);
+        Qt3DSEventSystemEvent *GetNextEvent(bool inAllowResetBuffer /* = true*/);
 
         qt3ds::QT3DSI32 mRefCount;
         qt3ds::NVFoundationBase &m_Foundation;
@@ -93,7 +93,7 @@ namespace evt {
         TProviderList m_Providers;
         TEventList m_EventList;
         qt3ds::QT3DSU32 m_EventIndex;
-        SUICEventSystemEventPoller m_CInterface;
+        Qt3DSEventSystemEventPoller m_CInterface;
         TCEventProviderList m_CEventProviders;
         bool m_EventFetched;
     };
diff --git a/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp
index 8da8c809..8e0c5866 100644
--- a/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp
@@ -56,13 +56,13 @@ int GetCInterface(lua_State *inState);
 // the input count, less events will be returned; if no event, an empty array will be returned.
 int GetNextEvents(lua_State *inState);
 
-void TranslateEventValue(lua_State *inState, const SUICEventSystemEventValue &theValue)
+void TranslateEventValue(lua_State *inState, const Qt3DSEventSystemEventValue &theValue)
 {
     switch (theValue.m_Type) {
-    case EUICEventSystemEventTypesNumber:
+    case QT3DSEventSystemEventTypesNumber:
         lua_pushnumber(inState, theValue.m_Number);
         break;
-    case EUICEventSystemEventTypesString:
+    case QT3DSEventSystemEventTypesString:
         lua_pushstring(inState, theValue.m_String ? theValue.m_String : "");
         break;
     default:
@@ -70,7 +70,7 @@ void TranslateEventValue(lua_State *inState, const SUICEventSystemEventValue &th
     }
 }
 
-void TranslateEvent(lua_State *inState, SUICEventSystemEvent &theEvent)
+void TranslateEvent(lua_State *inState, Qt3DSEventSystemEvent &theEvent)
 {
     int top = lua_gettop(inState);
     // Put the result table of event on top of the lua stack
@@ -79,7 +79,7 @@ void TranslateEvent(lua_State *inState, SUICEventSystemEvent &theEvent)
     // otherwise just a string or number object.
     lua_newtable(inState); // The result table of event
     for (int i = 0; i < theEvent.m_NumData; ++i) {
-        const SUICEventSystemEventData &theValue(theEvent.m_Data[i]);
+        const Qt3DSEventSystemEventData &theValue(theEvent.m_Data[i]);
         const char *theFetchableString(theValue.m_Name.m_Data);
         lua_getfield(inState, -1, theFetchableString);
         // Is the string already in the table?
@@ -140,15 +140,15 @@ int GetNextEvents(lua_State *inState)
     lua_getfield(inState, 1, POLLER_TABLE_ENTRY);
     luaL_checktype(inState, -1, LUA_TLIGHTUSERDATA);
 
-    SUICEventSystemEventPoller *thePollerC =
-        (SUICEventSystemEventPoller *)lua_touserdata(inState, -1);
+    Qt3DSEventSystemEventPoller *thePollerC =
+        (Qt3DSEventSystemEventPoller *)lua_touserdata(inState, -1);
     IEventSystem *thePoller = 0;
     lua_newtable(inState);
     if (!thePollerC || (thePoller = reinterpret_cast<IEventSystem *>(thePollerC->m_Poller)) == 0
         || theMaxCount <= 0)
         return 1;
 
-    SUICEventSystemEvent *theEvents[MAX_EVENTS_ONCE];
+    Qt3DSEventSystemEvent *theEvents[MAX_EVENTS_ONCE];
     size_t theCount = thePoller->GetNextEvents(theEvents, theMaxCount);
     for (qt3ds::QT3DSU32 theIndex = 0; theIndex < theCount; ++theIndex) {
         TranslateEvent(inState, *theEvents[theIndex]);
diff --git a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
index 8929bafc..dc51e9db 100644
--- a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
@@ -174,7 +174,7 @@ unsigned short g_VehicleSpeedData[] = {
     35,   30,   25,   20,   15,   10,   5,    0
 };
 
-SUICEventSystemEvent *CCanProviderDemo::GetNextEvent(IEventFactory &inFactory)
+Qt3DSEventSystemEvent *CCanProviderDemo::GetNextEvent(IEventFactory &inFactory)
 {
     clock_t theCurClock = clock();
     if (theCurClock > m_LastClock
@@ -218,23 +218,23 @@ SUICEventSystemEvent *CCanProviderDemo::GetNextEvent(IEventFactory &inFactory)
         return 0;
     }
     ++m_Frame;
-    SUICEventSystemEvent &theEvent = inFactory.CreateEvent(9);
-    SUICEventSystemEventData *theCurrentData = theEvent.m_Data;
+    Qt3DSEventSystemEvent &theEvent = inFactory.CreateEvent(9);
+    Qt3DSEventSystemEventData *theCurrentData = theEvent.m_Data;
     theCurrentData->m_Name = inFactory.RegisterStr("device_type");
-    theCurrentData->m_Value.m_Type = EUICEventSystemEventTypesString;
+    theCurrentData->m_Value.m_Type = QT3DSEventSystemEventTypesString;
     theCurrentData->m_Value.m_String = inFactory.AllocateStr("CAN");
     ++theCurrentData;
     theCurrentData->m_Name = inFactory.RegisterStr("id");
-    theCurrentData->m_Value.m_Type = EUICEventSystemEventTypesNumber;
+    theCurrentData->m_Value.m_Type = QT3DSEventSystemEventTypesNumber;
     theCurrentData->m_Value.m_Number = 101;
     ++theCurrentData;
     theCurrentData->m_Name = inFactory.RegisterStr("length");
-    theCurrentData->m_Value.m_Type = EUICEventSystemEventTypesNumber;
+    theCurrentData->m_Value.m_Type = QT3DSEventSystemEventTypesNumber;
     theCurrentData->m_Value.m_Number = 6;
     ++theCurrentData;
     for (int i = 0; i < theLength; ++i) {
         theCurrentData->m_Name = inFactory.RegisterStr("data");
-        theCurrentData->m_Value.m_Type = EUICEventSystemEventTypesNumber;
+        theCurrentData->m_Value.m_Type = QT3DSEventSystemEventTypesNumber;
         theCurrentData->m_Value.m_Number = theData[i];
         ++theCurrentData;
     }
@@ -242,11 +242,11 @@ SUICEventSystemEvent *CCanProviderDemo::GetNextEvent(IEventFactory &inFactory)
     return &theEvent;
 }
 
-size_t CCanProviderDemo::GetNextEvents(IEventFactory &inFactory, SUICEventSystemEvent **outBuffer,
+size_t CCanProviderDemo::GetNextEvents(IEventFactory &inFactory, Qt3DSEventSystemEvent **outBuffer,
                                        size_t bufLen)
 {
     size_t bufIdx = 0;
-    SUICEventSystemEvent *evt = NULL;
+    Qt3DSEventSystemEvent *evt = NULL;
     for (evt = GetNextEvent(inFactory); evt && bufIdx < bufLen;
          evt = GetNextEvent(inFactory), ++bufIdx)
         outBuffer[bufIdx] = evt;
diff --git a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
index a1ddc175..7d6788bc 100644
--- a/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
+++ b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
@@ -35,7 +35,7 @@
 
 #include <EventSystem.h>
 
-using namespace uic::evt;
+using namespace qt3ds::evt;
 
 class CCanProviderDemo : public IEventProvider
 {
@@ -43,8 +43,8 @@ public:
     CCanProviderDemo();
     virtual ~CCanProviderDemo();
 
-    SUICEventSystemEvent *GetNextEvent(IEventFactory &inFactory);
-    virtual size_t GetNextEvents(IEventFactory &inFactory, SUICEventSystemEvent **outBuffer,
+    Qt3DSEventSystemEvent *GetNextEvent(IEventFactory &inFactory);
+    virtual size_t GetNextEvents(IEventFactory &inFactory, Qt3DSEventSystemEvent **outBuffer,
                                  size_t bufLen);
     virtual void Release();
 
diff --git a/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp b/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp
index 9a89ff53..eaaa421c 100644
--- a/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp
@@ -57,25 +57,25 @@ void TestCPPBindings()
         IEventSystem::Create(*theFoundation);
 
     const int theProviderCount = 128;
-    uic::evt::IEventProvider *theProviders[theProviderCount];
+    qt3ds::evt::IEventProvider *theProviders[theProviderCount];
     for (int i = 0; i < theProviderCount; ++i) {
         theProviders[i] = new CCanProviderDemo();
         theEventSystem->AddProvider(*theProviders[i]);
     }
     unsigned long theCount = 0;
     while (theCount < 500) {
-        SUICEventSystemEvent *evtBuffer[64];
+        Qt3DSEventSystemEvent *evtBuffer[64];
         size_t numEvents = theEventSystem->GetNextEvents(evtBuffer, 64);
         for (size_t evtIdx = 0; evtIdx < numEvents; ++evtIdx) {
-            SUICEventSystemEvent *theEvent = evtBuffer[evtIdx];
+            Qt3DSEventSystemEvent *theEvent = evtBuffer[evtIdx];
             if (theEvent) {
                 std::cout << "************ event " << ++theCount << " received ************"
                           << std::endl;
                 std::cout << "number of data: " << theEvent->m_NumData << std::endl;
-                SUICEventSystemEventData *theData = theEvent->m_Data;
+                Qt3DSEventSystemEventData *theData = theEvent->m_Data;
                 for (int i = 0; i < theEvent->m_NumData; ++i) {
                     std::cout << "data " << i << ":\t";
-                    if (EUICEventSystemEventTypesString == theData->m_Value.m_Type) {
+                    if (QT3DSEventSystemEventTypesString == theData->m_Value.m_Type) {
                         std::cout << theData->m_Value.m_String;
                     } else {
                         std::cout << theData->m_Value.m_Number;
@@ -122,13 +122,13 @@ const char *luaScript =
 
 struct SCToCppFactory : public IEventFactory
 {
-    SUICEventSystemEventFactory m_Factory;
-    SCToCppFactory(SUICEventSystemEventFactory inFactory)
+    Qt3DSEventSystemEventFactory m_Factory;
+    SCToCppFactory(Qt3DSEventSystemEventFactory inFactory)
         : m_Factory(inFactory)
     {
     }
 
-    virtual SUICEventSystemEvent &CreateEvent(int inNumData)
+    virtual Qt3DSEventSystemEvent &CreateEvent(int inNumData)
     {
         return *m_Factory.createEvent(m_Factory.m_Factory, inNumData);
     }
@@ -138,7 +138,7 @@ struct SCToCppFactory : public IEventFactory
     }
     virtual size_t GetMaxStrLength() { return m_Factory.getMaxStrLength(m_Factory.m_Factory); }
 
-    virtual SUICEventSystemRegisteredStr RegisterStr(TEventStr inSrc)
+    virtual Qt3DSEventSystemRegisteredStr RegisterStr(TEventStr inSrc)
     {
         return m_Factory.registerStr(m_Factory.m_Factory, inSrc);
     }
@@ -155,8 +155,8 @@ struct SCToCppFactory : public IEventFactory
     }
 };
 
-static size_t GetNextEventsFn(void *inProvider, SUICEventSystemEventFactory inFactory,
-                              SUICEventSystemEvent **outBuffer, size_t outBufLen)
+static size_t GetNextEventsFn(void *inProvider, Qt3DSEventSystemEventFactory inFactory,
+                              Qt3DSEventSystemEvent **outBuffer, size_t outBufLen)
 {
     IEventProvider *provider = reinterpret_cast<IEventProvider *>(inProvider);
     SCToCppFactory theFactory(inFactory);
@@ -172,10 +172,10 @@ static void ReleaseFn(void *inProvider)
 static int registerCANProvider(lua_State *inState)
 {
     luaL_checktype(inState, 1, LUA_TLIGHTUSERDATA);
-    SUICEventSystemEventPoller *thePoller =
-        reinterpret_cast<SUICEventSystemEventPoller *>(lua_touserdata(inState, 1));
+    Qt3DSEventSystemEventPoller *thePoller =
+        reinterpret_cast<Qt3DSEventSystemEventPoller *>(lua_touserdata(inState, 1));
     if (thePoller) {
-        SUICEventSystemEventProvider provider;
+        Qt3DSEventSystemEventProvider provider;
         provider.m_Provider = static_cast<IEventProvider *>(new CCanProviderDemo());
         provider.getNextEvents = GetNextEventsFn;
         provider.release = ReleaseFn;
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h b/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h
index 39e3adcf..b8899dd1 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h
+++ b/src/Runtime/Source/Qt3DSFoundation/Include/foundation/StringTable.h
@@ -46,8 +46,8 @@
 
 namespace qt3ds {
 namespace foundation {
-    typedef char8_t UICBChar;
-    typedef const char8_t *UICBCharPtr;
+    typedef char8_t Qt3DSBChar;
+    typedef const char8_t *Qt3DSBCharPtr;
     class IStringTable;
 
     // Serialization types, NVRenderSerializationTypes.h
@@ -102,7 +102,7 @@ namespace foundation {
     // These strings are valid utf-8 strings
     class CRegisteredString
     {
-        UICBCharPtr m_String;
+        Qt3DSBCharPtr m_String;
 
     public:
         CRegisteredString()
@@ -139,8 +139,8 @@ namespace foundation {
             return answer < 0;
         }
         size_t hash() const { return eastl::hash<size_t>()(reinterpret_cast<size_t>(m_String)); }
-        operator UICBCharPtr() const { return c_str(); }
-        UICBCharPtr c_str() const { return m_String ? m_String : ""; }
+        operator Qt3DSBCharPtr() const { return c_str(); }
+        Qt3DSBCharPtr c_str() const { return m_String ? m_String : ""; }
         bool IsValid() const { return m_String && *m_String; }
 
         // If this string is in the map, changes it to the map value.
@@ -163,7 +163,7 @@ namespace foundation {
             }
         }
 
-        static CRegisteredString ISwearThisHasBeenRegistered(UICBCharPtr str)
+        static CRegisteredString ISwearThisHasBeenRegistered(Qt3DSBCharPtr str)
         {
             CRegisteredString retval;
             retval.m_String = str;
@@ -221,22 +221,22 @@ namespace foundation {
         virtual void EnableMultithreadedAccess() = 0;
         virtual void DisableMultithreadedAccess() = 0;
 
-        virtual CRegisteredString RegisterStr(UICBCharPtr str) = 0;
+        virtual CRegisteredString RegisterStr(Qt3DSBCharPtr str) = 0;
         // utf-16->utf-8
         virtual CRegisteredString RegisterStr(const char16_t *str) = 0;
         // utf-32->utf-8
         virtual CRegisteredString RegisterStr(const char32_t *str) = 0;
 
-        virtual CStringHandle GetHandle(UICBCharPtr str) = 0;
+        virtual CStringHandle GetHandle(Qt3DSBCharPtr str) = 0;
         virtual CRegisteredString HandleToStr(QT3DSU32 strHandle) = 0;
 
         virtual CRegisteredString RegisterStr(const wchar_t *str) = 0;
 
-        virtual const wchar_t *GetWideStr(UICBCharPtr src) = 0;
+        virtual const wchar_t *GetWideStr(Qt3DSBCharPtr src) = 0;
         virtual const wchar_t *GetWideStr(const wchar_t *str) = 0;
 
-        UICBCharPtr GetNarrowStr(const wchar_t *src) { return RegisterStr(src); }
-        UICBCharPtr GetNarrowStr(UICBCharPtr src) { return RegisterStr(src); }
+        Qt3DSBCharPtr GetNarrowStr(const wchar_t *src) { return RegisterStr(src); }
+        Qt3DSBCharPtr GetNarrowStr(Qt3DSBCharPtr src) { return RegisterStr(src); }
 
         // The string table maintains a map that will tell clients where their strings will be
         // in terms of offsets into the data that the string table writes.
diff --git a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h b/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h
index f41a5fc0..33c24004 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h
+++ b/src/Runtime/Source/Qt3DSFoundation/Include/foundation/Utils.h
@@ -171,7 +171,7 @@ namespace foundation {
         QT3DS_ASSERT(false);                                                                          \
     }
 
-#define UICBASE_FOREACH(varname, stop) for (QT3DSU32 varname = 0, end = stop; varname < end; ++varname)
+#define QT3DS_FOREACH(varname, stop) for (QT3DSU32 varname = 0, end = stop; varname < end; ++varname)
 
     template <typename TKeyType, typename TValueType, typename THashType, typename TPredicate,
               typename TBufType, typename TOperator>
@@ -263,7 +263,7 @@ namespace foundation {
 
         startIdx = NVMin(numItems - 1, startIdx);
         QT3DSU32 available = NVMin(numItems - startIdx, bufSize);
-        UICBASE_FOREACH(idx, available)
+        QT3DS_FOREACH(idx, available)
         buffer[idx] = data[idx + startIdx];
         return available;
     }
@@ -278,7 +278,7 @@ namespace foundation {
 
         startIdx = NVMin(numItems - 1, startIdx);
         QT3DSU32 available = NVMin(numItems - startIdx, bufSize);
-        UICBASE_FOREACH(idx, available)
+        QT3DS_FOREACH(idx, available)
         buffer[idx] = data.mData[idx + startIdx];
         return available;
     }
@@ -293,7 +293,7 @@ namespace foundation {
 
         startIdx = NVMin(numItems - 1, startIdx);
         QT3DSU32 available = NVMin(numItems - startIdx, bufSize);
-        UICBASE_FOREACH(idx, available)
+        QT3DS_FOREACH(idx, available)
         buffer[idx] = data.mData[idx + startIdx];
         return available;
     }
@@ -379,4 +379,4 @@ namespace foundation {
     };
 }
 }
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp
index cc1274de..8fa58903 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp
+++ b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/StringTable.cpp
@@ -562,7 +562,7 @@ public:
 
     void DisableMultithreadedAccess() override { m_MultithreadMutex = NULL; }
 
-    CRegisteredString RegisterStr(UICBCharPtr str) override
+    CRegisteredString RegisterStr(Qt3DSBCharPtr str) override
     {
         STRING_TABLE_MULTITHREADED_METHOD;
         if (isTrivial(str))
@@ -595,7 +595,7 @@ public:
         return RegisterStr(m_ConvertBuffer.c_str());
     }
 
-    CStringHandle GetHandle(UICBCharPtr str) override
+    CStringHandle GetHandle(Qt3DSBCharPtr str) override
     {
         STRING_TABLE_MULTITHREADED_METHOD;
         return m_FileData.FindStrHandle(str);
@@ -617,7 +617,7 @@ public:
         return reinterpret_cast<const wchar_t *>(pair_iter.first->second.c_str());
     }
 
-    const wchar_t *GetWideStr(UICBCharPtr src) override
+    const wchar_t *GetWideStr(Qt3DSBCharPtr src) override
     {
         STRING_TABLE_MULTITHREADED_METHOD;
         if (isTrivial(src))
diff --git a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp
index 8db06511..34840103 100644
--- a/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp
+++ b/src/Runtime/Source/Qt3DSFoundation/Source/foundation/XML.cpp
@@ -394,7 +394,7 @@ struct SimpleXmlWriter
     void Write(char8_t data) { m_Stream.Write(data); }
     void Tabs()
     {
-        UICBASE_FOREACH(idx, (m_OpenElements.size() + m_Tabs))
+        QT3DS_FOREACH(idx, (m_OpenElements.size() + m_Tabs))
         Write('\t');
     }
     void Close(bool newline)
@@ -742,7 +742,7 @@ public:
 
     ~SimpleDomFactory()
     {
-        UICBASE_FOREACH(idx, m_BigStrings.size())
+        QT3DS_FOREACH(idx, m_BigStrings.size())
         m_Allocator.deallocate(m_BigStrings[idx]);
         m_BigStrings.clear();
     }
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h b/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
index a2d927e0..e14111af 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
+++ b/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendInputAssemblerGL.h
@@ -66,7 +66,7 @@ namespace render {
 
         NVRenderBackendLayoutEntryGL *getEntryByName(CRegisteredString entryName) const
         {
-            UICBASE_FOREACH(idx, m_LayoutAttribEntries.size())
+            QT3DS_FOREACH(idx, m_LayoutAttribEntries.size())
             {
                 if (m_LayoutAttribEntries[idx].m_AttribName == entryName)
                     return &m_LayoutAttribEntries.mData[idx];
@@ -76,7 +76,7 @@ namespace render {
 
         Option<NVRenderBackendLayoutEntryGL> getEntryByAttribIndex(QT3DSU32 attribIndex) const
         {
-            UICBASE_FOREACH(idx, m_LayoutAttribEntries.size())
+            QT3DS_FOREACH(idx, m_LayoutAttribEntries.size())
             {
                 if (m_LayoutAttribEntries[idx].m_AttribIndex == attribIndex)
                     return m_LayoutAttribEntries[idx];
@@ -112,7 +112,7 @@ namespace render {
             QT3DSU32 *offsetMem = (QT3DSU32 *)QT3DS_ALLOC(fnd.getAllocator(), strides.mSize * sizeof(QT3DSU32),
                                                  "BackendAttributeLayoutGL:m_strides");
             // copy offsets and strides
-            UICBASE_FOREACH(idx, strides.size())
+            QT3DS_FOREACH(idx, strides.size())
             {
                 strideMem[idx] = strides.mData[idx];
                 offsetMem[idx] = offsets.mData[idx];
diff --git a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h b/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
index 03fd6b32..f7caffd8 100644
--- a/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
+++ b/src/Runtime/Source/Qt3DSRender/Include/render/backends/gl/Qt3DSRenderBackendShaderProgramGL.h
@@ -60,7 +60,7 @@ namespace render {
 
         NVRenderBackendShaderInputEntryGL *getEntryByName(CRegisteredString entryName) const
         {
-            UICBASE_FOREACH(idx, m_ShaderInputEntries.size())
+            QT3DS_FOREACH(idx, m_ShaderInputEntries.size())
             {
                 if (m_ShaderInputEntries[idx].m_AttribName == entryName)
                     return &m_ShaderInputEntries.mData[idx];
@@ -71,7 +71,7 @@ namespace render {
         Option<NVRenderBackendShaderInputEntryGL>
         getEntryByAttribLocation(QT3DSU32 attribLocation) const
         {
-            UICBASE_FOREACH(idx, m_ShaderInputEntries.size())
+            QT3DS_FOREACH(idx, m_ShaderInputEntries.size())
             {
                 if (m_ShaderInputEntries[idx].m_AttribLocation == attribLocation)
                     return m_ShaderInputEntries[idx];
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp
index b404a972..1b3c43a9 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderConstantBuffer.cpp
@@ -173,7 +173,7 @@ namespace render {
             QT3DSI32 elementCount, binding;
             NVRenderShaderDataTypes::Enum type;
 
-            UICBASE_FOREACH(idx, paramCount)
+            QT3DS_FOREACH(idx, paramCount)
             {
                 m_Backend->GetConstantInfoByID(pProgram->GetShaderProgramHandle(), theIndices[idx],
                                                512, &elementCount, &type, &binding, nameBuf);
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp
index 26114841..0ab38428 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderFrameBuffer.cpp
@@ -62,7 +62,7 @@ namespace render {
         m_AttachmentBits = 0;
 
         // release attachments
-        UICBASE_FOREACH(idx, (QT3DSU32)NVRenderFrameBufferAttachments::LastAttachment)
+        QT3DS_FOREACH(idx, (QT3DSU32)NVRenderFrameBufferAttachments::LastAttachment)
         {
             if ((NVRenderFrameBufferAttachments::Enum)idx
                     != NVRenderFrameBufferAttachments::DepthStencil
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp
index cd804cbf..e4d38b9d 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderInputAssembler.cpp
@@ -61,7 +61,7 @@ namespace render {
             (NVRenderBackend::NVRenderBackendBufferObject *)QT3DS_ALLOC(
                 m_Foundation.getAllocator(), entrySize, "NVRenderInputAssembler");
         // setup vertex buffer backend handle array
-        UICBASE_FOREACH(idx, buffers.size())
+        QT3DS_FOREACH(idx, buffers.size())
         {
             m_VertexBuffers.push_back(buffers.mData[idx]);
             bufferHandle[idx] = buffers.mData[idx]->GetBuffertHandle();
diff --git a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp
index 6adc98cd..a11207f4 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/Qt3DSRenderShaderProgram.cpp
@@ -504,7 +504,7 @@ namespace render {
 
             QT3DSI32 constantCount = m_Backend->GetConstantCount(m_ProgramHandle);
 
-            UICBASE_FOREACH(idx, constantCount)
+            QT3DS_FOREACH(idx, constantCount)
             {
                 location = m_Backend->GetConstantInfoByID(m_ProgramHandle, idx, 512, &elementCount,
                                                           &type, &binding, nameBuf);
@@ -522,7 +522,7 @@ namespace render {
             // next query constant buffers info
             QT3DSI32 length, bufferSize, paramCount;
             QT3DSI32 constantBufferCount = m_Backend->GetConstantBufferCount(m_ProgramHandle);
-            UICBASE_FOREACH(idx, constantBufferCount)
+            QT3DS_FOREACH(idx, constantBufferCount)
             {
                 location = m_Backend->GetConstantBufferInfoByID(
                     m_ProgramHandle, idx, 512, &paramCount, &bufferSize, &length, nameBuf);
@@ -547,7 +547,7 @@ namespace render {
 
             // next query storage buffers
             QT3DSI32 storageBufferCount = m_Backend->GetStorageBufferCount(m_ProgramHandle);
-            UICBASE_FOREACH(idx, storageBufferCount)
+            QT3DS_FOREACH(idx, storageBufferCount)
             {
                 location = m_Backend->GetStorageBufferInfoByID(
                     m_ProgramHandle, idx, 512, &paramCount, &bufferSize, &length, nameBuf);
@@ -571,7 +571,7 @@ namespace render {
 
             // next query atomic counter buffers
             QT3DSI32 atomicBufferCount = m_Backend->GetAtomicCounterBufferCount(m_ProgramHandle);
-            UICBASE_FOREACH(idx, atomicBufferCount)
+            QT3DS_FOREACH(idx, atomicBufferCount)
             {
                 location = m_Backend->GetAtomicCounterBufferInfoByID(
                     m_ProgramHandle, idx, 512, &paramCount, &bufferSize, &length, nameBuf);
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp
index fbe75b6f..53bff662 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Q3DSRenderBackendGLES2.cpp
@@ -401,7 +401,7 @@ bool NVRenderBackendGLES2Impl::SetInputAssembler(NVRenderBackendInputAssemblerOb
         GL_CALL_EXTENSION_FUNCTION(glBindVertexArrayOES(inputAssembler->m_VaoID));
         inputAssembler->m_cachedShaderHandle = programID;
 
-        UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+        QT3DS_FOREACH(idx, shaderAttribBuffer.size())
         {
             const NVRenderBackendShaderInputEntryGL &attrib(shaderAttribBuffer[idx]);
             NVRenderBackendLayoutEntryGL *entry =
@@ -429,7 +429,7 @@ bool NVRenderBackendGLES2Impl::SetInputAssembler(NVRenderBackendInputAssemblerOb
             GL_CALL_EXTRA_FUNCTION(glDisableVertexAttribArray(i));
 
         // setup all attribs
-        UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+        QT3DS_FOREACH(idx, shaderAttribBuffer.size())
         {
             NVRenderBackendLayoutEntryGL *entry =
                     attribLayout->getEntryByName(shaderAttribBuffer[idx].m_AttribName);
@@ -464,7 +464,7 @@ bool NVRenderBackendGLES2Impl::SetInputAssembler(NVRenderBackendInputAssemblerOb
     }
 #ifdef _DEBUG
     if (inputAssembler->m_VaoID) {
-        UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+        QT3DS_FOREACH(idx, shaderAttribBuffer.size())
         {
             const NVRenderBackendShaderInputEntryGL &attrib(shaderAttribBuffer[idx]);
             NVRenderBackendLayoutEntryGL *entry =
@@ -776,7 +776,7 @@ void NVRenderBackendGLES2Impl::GetConstantBufferParamInfoByIndices(
             GL_CALL_EXTRA_FUNCTION(glGetActiveUniformsiv(programID, count, indices,
                                                          GL_UNIFORM_TYPE, type));
             // convert to UIC types
-            UICBASE_FOREACH(idx, count)
+            QT3DS_FOREACH(idx, count)
             {
                 type[idx] = m_Conversion.fromShaderGLToPropertyDataTypes(type[idx]);
             }
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp
index 8d9640bb..1a7beded 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGL3.cpp
@@ -411,7 +411,7 @@ namespace render {
             GL_CALL_EXTRA_FUNCTION(glBindVertexArray(inputAssembler->m_VaoID));
             inputAssembler->m_cachedShaderHandle = programID;
 
-            UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+            QT3DS_FOREACH(idx, shaderAttribBuffer.size())
             {
                 const NVRenderBackendShaderInputEntryGL &attrib(shaderAttribBuffer[idx]);
                 NVRenderBackendLayoutEntryGL *entry =
@@ -440,7 +440,7 @@ namespace render {
             }
 
             // setup all attribs
-            UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+            QT3DS_FOREACH(idx, shaderAttribBuffer.size())
             {
                 NVRenderBackendLayoutEntryGL *entry =
                     attribLayout->getEntryByName(shaderAttribBuffer[idx].m_AttribName);
@@ -475,7 +475,7 @@ namespace render {
         }
 #ifdef _DEBUG
         if (inputAssembler->m_VaoID) {
-            UICBASE_FOREACH(idx, shaderAttribBuffer.size())
+            QT3DS_FOREACH(idx, shaderAttribBuffer.size())
             {
                 const NVRenderBackendShaderInputEntryGL &attrib(shaderAttribBuffer[idx]);
                 NVRenderBackendLayoutEntryGL *entry =
@@ -648,7 +648,7 @@ namespace render {
             if (type) {
                 GL_CALL_EXTRA_FUNCTION(glGetActiveUniformsiv(programID, count, indices, GL_UNIFORM_TYPE, type));
                 // convert to UIC types
-                UICBASE_FOREACH(idx, count)
+                QT3DS_FOREACH(idx, count)
                 {
                     type[idx] = m_Conversion.fromShaderGLToPropertyDataTypes(type[idx]);
                 }
diff --git a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp
index 30049e76..9ad431c8 100644
--- a/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp
+++ b/src/Runtime/Source/Qt3DSRender/Source/backends/gl/Qt3DSRenderBackendGLBase.cpp
@@ -1212,7 +1212,7 @@ namespace render {
         QT3DSU32 maxInputSlot = 0;
 
         // copy data
-        UICBASE_FOREACH(idx, attribs.size())
+        QT3DS_FOREACH(idx, attribs.size())
         {
             entryRef[idx].m_AttribName = m_StringTable->RegisterStr(attribs.mData[idx].m_Name);
             entryRef[idx].m_Normalize = 0;
@@ -1610,7 +1610,7 @@ namespace render {
 
                 // fill in data
                 QT3DSU32 count = 0;
-                UICBASE_FOREACH(idx, numAttribs)
+                QT3DS_FOREACH(idx, numAttribs)
                 {
                     GLint size = 0;
                     GLenum glType;
@@ -1645,7 +1645,7 @@ namespace render {
                     PtrAtOffset<NVRenderBackendShaderInputEntryGL>(newMem, shaderInputSize,
                                                                    entrySize);
                 // fill data
-                UICBASE_FOREACH(idx, count)
+                QT3DS_FOREACH(idx, count)
                 {
                     entryRef[idx].m_AttribName = tempShaderInputEntry[idx].m_AttribName;
                     entryRef[idx].m_AttribLocation = tempShaderInputEntry[idx].m_AttribLocation;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
index 6ef485e2..073c8e96 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
@@ -41,7 +41,7 @@
 
 namespace qt3ds {
 namespace render {
-    class IUICRenderContext;
+    class IQt3DSRenderContext;
     class IOffscreenRenderManager;
     class IOffscreenRenderer;
     struct ImageMappingModes
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
index f410db06..47c87d99 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
@@ -37,7 +37,7 @@
 
 namespace qt3ds {
 namespace render {
-    class IUICRenderContext;
+    class IQt3DSRenderContext;
     struct SPresentation;
     struct SScene;
     struct SEffect;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
index 9f226562..41abd6c7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
@@ -406,7 +406,7 @@ void SNode::RemoveFromGraph()
 }
 
 NVBounds3 SNode::GetBounds(IBufferManager &inManager, IPathManager &inPathManager,
-                           bool inIncludeChildren, IUICRenderNodeFilter *inChildFilter) const
+                           bool inIncludeChildren, IQt3DSRenderNodeFilter *inChildFilter) const
 {
     NVBounds3 retval;
     retval.setEmpty();
@@ -423,7 +423,7 @@ NVBounds3 SNode::GetBounds(IBufferManager &inManager, IPathManager &inPathManage
 }
 
 NVBounds3 SNode::GetChildBounds(IBufferManager &inManager, IPathManager &inPathManager,
-                                IUICRenderNodeFilter *inChildFilter) const
+                                IQt3DSRenderNodeFilter *inChildFilter) const
 {
     NVBounds3 retval;
     retval.setEmpty();
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
index d4c3f7ff..efff4031 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
@@ -268,9 +268,9 @@ namespace render {
         // Get the bounds of us and our children in our local space.
         NVBounds3 GetBounds(IBufferManager &inManager, IPathManager &inPathManager,
                             bool inIncludeChildren = true,
-                            IUICRenderNodeFilter *inChildFilter = NULL) const;
+                            IQt3DSRenderNodeFilter *inChildFilter = NULL) const;
         NVBounds3 GetChildBounds(IBufferManager &inManager, IPathManager &inPathManager,
-                                 IUICRenderNodeFilter *inChildFilter = NULL) const;
+                                 IQt3DSRenderNodeFilter *inChildFilter = NULL) const;
         // Assumes CalculateGlobalVariables has already been called.
         QT3DSVec3 GetGlobalPos() const;
         QT3DSVec3 GetGlobalPivot() const;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
index bc9c3eaa..6403959e 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
@@ -33,7 +33,7 @@
 
 using namespace qt3ds::render;
 
-void SPresentation::Render(IUICRenderContext &inContext)
+void SPresentation::Render(IQt3DSRenderContext &inContext)
 {
     if (m_Scene) {
         NVRenderRect theViewportSize(inContext.GetRenderContext().GetViewport());
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
index 9d1d83f9..da1a5da4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
@@ -83,7 +83,7 @@ namespace render {
             inRemapper.Remap(m_PresentationDirectory);
         }
 
-        void Render(IUICRenderContext &inContext);
+        void Render(IQt3DSRenderContext &inContext);
     };
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
index aa19c091..0e6aa1e4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
@@ -65,7 +65,7 @@ SLayer *SScene::GetLastChild()
     return child;
 }
 
-bool SScene::PrepareForRender(const QT3DSVec2 &inViewportDimensions, IUICRenderContext &inContext)
+bool SScene::PrepareForRender(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext)
 {
     // We need to iterate through the layers in reverse order and ask them to render.
     bool wasDirty = m_Dirty;
@@ -77,7 +77,7 @@ bool SScene::PrepareForRender(const QT3DSVec2 &inViewportDimensions, IUICRenderC
     return wasDirty;
 }
 
-void SScene::Render(const QT3DSVec2 &inViewportDimensions, IUICRenderContext &inContext,
+void SScene::Render(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext,
                     RenderClearCommand inClearColorBuffer)
 {
     if ((inClearColorBuffer == SScene::ClearIsOptional && m_UseClearColor)
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
index aa7e0b74..57976945 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
@@ -68,8 +68,8 @@ namespace render {
             inRemapper.Remap(m_FirstChild);
         }
         // returns true if any of the layers were dirty or if this object was dirty
-        bool PrepareForRender(const QT3DSVec2 &inViewportDimensions, IUICRenderContext &inContext);
-        void Render(const QT3DSVec2 &inViewportDimensions, IUICRenderContext &inContext,
+        bool PrepareForRender(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext);
+        void Render(const QT3DSVec2 &inViewportDimensions, IQt3DSRenderContext &inContext,
                     RenderClearCommand command = ClearIsOptional);
     };
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
index ea86e65d..16132ba7 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
@@ -42,7 +42,7 @@
 namespace qt3ds {
 namespace render {
     class IResourceManager;
-    struct SUICRenderPickResult;
+    struct Qt3DSRenderPickResult;
     class IGraphObjectPickQuery;
     struct OffscreenRendererDepthValues
     {
@@ -227,7 +227,7 @@ namespace render {
 
         static IOffscreenRenderManager &
         CreateOffscreenRenderManager(NVAllocatorCallback &inCallback, IStringTable &inStringTable,
-                                     IResourceManager &inManager, IUICRenderContext &inContext);
+                                     IResourceManager &inManager, IQt3DSRenderContext &inContext);
     };
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
index 0d474cb0..8c46cca2 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
@@ -49,7 +49,7 @@ namespace render {
     class COldNBustedPluginRenderer : public IOffscreenRenderer
     {
     public:
-        IUICRenderContext &m_RenderContext;
+        IQt3DSRenderContext &m_RenderContext;
         long m_DLLHandle;
         volatile QT3DSI32 mRefCount;
         SOffscreenRendererEnvironment m_LastRenderedEnvironment;
@@ -58,7 +58,7 @@ namespace render {
         PROC_GetDesiredTextureSize m_GetTextureSizeProc;
         PROC_Render m_RenderProc;
 
-        COldNBustedPluginRenderer(IUICRenderContext &inRenderContext, long inDLLHandle);
+        COldNBustedPluginRenderer(IQt3DSRenderContext &inRenderContext, long inDLLHandle);
 
         QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(m_RenderContext.GetAllocator())
 
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
index 7563bc4b..44729682 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
@@ -179,13 +179,13 @@ namespace render {
     using qt3ds::render::NVRenderTextureTypeValue;
     using qt3ds::render::NVRenderProgramPipeline;
 
-    class IUICRenderContextCore;
-    class IUICRenderContext;
-    class IUICRenderer;
+    class IQt3DSRenderContextCore;
+    class IQt3DSRenderContext;
+    class IQt3DSRenderer;
     class IBufferManager;
     struct SRenderMesh;
     class IRenderableObject;
-    class IUICRenderer;
+    class IQt3DSRenderer;
     class IBufferManager;
     class IResourceManager;
     class IOffscreenRenderManager;
@@ -199,7 +199,7 @@ namespace render {
     class IEffectSystemCore;
     class CRenderString;
     class IShaderCache;
-    class IUICRenderNodeFilter;
+    class IQt3DSRenderNodeFilter;
     class IRenderWidget;
     class IRenderWidgetContext;
     struct SShaderVertexCodeGenerator;
@@ -246,7 +246,7 @@ namespace render {
     class IDefaultMaterialShaderGenerator;
     class ICustomMaterialShaderGenerator;
     struct SRenderableImage;
-    class UICShadowMap;
+    class Qt3DSShadowMap;
     struct SLightmaps;
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
index 1da509bf..82e09451 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
@@ -52,7 +52,7 @@ namespace render {
     };
 
     // Part of render context that does not require the render system.
-    class IUICRenderContextCore : public NVRefCounted
+    class IQt3DSRenderContextCore : public NVRefCounted
     {
     public:
         virtual IStringTable &GetStringTable() = 0;
@@ -74,21 +74,21 @@ namespace render {
         virtual void SetOnscreenTextRendererCore(ITextRendererCore &inRenderer) = 0;
         virtual ITextRendererCore *GetOnscreenTextRendererCore() = 0;
         // The render context maintains a reference to this object.
-        virtual IUICRenderContext &CreateRenderContext(NVRenderContext &inContext,
+        virtual IQt3DSRenderContext &CreateRenderContext(NVRenderContext &inContext,
                                                        const char8_t *inPrimitivesDirectory) = 0;
 
-        static IUICRenderContextCore &Create(NVFoundationBase &fnd, IStringTable &strt);
+        static IQt3DSRenderContextCore &Create(NVFoundationBase &fnd, IStringTable &strt);
     };
 
-    class IUICRenderContext : public NVRefCounted
+    class IQt3DSRenderContext : public NVRefCounted
     {
     protected:
-        virtual ~IUICRenderContext() {}
+        virtual ~IQt3DSRenderContext() {}
     public:
         virtual IStringTable &GetStringTable() = 0;
         virtual NVFoundationBase &GetFoundation() = 0;
         virtual NVAllocatorCallback &GetAllocator() = 0;
-        virtual IUICRenderer &GetRenderer() = 0;
+        virtual IQt3DSRenderer &GetRenderer() = 0;
         virtual IBufferManager &GetBufferManager() = 0;
         virtual IResourceManager &GetResourceManager() = 0;
         virtual NVRenderContext &GetRenderContext() = 0;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
index f114fa15..44e2c064 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
@@ -35,7 +35,7 @@
 namespace qt3ds {
 namespace render {
 
-    class UICShadowMap;
+    class Qt3DSShadowMap;
 
     class ICustomMaterialShaderGenerator : public IMaterialShaderGenerator
     {
@@ -61,7 +61,7 @@ namespace render {
                               SLayerGlobalRenderProperties inRenderProperties) override = 0;
 
         static ICustomMaterialShaderGenerator &
-        CreateCustomMaterialShaderGenerator(IUICRenderContext &inRenderContext);
+        CreateCustomMaterialShaderGenerator(IQt3DSRenderContext &inRenderContext);
     };
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
index 6b2fa7d0..31ab66c3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
@@ -99,10 +99,10 @@ namespace render {
         virtual void Load(NVDataRef<QT3DSU8> inData, CStrTableOrDataRef inStrDataBlock,
                           const char8_t *inProjectDir) = 0;
 
-        virtual ICustomMaterialSystem &GetCustomMaterialSystem(IUICRenderContext &inContext) = 0;
+        virtual ICustomMaterialSystem &GetCustomMaterialSystem(IQt3DSRenderContext &inContext) = 0;
 
         static ICustomMaterialSystemCore &
-        CreateCustomMaterialSystemCore(IUICRenderContextCore &inContext);
+        CreateCustomMaterialSystemCore(IQt3DSRenderContextCore &inContext);
     };
     // How to handle blend modes?
     class ICustomMaterialSystem : public ICustomMaterialSystemCore
@@ -131,10 +131,10 @@ namespace render {
 
     struct SCustomMaterialVertexPipeline : public SVertexPipelineImpl
     {
-        IUICRenderContext *m_UICContext;
+        IQt3DSRenderContext *m_Context;
         TessModeValues::Enum m_TessMode;
 
-        SCustomMaterialVertexPipeline(IUICRenderContext *inContext, TessModeValues::Enum inTessMode);
+        SCustomMaterialVertexPipeline(IQt3DSRenderContext *inContext, TessModeValues::Enum inTessMode);
         void InitializeTessControlShader();
         void InitializeTessEvaluationShader();
         void FinalizeTessControlShader();
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
index 6ec567d5..8303a425 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
@@ -35,7 +35,7 @@
 namespace qt3ds {
 namespace render {
 
-    class UICShadowMap;
+    class Qt3DSShadowMap;
     struct SShaderGeneratorGeneratedShader;
     struct SLightConstantProperties;
 
@@ -111,7 +111,7 @@ namespace render {
                               SLayerGlobalRenderProperties inRenderProperties) override = 0;
 
         static IDefaultMaterialShaderGenerator &
-        CreateDefaultMaterialShaderGenerator(IUICRenderContext &inRenderContext);
+        CreateDefaultMaterialShaderGenerator(IQt3DSRenderContext &inRenderContext);
 
         SLightConstantProperties *GetLightConstantProperties(SShaderGeneratorGeneratedShader &shader);
     };
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
index 668a638f..482e1558 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
@@ -246,9 +246,9 @@ namespace render {
         virtual void Load(NVDataRef<QT3DSU8> inData, CStrTableOrDataRef inStrDataBlock,
                           const char8_t *inProjectDir) = 0;
 
-        virtual IDynamicObjectSystem &CreateDynamicSystem(IUICRenderContext &rc) = 0;
+        virtual IDynamicObjectSystem &CreateDynamicSystem(IQt3DSRenderContext &rc) = 0;
 
-        static IDynamicObjectSystemCore &CreateDynamicSystemCore(IUICRenderContextCore &rc);
+        static IDynamicObjectSystemCore &CreateDynamicSystemCore(IQt3DSRenderContextCore &rc);
     };
 
     typedef eastl::pair<NVScopedRefCounted<NVRenderShaderProgram>,
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
index bdabe21b..119564da 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
@@ -157,11 +157,11 @@ namespace render {
         virtual void Load(NVDataRef<QT3DSU8> inData, CStrTableOrDataRef inStrDataBlock,
                           const char8_t *inProjectDir) = 0;
 
-        virtual IEffectSystem &GetEffectSystem(IUICRenderContext &context) = 0;
+        virtual IEffectSystem &GetEffectSystem(IQt3DSRenderContext &context) = 0;
 
         virtual IResourceManager &GetResourceManager() = 0;
 
-        static IEffectSystemCore &CreateEffectSystemCore(IUICRenderContextCore &context);
+        static IEffectSystemCore &CreateEffectSystemCore(IQt3DSRenderContextCore &context);
     };
 
     /**
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
index 757f1579..e63cad3f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
@@ -42,7 +42,7 @@ namespace render {
 
     class IOffscreenRenderer;
 
-    struct SUICRenderPickSubResult
+    struct Qt3DSRenderPickSubResult
     {
         IOffscreenRenderer *m_SubRenderer;
         QT3DSMat44 m_TextureMatrix;
@@ -50,14 +50,14 @@ namespace render {
         NVRenderTextureCoordOp::Enum m_VerticalTilingMode;
         QT3DSU32 m_ViewportWidth;
         QT3DSU32 m_ViewportHeight;
-        SUICRenderPickSubResult *m_NextSibling;
+        Qt3DSRenderPickSubResult *m_NextSibling;
 
-        SUICRenderPickSubResult()
+        Qt3DSRenderPickSubResult()
             : m_SubRenderer(NULL)
             , m_NextSibling(NULL)
         {
         }
-        SUICRenderPickSubResult(IOffscreenRenderer &inSubRenderer, QT3DSMat44 inTextureMatrix,
+        Qt3DSRenderPickSubResult(IOffscreenRenderer &inSubRenderer, QT3DSMat44 inTextureMatrix,
                                 NVRenderTextureCoordOp::Enum inHorizontalTilingMode,
                                 NVRenderTextureCoordOp::Enum inVerticalTilingMode, QT3DSU32 width,
                                 QT3DSU32 height)
@@ -72,19 +72,19 @@ namespace render {
         }
     };
 
-    struct SUICRenderPickResult
+    struct Qt3DSRenderPickResult
     {
         const SGraphObject *m_HitObject;
         QT3DSF32 m_CameraDistanceSq;
         // The local coordinates in X,Y UV space where the hit occured
         QT3DSVec2 m_LocalUVCoords;
         // The local mouse coordinates will be the same on all of the sub objects.
-        SUICRenderPickSubResult *m_FirstSubObject;
+        Qt3DSRenderPickSubResult *m_FirstSubObject;
         // The offscreen renderer that was used to render the scene graph this result was produced
         // from.
         IOffscreenRenderer *m_OffscreenRenderer;
 
-        SUICRenderPickResult(const SGraphObject &inHitObject, QT3DSF32 inCameraDistance,
+        Qt3DSRenderPickResult(const SGraphObject &inHitObject, QT3DSF32 inCameraDistance,
                              const QT3DSVec2 &inLocalUVCoords)
             : m_HitObject(&inHitObject)
             , m_CameraDistanceSq(inCameraDistance)
@@ -93,7 +93,7 @@ namespace render {
             , m_OffscreenRenderer(NULL)
         {
         }
-        SUICRenderPickResult()
+        Qt3DSRenderPickResult()
             : m_HitObject(NULL)
             , m_CameraDistanceSq(QT3DS_MAX_F32)
             , m_LocalUVCoords(0, 0)
@@ -115,7 +115,7 @@ namespace render {
         // If the return value has size of zero then we assume nothing more can be picked and the
         // pick
         // is finished.
-        virtual SUICRenderPickResult Pick(const QT3DSVec2 &inMouseCoords,
+        virtual Qt3DSRenderPickResult Pick(const QT3DSVec2 &inMouseCoords,
                                           const QT3DSVec2 &inViewportDimensions,
                                           bool inPickEverything) = 0;
     };
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
index f1c38954..d3698032 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
@@ -37,7 +37,7 @@ namespace qt3ds {
 namespace render {
 
     // forward declararion
-    class UICRenderPrefilterTexture;
+    class Qt3DSRenderPrefilterTexture;
 
     struct ImageTextureFlagValues
     {
@@ -82,7 +82,7 @@ namespace render {
     {
         NVRenderTexture2D *m_Texture;
         SImageTextureFlags m_TextureFlags;
-        UICRenderPrefilterTexture *m_BSDFMipMap;
+        Qt3DSRenderPrefilterTexture *m_BSDFMipMap;
 
         SImageTextureData()
             : m_Texture(NULL)
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
index 4eaf696a..e8b9880d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
@@ -76,7 +76,7 @@ namespace render {
         QT3DSVec3 m_CameraDirection;
         NVDataRef<SLight *> m_Lights;
         NVDataRef<QT3DSVec3> m_LightDirections;
-        UICShadowMap *m_ShadowMapManager;
+        Qt3DSShadowMap *m_ShadowMapManager;
         NVRenderTexture2D *m_DepthTexture;
         NVRenderTexture2D *m_SSaoTexture;
         SImage *m_LightProbe;
@@ -91,7 +91,7 @@ namespace render {
         SLayerGlobalRenderProperties(const SLayer &inLayer, SCamera &inCamera,
                                      QT3DSVec3 inCameraDirection, NVDataRef<SLight *> inLights,
                                      NVDataRef<QT3DSVec3> inLightDirections,
-                                     UICShadowMap *inShadowMapManager,
+                                     Qt3DSShadowMap *inShadowMapManager,
                                      NVRenderTexture2D *inDepthTexture,
                                      NVRenderTexture2D *inSSaoTexture, SImage *inLightProbe,
                                      SImage *inLightProbe2, QT3DSF32 inProbeHorizon,
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
index ff7763f5..fc7e05f1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
@@ -87,9 +87,9 @@ namespace render {
         // Returns angle in x, distance in y.
         static QT3DSVec2 GetAngleDistanceFromControlPoint(QT3DSVec2 inPosition, QT3DSVec2 inControlPoint);
 
-        virtual IPathManager &OnRenderSystemInitialize(IUICRenderContext &context) = 0;
+        virtual IPathManager &OnRenderSystemInitialize(IQt3DSRenderContext &context) = 0;
 
-        static IPathManagerCore &CreatePathManagerCore(IUICRenderContextCore &inContext);
+        static IPathManagerCore &CreatePathManagerCore(IQt3DSRenderContextCore &inContext);
     };
 
     struct SPathRenderContext; // UICRenderPathRenderContext.h
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
index e4b67d6b..b37cb26b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
@@ -46,7 +46,7 @@ namespace render {
         // Renders the node to the current viewport.
         virtual void Render(NVConstDataRef<SPGGraphObject *> inObjects) = 0;
 
-        static IPixelGraphicsRenderer &CreateRenderer(IUICRenderContext &ctx, IStringTable &strt);
+        static IPixelGraphicsRenderer &CreateRenderer(IQt3DSRenderContext &ctx, IStringTable &strt);
     };
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
index 711f31d6..3c5d1f00 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
@@ -43,44 +43,44 @@
 #extern "C" {
 #endif
 
-enum EUICRenderPluginPropertyTypes {
-    EUICRenderPluginPropertyTypeNone = 0,
-    EUICRenderPluginPropertyTypeLong = 1,
-    EUICRenderPluginPropertyTypeFloat = 2,
-    EUICRenderPluginPropertyTypeCharPtr = 3,
+enum QT3DSRenderPluginPropertyTypes {
+    QT3DSRenderPluginPropertyTypeNone = 0,
+    QT3DSRenderPluginPropertyTypeLong = 1,
+    QT3DSRenderPluginPropertyTypeFloat = 2,
+    QT3DSRenderPluginPropertyTypeCharPtr = 3,
 };
 
-enum EUICRenderPluginDepthTypes {
-    EUICRenderPluginDepthTypeNoDepthBuffer = 0,
-    EUICRenderPluginDepthTypeDepth16, // 16 bit depth buffer
-    EUICRenderPluginDepthTypeDepth24, // 24 bit depth buffer
-    EUICRenderPluginDepthTypeDepth32, // 32 bit depth buffer
+enum QT3DSRenderPluginDepthTypes {
+    QT3DSRenderPluginDepthTypeNoDepthBuffer = 0,
+    QT3DSRenderPluginDepthTypeDepth16, // 16 bit depth buffer
+    QT3DSRenderPluginDepthTypeDepth24, // 24 bit depth buffer
+    QT3DSRenderPluginDepthTypeDepth32, // 32 bit depth buffer
 };
 
-enum EUICRenderPluginTextureTypes {
-    EUICRenderPluginTextureTypeNoTexture = 0,
-    EUICRenderPluginTextureTypeRGBA8, // 32 bit format
-    EUICRenderPluginTextureTypeRGB8, // 24 bit format
-    EUICRenderPluginTextureTypeRGB565, // 16 bit format
-    EUICRenderPluginTextureTypeRGBA5551, // 16 bit format
+enum QT3DSRenderPluginTextureTypes {
+    QT3DSRenderPluginTextureTypeNoTexture = 0,
+    QT3DSRenderPluginTextureTypeRGBA8, // 32 bit format
+    QT3DSRenderPluginTextureTypeRGB8, // 24 bit format
+    QT3DSRenderPluginTextureTypeRGB565, // 16 bit format
+    QT3DSRenderPluginTextureTypeRGBA5551, // 16 bit format
 };
 
-enum EUICRenderPluginColorClearState {
-    EUICRenderPluginColorClearStateClearIsOptional = 0,
-    EUICRenderPluginColorClearStateDoNotClear,
-    EUICRenderPluginColorClearStateAlwaysClear,
+enum QT3DSRenderPluginColorClearState {
+    QT3DSRenderPluginColorClearStateClearIsOptional = 0,
+    QT3DSRenderPluginColorClearStateDoNotClear,
+    QT3DSRenderPluginColorClearStateAlwaysClear,
 };
 
-enum EUICRenderPluginMSAALevel {
-    EUICRenderPluginMSAALevelNoMSAA = 0, // no MSAA, one also works.
-    EUICRenderPluginMSAALevelTwo = 2, // 2 samples
-    EUICRenderPluginMSAALevelFour = 4, // 4 samples
-    EUICRenderPluginMSAALevelEight = 8, // 8 samples
+enum QT3DSRenderPluginMSAALevel {
+    QT3DSRenderPluginMSAALevelNoMSAA = 0, // no MSAA, one also works.
+    QT3DSRenderPluginMSAALevelTwo = 2, // 2 samples
+    QT3DSRenderPluginMSAALevelFour = 4, // 4 samples
+    QT3DSRenderPluginMSAALevelEight = 8, // 8 samples
 };
 
-typedef long TUICBOOL;
-#define UICTRUE 1
-#define UICFALSE 0
+typedef long TBool;
+#define TTRUE 1
+#define TFALSE 0
 
 #define QT3DS_CURRENT_RENDER_PLUGIN_API_VERSION 2
 
@@ -91,7 +91,7 @@ typedef void *TRenderPluginClassPtr;
 typedef struct _RenderPluginPropertyUpdate
 {
     const char *m_PropName;
-    enum EUICRenderPluginPropertyTypes m_PropertyType;
+    enum QT3DSRenderPluginPropertyTypes m_PropertyType;
 
     // Is either a float or a long or a const char* depending on the property type.
     // for specify types of properties, example code would be:
@@ -105,22 +105,22 @@ typedef struct _RenderPluginSurfaceDescription
 {
     long m_Width;
     long m_Height;
-    enum EUICRenderPluginDepthTypes m_DepthBuffer;
-    enum EUICRenderPluginTextureTypes m_ColorBuffer;
-    TUICBOOL m_HasStencilBuffer;
-    EUICRenderPluginMSAALevel m_MSAALevel;
+    enum QT3DSRenderPluginDepthTypes m_DepthBuffer;
+    enum QT3DSRenderPluginTextureTypes m_ColorBuffer;
+    TBool m_HasStencilBuffer;
+    QT3DSRenderPluginMSAALevel m_MSAALevel;
 } TRenderPluginSurfaceDescription;
 
-typedef struct _UICVec2
+typedef struct _TVec2
 {
     float x;
     float y;
-} TUICVec2;
+} TVec2;
 
 typedef struct _NeedsRenderResult
 {
-    TUICBOOL HasChangedSinceLastFrame;
-    TUICBOOL HasTransparency;
+    TBool HasChangedSinceLastFrame;
+    TBool HasTransparency;
 } TNeedsRenderResult;
 
 struct lua_State;
@@ -177,7 +177,7 @@ typedef void (*TUpdateInstanceFunction)(TRenderPluginClassPtr cls,
  */
 typedef TRenderPluginSurfaceDescription (*TSurfaceQueryFunction)(TRenderPluginClassPtr cls,
                                                                  TRenderPluginInstancePtr instance,
-                                                                 TUICVec2 presScaleFactor);
+                                                                 TVec2 presScaleFactor);
 
 /*
  *	Query used by the rendering system.  Should return true if the plugin will render something
@@ -197,7 +197,7 @@ typedef TRenderPluginSurfaceDescription (*TSurfaceQueryFunction)(TRenderPluginCl
 typedef TNeedsRenderResult (*TNeedsRenderFunction)(TRenderPluginClassPtr cls,
                                                    TRenderPluginInstancePtr instance,
                                                    TRenderPluginSurfaceDescription surface,
-                                                   TUICVec2 presScaleFactor);
+                                                   TVec2 presScaleFactor);
 
 /*
  *  Render plugin data.
@@ -222,8 +222,8 @@ typedef TNeedsRenderResult (*TNeedsRenderFunction)(TRenderPluginClassPtr cls,
  *	Required API function.
  */
 typedef void (*TRenderFunction)(TRenderPluginClassPtr cls, TRenderPluginInstancePtr instance,
-                                TRenderPluginSurfaceDescription surface, TUICVec2 presScaleFactor,
-                                EUICRenderPluginColorClearState inClearColorBuffer);
+                                TRenderPluginSurfaceDescription surface, TVec2 presScaleFactor,
+                                QT3DSRenderPluginColorClearState inClearColorBuffer);
 
 /*
  *	Pick - handle a mouse pick into the plugin.
@@ -231,8 +231,8 @@ typedef void (*TRenderFunction)(TRenderPluginClassPtr cls, TRenderPluginInstance
  *
  *	Option API function.
  */
-typedef TUICBOOL (*TPickFunction)(TRenderPluginClassPtr cls, TRenderPluginInstancePtr instance,
-                                  TUICVec2 inMouse, TUICVec2 inViewport);
+typedef TBool (*TPickFunction)(TRenderPluginClassPtr cls, TRenderPluginInstancePtr instance,
+                                  TVec2 inMouse, TVec2 inViewport);
 
 /*
  *	Release a given instance of the plugin.
@@ -337,4 +337,4 @@ typedef TRenderPluginClass (*TCreateRenderPluginClassFunction)(const char *inTyp
 }
 #endif
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
index d7d2e4a4..a5941c03 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
@@ -103,7 +103,7 @@ namespace render {
         virtual QT3DSU32 GetAndResetTriangleCount() const = 0;
 
         static IRenderProfiler &CreateGpuProfiler(NVFoundationBase &inFoundation,
-                                                  IUICRenderContext &inContext,
+                                                  IQt3DSRenderContext &inContext,
                                                   NVRenderContext &inRenderContext);
     };
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
index 7dc46cee..23892c5c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
@@ -114,7 +114,7 @@ namespace render {
                                           TShaderFeatureSet(), separableProgram);
         }
 
-        static IShaderProgramGenerator &CreateProgramGenerator(IUICRenderContext &inContext);
+        static IShaderProgramGenerator &CreateProgramGenerator(IQt3DSRenderContext &inContext);
 
         static void OutputParaboloidDepthVertex(IShaderStageGenerator &inGenerator);
         // By convention, the local space result of the TE is stored in vec4 pos local variable.
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
index 2f0f32b5..c5ba2eaa 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
@@ -124,19 +124,19 @@ namespace render {
         QT3DSMat44 m_LightView; ///< light view transform
     };
 
-    class UICShadowMap : public NVRefCounted
+    class Qt3DSShadowMap : public NVRefCounted
     {
         typedef nvvector<SShadowMapEntry> TShadowMapEntryList;
 
     public:
-        IUICRenderContext &m_UICContext;
+        IQt3DSRenderContext &m_Context;
         volatile QT3DSI32 mRefCount;
 
     public:
-        UICShadowMap(IUICRenderContext &inContext);
-        ~UICShadowMap();
+        Qt3DSShadowMap(IQt3DSRenderContext &inContext);
+        ~Qt3DSShadowMap();
 
-        QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_UICContext.GetAllocator())
+        QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Context.GetAllocator())
 
         /*
          * @brief Add a shadow map entry
@@ -172,7 +172,7 @@ namespace render {
          */
         QT3DSU32 GetShadowMapEntryCount() { return m_ShadowMapList.size(); }
 
-        static UICShadowMap *Create(IUICRenderContext &inContext);
+        static Qt3DSShadowMap *Create(IQt3DSRenderContext &inContext);
 
     private:
         TShadowMapEntryList m_ShadowMapList; ///< List of shadow map entries
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
index 1c5d66e5..68a1928d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
@@ -44,12 +44,12 @@ namespace render {
     // set to 1
     struct SSubPresentationHelper
     {
-        IUICRenderContext &m_RenderContext;
+        IQt3DSRenderContext &m_RenderContext;
         SWindowDimensions m_PreviousPresentationDimensions;
 
         bool m_WasInSubPresentation;
 
-        SSubPresentationHelper(IUICRenderContext &inContext,
+        SSubPresentationHelper(IQt3DSRenderContext &inContext,
                                const SWindowDimensions &inPresDimensions)
             : m_RenderContext(inContext)
             , m_PreviousPresentationDimensions(inContext.GetCurrentPresentationDimensions())
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
index 3d4b2384..97371edc 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
@@ -53,7 +53,7 @@ namespace render {
             : m_Renderer(renderer)
         {
         }
-        SUICRenderPickResult Pick(const QT3DSVec2 &inMouseCoords,
+        Qt3DSRenderPickResult Pick(const QT3DSVec2 &inMouseCoords,
                                           const QT3DSVec2 &inViewportDimensions,
                                           bool inPickEverything) override;
     };
@@ -61,14 +61,14 @@ namespace render {
     class CSubPresentationRenderer : public IOffscreenRenderer
     {
     public:
-        IUICRenderContext &m_RenderContext;
+        IQt3DSRenderContext &m_RenderContext;
         SPresentation &m_Presentation;
         volatile QT3DSI32 mRefCount;
         SOffscreenRendererEnvironment m_LastRenderedEnvironment;
         CSubPresentationPickQuery m_PickQuery;
         CRegisteredString m_OffscreenRendererType;
 
-        CSubPresentationRenderer(IUICRenderContext &inRenderContext, SPresentation &inPresentation);
+        CSubPresentationRenderer(IQt3DSRenderContext &inRenderContext, SPresentation &inPresentation);
 
         QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(m_RenderContext.GetAllocator())
 
@@ -89,7 +89,7 @@ namespace render {
         static const char *GetRendererName() { return "SubPresentation"; }
         CRegisteredString GetOffscreenRendererType() override { return m_OffscreenRendererType; }
 
-        SUICRenderPickResult DoGraphQueryPick(const QT3DSVec2 &inMouseCoords,
+        Qt3DSRenderPickResult DoGraphQueryPick(const QT3DSVec2 &inMouseCoords,
                                               const QT3DSVec2 &inViewportDimensions,
                                               bool inPickEverything);
     };
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
index fcb737ed..8e8d24f5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
@@ -41,7 +41,7 @@
 #include "Qt3DSRenderPath.h"
 #include "Qt3DSRenderPresentation.h"
 
-// map from UICDM to UIC::RENDER
+// map from qt3dsdm to qt3ds::render
 namespace qt3ds {
 namespace render {
 
@@ -260,7 +260,7 @@ namespace render {
     // object
     // along with some information about what portion of the object model this property affects.
 
-    struct UICRenderDirtyFlags
+    struct Qt3DSRenderDirtyFlags
     {
         enum Enum {
             Unknown = 0,
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
index f8a524be..d2e575c3 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
@@ -55,10 +55,10 @@ namespace render {
 
     using qt3ds::foundation::NVConstDataRef;
 
-    class IUICRenderNodeFilter
+    class IQt3DSRenderNodeFilter
     {
     protected:
-        virtual ~IUICRenderNodeFilter() {}
+        virtual ~IQt3DSRenderNodeFilter() {}
     public:
         virtual bool IncludeNode(const SNode &inNode) = 0;
     };
@@ -89,10 +89,10 @@ namespace render {
         SScaleAndPosition() {}
     };
 
-    class IUICRenderer : public NVRefCounted
+    class IQt3DSRenderer : public NVRefCounted
     {
     protected:
-        virtual ~IUICRenderer() {}
+        virtual ~IQt3DSRenderer() {}
 
     public:
         virtual void EnableLayerCaching(bool inEnabled) = 0;
@@ -107,7 +107,7 @@ namespace render {
         virtual void ChildrenUpdated(SNode &inParent) = 0;
         virtual QT3DSF32 GetTextScale(const SText &inText) = 0;
 
-        // The IUICRenderContext calls these, clients should not.
+        // The IQt3DSRenderContext calls these, clients should not.
         virtual void BeginFrame() = 0;
         virtual void EndFrame() = 0;
 
@@ -139,7 +139,7 @@ namespace render {
         // that have handlers
         // in some cases and just pick everything in other things.
         virtual void PickRenderPlugins(bool inPick) = 0;
-        virtual SUICRenderPickResult Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
+        virtual Qt3DSRenderPickResult Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
                                           const QT3DSVec2 &inMouseCoords, bool inPickSiblings = true,
                                           bool inPickEverything = false) = 0;
 
@@ -236,7 +236,7 @@ namespace render {
         static bool IsGl2Context(qt3ds::render::NVRenderContextType inContextType);
         static const char *GetGlslVesionString(qt3ds::render::NVRenderContextType inContextType);
 
-        static IUICRenderer &CreateRenderer(IUICRenderContext &inContext);
+        static IQt3DSRenderer &CreateRenderer(IQt3DSRenderContext &inContext);
     };
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
index 5ebd116b..8e285f00 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
@@ -43,7 +43,7 @@ class IQ3DSQmlStreamRenderer;
 class Q3DSQmlRender : public IOffscreenRenderer
 {
 public:
-    Q3DSQmlRender(IUICRenderContext &inRenderContext, const char *asset);
+    Q3DSQmlRender(IQt3DSRenderContext &inRenderContext, const char *asset);
     ~Q3DSQmlRender();
 
     QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE_OVERRIDE(m_RenderContext.GetAllocator())
@@ -75,7 +75,7 @@ private:
 
     void initializeRenderer();
 
-    IUICRenderContext &m_RenderContext;
+    IQt3DSRenderContext &m_RenderContext;
     IQ3DSQmlStreamRenderer *m_qmlStreamRenderer;
     CRegisteredString m_offscreenRenderType;
     CRegisteredString m_assetString;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
index 6eff8eb5..faf63400 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
@@ -251,7 +251,7 @@ namespace render {
 
         context.SetActiveShader(&shader->m_Shader);
 
-        m_Generator.GetUICContext().GetDefaultMaterialShaderGenerator().SetMaterialProperties(
+        m_Generator.GetQt3DSContext().GetDefaultMaterialShaderGenerator().SetMaterialProperties(
             shader->m_Shader, m_Material, inCameraVec, m_ModelContext.m_ModelViewProjection,
             m_ModelContext.m_NormalMatrix, m_ModelContext.m_Model.m_GlobalTransform, m_FirstImage,
             m_Opacity, m_Generator.GetLayerGlobalRenderProperties());
@@ -438,13 +438,13 @@ namespace render {
                                            const NVRenderTexture2D *inSsaoTexture,
                                            TShaderFeatureSet inFeatureSet)
     {
-        IUICRenderContext &uicContext(m_Generator.GetUICContext());
+        IQt3DSRenderContext &qt3dsContext(m_Generator.GetQt3DSContext());
         SCustomMaterialRenderContext theRenderContext(
             inLayer, inLayerData, inLights, inCamera, m_ModelContext.m_Model, m_Subset,
             m_ModelContext.m_ModelViewProjection, m_GlobalTransform, m_ModelContext.m_NormalMatrix,
             m_Material, inDepthTexture, inSsaoTexture, m_ShaderDescription, m_FirstImage);
 
-        uicContext.GetCustomMaterialSystem().RenderSubset(theRenderContext, inFeatureSet);
+        qt3dsContext.GetCustomMaterialSystem().RenderSubset(theRenderContext, inFeatureSet);
     }
 
     void SCustomMaterialRenderable::RenderDepthPass(const QT3DSVec2 &inCameraVec,
@@ -455,8 +455,8 @@ namespace render {
                                                     const NVRenderTexture2D * /*inDepthTexture*/)
     {
 
-        IUICRenderContext &uicContext(m_Generator.GetUICContext());
-        if (!uicContext.GetCustomMaterialSystem().RenderDepthPrepass(
+        IQt3DSRenderContext &qt3dsContext(m_Generator.GetQt3DSContext());
+        if (!qt3dsContext.GetCustomMaterialSystem().RenderDepthPrepass(
                 m_ModelContext.m_ModelViewProjection, m_Material, m_Subset)) {
             SRenderableImage *displacementImage = NULL;
             for (SRenderableImage *theImage = m_FirstImage;
@@ -475,13 +475,13 @@ namespace render {
                                           const SCamera &inCamera,
                                           const NVRenderTexture2D * /*inDepthTexture*/)
     {
-        IUICRenderContext &uicContext(m_Generator.GetUICContext());
+        IQt3DSRenderContext &qt3dsContext(m_Generator.GetQt3DSContext());
         SPathRenderContext theRenderContext(
             inLights, inCamera, m_Path, m_ModelViewProjection, m_GlobalTransform, m_NormalMatrix,
-            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, uicContext.GetWireframeMode(),
+            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, qt3dsContext.GetWireframeMode(),
             inCameraVec, false, m_IsStroke);
 
-        uicContext.GetPathManager().RenderDepthPrepass(
+        qt3dsContext.GetPathManager().RenderDepthPrepass(
             theRenderContext, m_Generator.GetLayerGlobalRenderProperties(), TShaderFeatureSet());
     }
 
@@ -493,13 +493,13 @@ namespace render {
                                  ,
                                  TShaderFeatureSet inFeatureSet)
     {
-        IUICRenderContext &uicContext(m_Generator.GetUICContext());
+        IQt3DSRenderContext &qt3dsContext(m_Generator.GetQt3DSContext());
         SPathRenderContext theRenderContext(
             inLights, inCamera, m_Path, m_ModelViewProjection, m_GlobalTransform, m_NormalMatrix,
-            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, uicContext.GetWireframeMode(),
+            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, qt3dsContext.GetWireframeMode(),
             inCameraVec, m_RenderableFlags.HasTransparency(), m_IsStroke);
 
-        uicContext.GetPathManager().RenderPath(
+        qt3dsContext.GetPathManager().RenderPath(
             theRenderContext, m_Generator.GetLayerGlobalRenderProperties(), inFeatureSet);
     }
 
@@ -508,20 +508,20 @@ namespace render {
                                               SShadowMapEntry *inShadowMapEntry)
     {
         NVConstDataRef<SLight *> theLights;
-        IUICRenderContext &uicContext(m_Generator.GetUICContext());
+        IQt3DSRenderContext &qt3dsContext(m_Generator.GetQt3DSContext());
 
         QT3DSMat44 theModelViewProjection = inShadowMapEntry->m_LightVP * m_GlobalTransform;
         SPathRenderContext theRenderContext(
             theLights, inCamera, m_Path, theModelViewProjection, m_GlobalTransform, m_NormalMatrix,
-            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, uicContext.GetWireframeMode(),
+            m_Opacity, m_Material, m_ShaderDescription, m_FirstImage, qt3dsContext.GetWireframeMode(),
             inCameraVec, false, m_IsStroke);
 
         if (inLight->m_LightType != RenderLightTypes::Directional) {
-            uicContext.GetPathManager().RenderCubeFaceShadowPass(
+            qt3dsContext.GetPathManager().RenderCubeFaceShadowPass(
                 theRenderContext, m_Generator.GetLayerGlobalRenderProperties(),
                 TShaderFeatureSet());
         } else
-            uicContext.GetPathManager().RenderShadowMapPass(
+            qt3dsContext.GetPathManager().RenderShadowMapPass(
                 theRenderContext, m_Generator.GetLayerGlobalRenderProperties(),
                 TShaderFeatureSet());
     }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
index 527e030f..04c91b82 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
@@ -226,19 +226,19 @@ namespace render {
 
     typedef nvvector<SModelContext *> TModelContextPtrList;
 
-    class CUICRendererImpl;
+    class Qt3DSRendererImpl;
     struct SLayerRenderData;
     struct SShadowMapEntry;
 
     struct SSubsetRenderableBase : public SRenderableObject
     {
-        CUICRendererImpl &m_Generator;
+        Qt3DSRendererImpl &m_Generator;
         const SModelContext &m_ModelContext;
         SRenderSubset m_Subset;
         QT3DSF32 m_Opacity;
 
         SSubsetRenderableBase(SRenderableObjectFlags inFlags, QT3DSVec3 inWorldCenterPt,
-                              CUICRendererImpl &gen, const SRenderSubset &subset,
+                              Qt3DSRendererImpl &gen, const SRenderSubset &subset,
                               const SModelContext &modelContext, QT3DSF32 inOpacity)
 
             : SRenderableObject(inFlags, inWorldCenterPt, modelContext.m_Model.m_GlobalTransform,
@@ -269,7 +269,7 @@ namespace render {
         NVConstDataRef<QT3DSMat44> m_Bones;
 
         SSubsetRenderable(SRenderableObjectFlags inFlags, QT3DSVec3 inWorldCenterPt,
-                          CUICRendererImpl &gen, const SRenderSubset &subset,
+                          Qt3DSRendererImpl &gen, const SRenderSubset &subset,
                           const SDefaultMaterial &mat, const SModelContext &modelContext,
                           QT3DSF32 inOpacity, SRenderableImage *inFirstImage,
                           SShaderDefaultMaterialKey inShaderKey,
@@ -303,7 +303,7 @@ namespace render {
         SShaderDefaultMaterialKey m_ShaderDescription;
 
         SCustomMaterialRenderable(SRenderableObjectFlags inFlags, QT3DSVec3 inWorldCenterPt,
-                                  CUICRendererImpl &gen, const SRenderSubset &subset,
+                                  Qt3DSRendererImpl &gen, const SRenderSubset &subset,
                                   const SCustomMaterial &mat, const SModelContext &modelContext,
                                   QT3DSF32 inOpacity, SRenderableImage *inFirstImage,
                                   SShaderDefaultMaterialKey inShaderKey)
@@ -340,14 +340,14 @@ namespace render {
 
     struct STextRenderable : public SRenderableObject, public STextScaleAndOffset
     {
-        CUICRendererImpl &m_Generator;
+        Qt3DSRendererImpl &m_Generator;
         const SText &m_Text;
         NVRenderTexture2D &m_Texture;
         QT3DSMat44 m_ModelViewProjection;
         QT3DSMat44 m_ViewProjection;
 
         STextRenderable(SRenderableObjectFlags inFlags, QT3DSVec3 inWorldCenterPt,
-                        CUICRendererImpl &gen, const SText &inText, const NVBounds3 &inBounds,
+                        Qt3DSRendererImpl &gen, const SText &inText, const NVBounds3 &inBounds,
                         const QT3DSMat44 &inModelViewProjection, const QT3DSMat44 &inViewProjection,
                         NVRenderTexture2D &inTextTexture, const QT3DSVec2 &inTextOffset,
                         const QT3DSVec2 &inTextScale)
@@ -370,7 +370,7 @@ namespace render {
 
     struct SPathRenderable : public SRenderableObject
     {
-        CUICRendererImpl &m_Generator;
+        Qt3DSRendererImpl &m_Generator;
         SPath &m_Path;
         NVBounds3 m_Bounds;
         QT3DSMat44 m_ModelViewProjection;
@@ -382,7 +382,7 @@ namespace render {
         bool m_IsStroke;
 
         SPathRenderable(SRenderableObjectFlags inFlags, QT3DSVec3 inWorldCenterPt,
-                        CUICRendererImpl &gen, const QT3DSMat44 &inGlobalTransform,
+                        Qt3DSRendererImpl &gen, const QT3DSMat44 &inGlobalTransform,
                         NVBounds3 &inBounds, SPath &inPath, const QT3DSMat44 &inModelViewProjection,
                         const QT3DSMat33 inNormalMat, const SGraphObject &inMaterial, QT3DSF32 inOpacity,
                         SShaderDefaultMaterialKey inShaderKey, bool inIsStroke)
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
index 33d40f88..9347aa9d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
@@ -88,15 +88,15 @@ namespace render {
 
     SEndlType Endl;
 
-    CUICRendererImpl::CUICRendererImpl(IUICRenderContext &ctx)
-        : m_UICContext(ctx)
+    Qt3DSRendererImpl::Qt3DSRendererImpl(IQt3DSRenderContext &ctx)
+        : m_qt3dsContext(ctx)
         , m_Context(ctx.GetRenderContext())
         , m_BufferManager(ctx.GetBufferManager())
         , m_OffscreenRenderManager(ctx.GetOffscreenRenderManager())
         , m_StringTable(IStringTable::CreateStringTable(ctx.GetAllocator()))
-        , m_LayerShaders(ctx.GetAllocator(), "CUICRendererImpl::m_LayerShaders")
-        , m_Shaders(ctx.GetAllocator(), "CUICRendererImpl::m_Shaders")
-        , m_ConstantBuffers(ctx.GetAllocator(), "CUICRendererImpl::m_ConstantBuffers")
+        , m_LayerShaders(ctx.GetAllocator(), "Qt3DSRendererImpl::m_LayerShaders")
+        , m_Shaders(ctx.GetAllocator(), "Qt3DSRendererImpl::m_Shaders")
+        , m_ConstantBuffers(ctx.GetAllocator(), "Qt3DSRendererImpl::m_ConstantBuffers")
         , m_TextShader(ctx.GetAllocator())
         , m_TextPathShader(ctx.GetAllocator())
         , m_TextWidgetShader(ctx.GetAllocator())
@@ -105,22 +105,22 @@ namespace render {
         , m_LayerBlendTexture(ctx.GetResourceManager())
         , m_BlendFB(NULL)
 #endif
-        , m_LayerToRenderMap(ctx.GetAllocator(), "CUICRendererImpl::m_LayerToRenderMap")
-        , m_LastFrameLayers(ctx.GetAllocator(), "CUICRendererImpl::m_LastFrameLayers")
+        , m_LayerToRenderMap(ctx.GetAllocator(), "Qt3DSRendererImpl::m_LayerToRenderMap")
+        , m_LastFrameLayers(ctx.GetAllocator(), "Qt3DSRendererImpl::m_LastFrameLayers")
         , mRefCount(0)
-        , m_LastPickResults(ctx.GetAllocator(), "CUICRendererImpl::m_LastPickResults")
+        , m_LastPickResults(ctx.GetAllocator(), "Qt3DSRendererImpl::m_LastPickResults")
         , m_CurrentLayer(NULL)
-        , m_WidgetVertexBuffers(ctx.GetAllocator(), "CUICRendererImpl::m_WidgetVertexBuffers")
-        , m_WidgetIndexBuffers(ctx.GetAllocator(), "CUICRendererImpl::m_WidgetIndexBuffers")
-        , m_WidgetShaders(ctx.GetAllocator(), "CUICRendererImpl::m_WidgetShaders")
-        , m_WidgetInputAssembler(ctx.GetAllocator(), "CUICRendererImpl::m_WidgetInputAssembler")
-        , m_BoneIdNodeMap(ctx.GetAllocator(), "CUICRendererImpl::m_BoneIdNodeMap")
+        , m_WidgetVertexBuffers(ctx.GetAllocator(), "Qt3DSRendererImpl::m_WidgetVertexBuffers")
+        , m_WidgetIndexBuffers(ctx.GetAllocator(), "Qt3DSRendererImpl::m_WidgetIndexBuffers")
+        , m_WidgetShaders(ctx.GetAllocator(), "Qt3DSRendererImpl::m_WidgetShaders")
+        , m_WidgetInputAssembler(ctx.GetAllocator(), "Qt3DSRendererImpl::m_WidgetInputAssembler")
+        , m_BoneIdNodeMap(ctx.GetAllocator(), "Qt3DSRendererImpl::m_BoneIdNodeMap")
         , m_PickRenderPlugins(true)
         , m_LayerCachingEnabled(true)
         , m_LayerGPuProfilingEnabled(false)
     {
     }
-    CUICRendererImpl::~CUICRendererImpl()
+    Qt3DSRendererImpl::~Qt3DSRendererImpl()
     {
         m_LayerShaders.clear();
         for (TShaderMap::iterator iter = m_Shaders.begin(), end = m_Shaders.end(); iter != end;
@@ -132,11 +132,11 @@ namespace render {
         m_ConstantBuffers.clear();
     }
 
-    void CUICRendererImpl::addRef() { atomicIncrement(&mRefCount); }
+    void Qt3DSRendererImpl::addRef() { atomicIncrement(&mRefCount); }
 
-    void CUICRendererImpl::release() { QT3DS_IMPLEMENT_REF_COUNT_RELEASE(m_Context->GetAllocator()); }
+    void Qt3DSRendererImpl::release() { QT3DS_IMPLEMENT_REF_COUNT_RELEASE(m_Context->GetAllocator()); }
 
-    void CUICRendererImpl::ChildrenUpdated(SNode &inParent)
+    void Qt3DSRendererImpl::ChildrenUpdated(SNode &inParent)
     {
         if (inParent.m_Type == GraphObjectTypes::Layer) {
             TLayerRenderMap::iterator theIter =
@@ -149,7 +149,7 @@ namespace render {
             ChildrenUpdated(*inParent.m_Parent);
     }
 
-    QT3DSF32 CUICRendererImpl::GetTextScale(const SText &inText)
+    QT3DSF32 Qt3DSRendererImpl::GetTextScale(const SText &inText)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inText);
         if (theData)
@@ -181,12 +181,12 @@ namespace render {
         }
     }
 
-    bool CUICRendererImpl::PrepareLayerForRender(SLayer &inLayer,
+    bool Qt3DSRendererImpl::PrepareLayerForRender(SLayer &inLayer,
                                                  const QT3DSVec2 &inViewportDimensions,
                                                  bool inRenderSiblings)
     {
         (void)inViewportDimensions;
-        nvvector<SLayer *> renderableLayers(m_UICContext.GetPerFrameAllocator(), "LayerVector");
+        nvvector<SLayer *> renderableLayers(m_qt3dsContext.GetPerFrameAllocator(), "LayerVector");
         // Found by fair roll of the dice.
         renderableLayers.reserve(4);
 
@@ -212,17 +212,17 @@ namespace render {
         return retval;
     }
 
-    void CUICRendererImpl::RenderLayer(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
+    void Qt3DSRendererImpl::RenderLayer(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
                                        bool clear, QT3DSVec3 clearColor, bool inRenderSiblings)
     {
         (void)inViewportDimensions;
-        nvvector<SLayer *> renderableLayers(m_UICContext.GetPerFrameAllocator(), "LayerVector");
+        nvvector<SLayer *> renderableLayers(m_qt3dsContext.GetPerFrameAllocator(), "LayerVector");
         // Found by fair roll of the dice.
         renderableLayers.reserve(4);
 
         BuildRenderableLayers(inLayer, renderableLayers, inRenderSiblings);
 
-        NVRenderContext &theRenderContext(m_UICContext.GetRenderContext());
+        NVRenderContext &theRenderContext(m_qt3dsContext.GetRenderContext());
         qt3ds::render::NVRenderFrameBuffer *theFB = theRenderContext.GetRenderTarget();
         for (nvvector<SLayer *>::reverse_iterator iter = renderableLayers.rbegin(),
              end = renderableLayers.rend();
@@ -280,7 +280,7 @@ namespace render {
         }
     }
 
-    SLayer *CUICRendererImpl::GetLayerForNode(const SNode &inNode) const
+    SLayer *Qt3DSRendererImpl::GetLayerForNode(const SNode &inNode) const
     {
         if (inNode.m_Type == GraphObjectTypes::Layer) {
             return &const_cast<SLayer &>(static_cast<const SLayer &>(inNode));
@@ -290,7 +290,7 @@ namespace render {
         return NULL;
     }
 
-    SLayerRenderData *CUICRendererImpl::GetOrCreateLayerRenderDataForNode(const SNode &inNode)
+    SLayerRenderData *Qt3DSRendererImpl::GetOrCreateLayerRenderDataForNode(const SNode &inNode)
     {
         const SLayer *theLayer = GetLayerForNode(inNode);
         if (theLayer) {
@@ -311,16 +311,16 @@ namespace render {
         return NULL;
     }
 
-    SCamera *CUICRendererImpl::GetCameraForNode(const SNode &inNode) const
+    SCamera *Qt3DSRendererImpl::GetCameraForNode(const SNode &inNode) const
     {
         SLayerRenderData *theLayer =
-            const_cast<CUICRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
+            const_cast<Qt3DSRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
         if (theLayer)
             return theLayer->m_Camera;
         return NULL;
     }
 
-    Option<SCuboidRect> CUICRendererImpl::GetCameraBounds(const SGraphObject &inObject)
+    Option<SCuboidRect> Qt3DSRendererImpl::GetCameraBounds(const SGraphObject &inObject)
     {
         if (GraphObjectTypes::IsNodeType(inObject.m_Type)) {
             const SNode &theNode = static_cast<const SNode &>(inObject);
@@ -336,7 +336,7 @@ namespace render {
         return Option<SCuboidRect>();
     }
 
-    void CUICRendererImpl::DrawScreenRect(NVRenderRectF inRect, const QT3DSVec3 &inColor)
+    void Qt3DSRendererImpl::DrawScreenRect(NVRenderRectF inRect, const QT3DSVec3 &inColor)
     {
         SCamera theScreenCamera;
         theScreenCamera.MarkDirty(NodeTransformDirtyFlag::TransformIsDirty);
@@ -428,12 +428,12 @@ namespace render {
         m_Context->Draw(NVRenderDrawMode::Lines, m_RectIndexBuffer->GetNumIndices(), 0);
     }
 
-    void CUICRendererImpl::SetupWidgetLayer()
+    void Qt3DSRendererImpl::SetupWidgetLayer()
     {
-        NVRenderContext &theContext = m_UICContext.GetRenderContext();
+        NVRenderContext &theContext = m_qt3dsContext.GetRenderContext();
 
         if (!m_WidgetTexture) {
-            IResourceManager &theManager = m_UICContext.GetResourceManager();
+            IResourceManager &theManager = m_qt3dsContext.GetResourceManager();
             m_WidgetTexture = theManager.AllocateTexture2D(m_BeginFrameViewport.m_Width,
                                                            m_BeginFrameViewport.m_Height,
                                                            NVRenderTextureFormats::RGBA8);
@@ -456,14 +456,14 @@ namespace render {
             theContext.SetRenderTarget(m_WidgetFBO);
     }
 
-    void CUICRendererImpl::BeginFrame()
+    void Qt3DSRendererImpl::BeginFrame()
     {
         for (QT3DSU32 idx = 0, end = m_LastFrameLayers.size(); idx < end; ++idx)
             m_LastFrameLayers[idx]->ResetForFrame();
         m_LastFrameLayers.clear();
-        m_BeginFrameViewport = m_UICContext.GetRenderList().GetViewport();
+        m_BeginFrameViewport = m_qt3dsContext.GetRenderList().GetViewport();
     }
-    void CUICRendererImpl::EndFrame()
+    void Qt3DSRendererImpl::EndFrame()
     {
         if (m_WidgetTexture) {
             using qt3ds::render::NVRenderContextScopedProperty;
@@ -493,7 +493,7 @@ namespace render {
             theCamera.CalculateViewProjectionMatrix(theViewProj);
             RenderQuad(theTextureDims, theViewProj, *m_WidgetTexture);
 
-            IResourceManager &theManager(m_UICContext.GetResourceManager());
+            IResourceManager &theManager(m_qt3dsContext.GetResourceManager());
             theManager.Release(*m_WidgetFBO);
             theManager.Release(*m_WidgetTexture);
             m_WidgetTexture = NULL;
@@ -501,7 +501,7 @@ namespace render {
         }
     }
 
-    inline bool PickResultLessThan(const SUICRenderPickResult &lhs, const SUICRenderPickResult &rhs)
+    inline bool PickResultLessThan(const Qt3DSRenderPickResult &lhs, const Qt3DSRenderPickResult &rhs)
     {
         return FloatLessThan(lhs.m_CameraDistanceSq, rhs.m_CameraDistanceSq);
     }
@@ -549,7 +549,7 @@ namespace render {
 
     static eastl::pair<QT3DSVec2, QT3DSVec2>
     GetMouseCoordsAndViewportFromSubObject(QT3DSVec2 inLocalHitUVSpace,
-                                           SUICRenderPickSubResult &inSubResult)
+                                           Qt3DSRenderPickSubResult &inSubResult)
     {
         QT3DSMat44 theTextureMatrix(inSubResult.m_TextureMatrix);
         QT3DSVec3 theNewUVCoords(
@@ -564,7 +564,7 @@ namespace render {
         return eastl::make_pair(theMouseCoords, theViewportDimensions);
     }
 
-    SPickResultProcessResult CUICRendererImpl::ProcessPickResultList(bool inPickEverything)
+    SPickResultProcessResult Qt3DSRendererImpl::ProcessPickResultList(bool inPickEverything)
     {
         if (m_LastPickResults.empty())
             return SPickResultProcessResult();
@@ -580,11 +580,11 @@ namespace render {
         // onto the next object.
 
         QT3DSU32 maxPerFrameAllocationPickResultCount =
-            SFastAllocator<>::SlabSize / sizeof(SUICRenderPickResult);
+            SFastAllocator<>::SlabSize / sizeof(Qt3DSRenderPickResult);
         QT3DSU32 numToCopy =
             NVMin(maxPerFrameAllocationPickResultCount, (QT3DSU32)m_LastPickResults.size());
-        QT3DSU32 numCopyBytes = numToCopy * sizeof(SUICRenderPickResult);
-        SUICRenderPickResult *thePickResults = reinterpret_cast<SUICRenderPickResult *>(
+        QT3DSU32 numCopyBytes = numToCopy * sizeof(Qt3DSRenderPickResult);
+        Qt3DSRenderPickResult *thePickResults = reinterpret_cast<Qt3DSRenderPickResult *>(
             GetPerFrameAllocator().allocate(numCopyBytes, "tempPickData", __FILE__, __LINE__));
         memCopy(thePickResults, m_LastPickResults.data(), numCopyBytes);
         m_LastPickResults.clear();
@@ -608,7 +608,7 @@ namespace render {
                 QT3DSVec2 theViewportDimensions = mouseAndViewport.second;
                 IGraphObjectPickQuery *theQuery = theSubRenderer->GetGraphObjectPickQuery();
                 if (theQuery) {
-                    SUICRenderPickResult theInnerPickResult =
+                    Qt3DSRenderPickResult theInnerPickResult =
                         theQuery->Pick(theMouseCoords, theViewportDimensions, inPickEverything);
                     if (theInnerPickResult.m_HitObject) {
                         thePickResult = theInnerPickResult;
@@ -642,7 +642,7 @@ namespace render {
         return thePickResult;
     }
 
-    SUICRenderPickResult CUICRendererImpl::Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
+    Qt3DSRenderPickResult Qt3DSRendererImpl::Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
                                                 const QT3DSVec2 &inMouseCoords, bool inPickSiblings,
                                                 bool inPickEverything)
     {
@@ -674,7 +674,7 @@ namespace render {
                 theLayer = NULL;
         } while (theLayer != NULL);
 
-        return SUICRenderPickResult();
+        return Qt3DSRenderPickResult();
     }
 
     static inline Option<QT3DSVec2> IntersectRayWithNode(const SNode &inNode,
@@ -703,16 +703,16 @@ namespace render {
         return Empty();
     }
 
-    static inline SUICRenderPickSubResult ConstructSubResult(SImage &inImage)
+    static inline Qt3DSRenderPickSubResult ConstructSubResult(SImage &inImage)
     {
         STextureDetails theDetails = inImage.m_TextureData.m_Texture->GetTextureDetails();
-        return SUICRenderPickSubResult(*inImage.m_LastFrameOffscreenRenderer,
+        return Qt3DSRenderPickSubResult(*inImage.m_LastFrameOffscreenRenderer,
                                        inImage.m_TextureTransform, inImage.m_HorizontalTilingMode,
                                        inImage.m_VerticalTilingMode, theDetails.m_Width,
                                        theDetails.m_Height);
     }
 
-    Option<QT3DSVec2> CUICRendererImpl::FacePosition(SNode &inNode, NVBounds3 inBounds,
+    Option<QT3DSVec2> Qt3DSRendererImpl::FacePosition(SNode &inNode, NVBounds3 inBounds,
                                                   const QT3DSMat44 &inGlobalTransform,
                                                   const QT3DSVec2 &inViewportDimensions,
                                                   const QT3DSVec2 &inMouseCoords,
@@ -755,7 +755,7 @@ namespace render {
                     return Empty();
                 }
                 NVBounds3 theModelBounds = theParentModel->GetBounds(
-                    GetUICContext().GetBufferManager(), GetUICContext().GetPathManager(), false);
+                    GetQt3DSContext().GetBufferManager(), GetQt3DSContext().GetPathManager(), false);
 
                 if (theModelBounds.isEmpty()) {
                     QT3DS_ASSERT(false);
@@ -768,7 +768,7 @@ namespace render {
                 if (relativeHit.isEmpty()) {
                     return Empty();
                 }
-                SUICRenderPickSubResult theResult = ConstructSubResult(theImage);
+                Qt3DSRenderPickSubResult theResult = ConstructSubResult(theImage);
                 QT3DSVec2 hitInUVSpace = (*relativeHit) + QT3DSVec2(.5f, .5f);
                 eastl::pair<QT3DSVec2, QT3DSVec2> mouseAndViewport =
                     GetMouseCoordsAndViewportFromSubObject(hitInUVSpace, theResult);
@@ -788,8 +788,8 @@ namespace render {
         return newValue;
     }
 
-    SUICRenderPickResult
-    CUICRendererImpl::PickOffscreenLayer(SLayer &inLayer, const QT3DSVec2 & /*inViewportDimensions*/
+    Qt3DSRenderPickResult
+    Qt3DSRendererImpl::PickOffscreenLayer(SLayer &inLayer, const QT3DSVec2 & /*inViewportDimensions*/
                                          ,
                                          const QT3DSVec2 & /*inMouseCoords*/
                                          ,
@@ -809,20 +809,20 @@ namespace render {
                 // QT3DS_ASSERT( false );
             }
         }
-        return SUICRenderPickResult();
+        return Qt3DSRenderPickResult();
     }
 
-    QT3DSVec3 CUICRendererImpl::UnprojectToPosition(SNode &inNode, QT3DSVec3 &inPosition,
+    QT3DSVec3 Qt3DSRendererImpl::UnprojectToPosition(SNode &inNode, QT3DSVec3 &inPosition,
                                                  const QT3DSVec2 &inMouseVec) const
     {
         // Translate mouse into layer's coordinates
         SLayerRenderData *theData =
-            const_cast<CUICRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
+            const_cast<Qt3DSRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
         if (theData == NULL || theData->m_Camera == NULL) {
             return QT3DSVec3(0, 0, 0);
         } // QT3DS_ASSERT( false ); return QT3DSVec3(0,0,0); }
 
-        SWindowDimensions theWindow = m_UICContext.GetWindowDimensions();
+        SWindowDimensions theWindow = m_qt3dsContext.GetWindowDimensions();
         QT3DSVec2 theDims((QT3DSF32)theWindow.m_Width, (QT3DSF32)theWindow.m_Height);
 
         SLayerRenderPreparationResult &thePrepResult(*theData->m_LayerPrepResult);
@@ -831,12 +831,12 @@ namespace render {
         return theData->m_Camera->UnprojectToPosition(inPosition, theRay);
     }
 
-    QT3DSVec3 CUICRendererImpl::UnprojectWithDepth(SNode &inNode, QT3DSVec3 &,
+    QT3DSVec3 Qt3DSRendererImpl::UnprojectWithDepth(SNode &inNode, QT3DSVec3 &,
                                                 const QT3DSVec3 &inMouseVec) const
     {
         // Translate mouse into layer's coordinates
         SLayerRenderData *theData =
-            const_cast<CUICRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
+            const_cast<Qt3DSRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
         if (theData == NULL || theData->m_Camera == NULL) {
             return QT3DSVec3(0, 0, 0);
         } // QT3DS_ASSERT( false ); return QT3DSVec3(0,0,0); }
@@ -846,7 +846,7 @@ namespace render {
         NVReal theDepth = inMouseVec.z;
 
         SLayerRenderPreparationResult &thePrepResult(*theData->m_LayerPrepResult);
-        SWindowDimensions theWindow = m_UICContext.GetWindowDimensions();
+        SWindowDimensions theWindow = m_qt3dsContext.GetWindowDimensions();
         SRay theRay = thePrepResult.GetPickRay(
             theMouse, QT3DSVec2((QT3DSF32)theWindow.m_Width, (QT3DSF32)theWindow.m_Height), true);
         QT3DSVec3 theTargetPosition = theRay.m_Origin + theRay.m_Direction * theDepth;
@@ -860,11 +860,11 @@ namespace render {
         return theTargetPosition;
     }
 
-    QT3DSVec3 CUICRendererImpl::ProjectPosition(SNode &inNode, const QT3DSVec3 &inPosition) const
+    QT3DSVec3 Qt3DSRendererImpl::ProjectPosition(SNode &inNode, const QT3DSVec3 &inPosition) const
     {
         // Translate mouse into layer's coordinates
         SLayerRenderData *theData =
-            const_cast<CUICRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
+            const_cast<Qt3DSRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inNode);
         if (theData == NULL || theData->m_Camera == NULL) {
             return QT3DSVec3(0, 0, 0);
         }
@@ -891,13 +891,13 @@ namespace render {
         mouseVec.y += theViewport.m_Y;
 
         // Flip the y into window coordinates so it matches the mouse.
-        SWindowDimensions theWindow = m_UICContext.GetWindowDimensions();
+        SWindowDimensions theWindow = m_qt3dsContext.GetWindowDimensions();
         mouseVec.y = theWindow.m_Height - mouseVec.y;
 
         return mouseVec;
     }
 
-    Option<SLayerPickSetup> CUICRendererImpl::GetLayerPickSetup(SLayer &inLayer,
+    Option<SLayerPickSetup> Qt3DSRendererImpl::GetLayerPickSetup(SLayer &inLayer,
                                                                 const QT3DSVec2 &inMouseCoords,
                                                                 const SWindowDimensions &inPickDims)
     {
@@ -906,7 +906,7 @@ namespace render {
             QT3DS_ASSERT(false);
             return Empty();
         }
-        SWindowDimensions theWindow = m_UICContext.GetWindowDimensions();
+        SWindowDimensions theWindow = m_qt3dsContext.GetWindowDimensions();
         QT3DSVec2 theDims((QT3DSF32)theWindow.m_Width, (QT3DSF32)theWindow.m_Height);
         // The mouse is relative to the layer
         Option<QT3DSVec2> theLocalMouse = GetLayerMouseCoords(*theData, inMouseCoords, theDims, false);
@@ -953,7 +953,7 @@ namespace render {
                                             (QT3DSU32)layerToPresentation.m_Height));
     }
 
-    Option<NVRenderRectF> CUICRendererImpl::GetLayerRect(SLayer &inLayer)
+    Option<NVRenderRectF> Qt3DSRendererImpl::GetLayerRect(SLayer &inLayer)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inLayer);
         if (theData == NULL || theData->m_Camera == NULL) {
@@ -965,7 +965,7 @@ namespace render {
     }
 
     // This doesn't have to be cheap.
-    void CUICRendererImpl::RunLayerRender(SLayer &inLayer, const QT3DSMat44 &inViewProjection)
+    void Qt3DSRendererImpl::RunLayerRender(SLayer &inLayer, const QT3DSMat44 &inViewProjection)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inLayer);
         if (theData == NULL || theData->m_Camera == NULL) {
@@ -975,21 +975,21 @@ namespace render {
         theData->PrepareAndRender(inViewProjection);
     }
 
-    void CUICRendererImpl::AddRenderWidget(IRenderWidget &inWidget)
+    void Qt3DSRendererImpl::AddRenderWidget(IRenderWidget &inWidget)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inWidget.GetNode());
         if (theData)
             theData->AddRenderWidget(inWidget);
     }
 
-    void CUICRendererImpl::RenderLayerRect(SLayer &inLayer, const QT3DSVec3 &inColor)
+    void Qt3DSRendererImpl::RenderLayerRect(SLayer &inLayer, const QT3DSVec3 &inColor)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inLayer);
         if (theData)
             theData->m_BoundingRectColor = inColor;
     }
 
-    SScaleAndPosition CUICRendererImpl::GetWorldToPixelScaleFactor(const SCamera &inCamera,
+    SScaleAndPosition Qt3DSRendererImpl::GetWorldToPixelScaleFactor(const SCamera &inCamera,
                                                                    const QT3DSVec3 &inWorldPoint,
                                                                    SLayerRenderData &inRenderData)
     {
@@ -1020,7 +1020,7 @@ namespace render {
         }
     }
 
-    SScaleAndPosition CUICRendererImpl::GetWorldToPixelScaleFactor(SLayer &inLayer,
+    SScaleAndPosition Qt3DSRendererImpl::GetWorldToPixelScaleFactor(SLayer &inLayer,
                                                                    const QT3DSVec3 &inWorldPoint)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inLayer);
@@ -1031,7 +1031,7 @@ namespace render {
         return GetWorldToPixelScaleFactor(*theData->m_Camera, inWorldPoint, *theData);
     }
 
-    void CUICRendererImpl::ReleaseLayerRenderResources(SLayer &inLayer)
+    void Qt3DSRendererImpl::ReleaseLayerRenderResources(SLayer &inLayer)
     {
         TLayerRenderMap::iterator theIter = m_LayerToRenderMap.find(&inLayer);
         if (theIter != m_LayerToRenderMap.end()) {
@@ -1045,7 +1045,7 @@ namespace render {
         }
     }
 
-    void CUICRendererImpl::RenderQuad(const QT3DSVec2 inDimensions, const QT3DSMat44 &inMVP,
+    void Qt3DSRendererImpl::RenderQuad(const QT3DSVec2 inDimensions, const QT3DSMat44 &inMVP,
                                       NVRenderTexture2D &inQuadTexture)
     {
         m_Context->SetCullingEnabled(false);
@@ -1061,7 +1061,7 @@ namespace render {
         theContext.Draw(NVRenderDrawMode::Triangles, m_QuadIndexBuffer->GetNumIndices(), 0);
     }
 
-    void CUICRendererImpl::RenderQuad()
+    void Qt3DSRendererImpl::RenderQuad()
     {
         m_Context->SetCullingEnabled(false);
         GenerateXYQuad();
@@ -1069,7 +1069,7 @@ namespace render {
         m_Context->Draw(NVRenderDrawMode::Triangles, m_QuadIndexBuffer->GetNumIndices(), 0);
     }
 
-    void CUICRendererImpl::RenderPointsIndirect()
+    void Qt3DSRendererImpl::RenderPointsIndirect()
     {
         m_Context->SetCullingEnabled(false);
         GenerateXYZPoint();
@@ -1077,19 +1077,19 @@ namespace render {
         m_Context->DrawIndirect(NVRenderDrawMode::Points, 0);
     }
 
-    void CUICRendererImpl::LayerNeedsFrameClear(SLayerRenderData &inLayer)
+    void Qt3DSRendererImpl::LayerNeedsFrameClear(SLayerRenderData &inLayer)
     {
         m_LastFrameLayers.push_back(&inLayer);
     }
 
-    void CUICRendererImpl::BeginLayerDepthPassRender(SLayerRenderData &inLayer)
+    void Qt3DSRendererImpl::BeginLayerDepthPassRender(SLayerRenderData &inLayer)
     {
         m_CurrentLayer = &inLayer;
     }
 
-    void CUICRendererImpl::EndLayerDepthPassRender() { m_CurrentLayer = NULL; }
+    void Qt3DSRendererImpl::EndLayerDepthPassRender() { m_CurrentLayer = NULL; }
 
-    void CUICRendererImpl::BeginLayerRender(SLayerRenderData &inLayer)
+    void Qt3DSRendererImpl::BeginLayerRender(SLayerRenderData &inLayer)
     {
         m_CurrentLayer = &inLayer;
         // Remove all of the shaders from the layer shader set
@@ -1097,13 +1097,13 @@ namespace render {
         // shaders that are in the layer.
         m_LayerShaders.clear();
     }
-    void CUICRendererImpl::EndLayerRender() { m_CurrentLayer = NULL; }
+    void Qt3DSRendererImpl::EndLayerRender() { m_CurrentLayer = NULL; }
 
 // Allocate an object that lasts only this frame.
 #define RENDER_FRAME_NEW(type)                                                                     \
     new (m_PerFrameAllocator.m_FastAllocator.allocate(sizeof(type), __FILE__, __LINE__)) type
 
-    void CUICRendererImpl::PrepareImageForIbl(SImage &inImage)
+    void Qt3DSRendererImpl::PrepareImageForIbl(SImage &inImage)
     {
         if (inImage.m_TextureData.m_Texture && inImage.m_TextureData.m_Texture->GetNumMipmaps() < 1)
             inImage.m_TextureData.m_Texture->GenerateMipmaps();
@@ -1129,9 +1129,9 @@ namespace render {
             FillBoneIdNodeMap(*childChild, ioMap);
     }
 
-    bool CUICRendererImpl::PrepareTextureAtlasForRender()
+    bool Qt3DSRendererImpl::PrepareTextureAtlasForRender()
     {
-        ITextTextureAtlas *theTextureAtlas = m_UICContext.GetTextureAtlas();
+        ITextTextureAtlas *theTextureAtlas = m_qt3dsContext.GetTextureAtlas();
         if (theTextureAtlas == NULL)
             return false;
 
@@ -1146,7 +1146,7 @@ namespace render {
             NVRenderContextScopedProperty<NVRenderFrameBuffer *> __fbo(
                 *m_Context, &NVRenderContext::GetRenderTarget, &NVRenderContext::SetRenderTarget);
 
-            ITextRenderer &theTextRenderer(*m_UICContext.GetOnscreenTextRenderer());
+            ITextRenderer &theTextRenderer(*m_qt3dsContext.GetOnscreenTextRenderer());
             TTextTextureAtlasDetailsAndTexture theResult = theTextureAtlas->PrepareTextureAtlas();
             if (!theResult.first.m_EntryCount) {
                 QT3DS_ASSERT(theResult.first.m_EntryCount);
@@ -1167,17 +1167,17 @@ namespace render {
             mAttribLayout = m_Context->CreateAttributeLayout(toConstDataRef(theEntries, 2));
 
             NVRenderFrameBuffer *theAtlasFB(
-                m_UICContext.GetResourceManager().AllocateFrameBuffer());
+                m_qt3dsContext.GetResourceManager().AllocateFrameBuffer());
             theAtlasFB->Attach(NVRenderFrameBufferAttachments::Color0, *theResult.second);
-            m_UICContext.GetRenderContext().SetRenderTarget(theAtlasFB);
+            m_qt3dsContext.GetRenderContext().SetRenderTarget(theAtlasFB);
 
             // this texture contains our single entries
             NVRenderTexture2D *theTexture = nullptr;
             if (m_Context->GetRenderContextType() == NVRenderContextValues::GLES2) {
-                theTexture = m_UICContext.GetResourceManager()
+                theTexture = m_qt3dsContext.GetResourceManager()
                         .AllocateTexture2D(32, 32, NVRenderTextureFormats::RGBA8);
             } else {
-                theTexture = m_UICContext.GetResourceManager()
+                theTexture = m_qt3dsContext.GetResourceManager()
                         .AllocateTexture2D(32, 32, NVRenderTextureFormats::Alpha8);
             }
             m_Context->SetClearColor(QT3DSVec4(0, 0, 0, 0));
@@ -1255,8 +1255,8 @@ namespace render {
                 }
             }
 
-            m_UICContext.GetResourceManager().Release(*theTexture);
-            m_UICContext.GetResourceManager().Release(*theAtlasFB);
+            m_qt3dsContext.GetResourceManager().Release(*theTexture);
+            m_qt3dsContext.GetResourceManager().Release(*theAtlasFB);
 
             return true;
         }
@@ -1264,7 +1264,7 @@ namespace render {
         return theTextureAtlas->IsInitialized();
     }
 
-    Option<QT3DSVec2> CUICRendererImpl::GetLayerMouseCoords(SLayerRenderData &inLayerRenderData,
+    Option<QT3DSVec2> Qt3DSRendererImpl::GetLayerMouseCoords(SLayerRenderData &inLayerRenderData,
                                                          const QT3DSVec2 &inMouseCoords,
                                                          const QT3DSVec2 &inViewportDimensions,
                                                          bool forceImageIntersect) const
@@ -1275,7 +1275,7 @@ namespace render {
         return Empty();
     }
 
-    void CUICRendererImpl::GetLayerHitObjectList(SLayerRenderData &inLayerRenderData,
+    void Qt3DSRendererImpl::GetLayerHitObjectList(SLayerRenderData &inLayerRenderData,
                                                  const QT3DSVec2 &inViewportDimensions,
                                                  const QT3DSVec2 &inPresCoords, bool inPickEverything,
                                                  TPickResultArray &outIntersectionResult,
@@ -1319,7 +1319,7 @@ namespace render {
                 IGraphObjectPickQuery *theQuery =
                     inLayerRenderData.m_LastFrameOffscreenRenderer->GetGraphObjectPickQuery();
                 if (theQuery) {
-                    SUICRenderPickResult theResult =
+                    Qt3DSRenderPickResult theResult =
                         theQuery->Pick(inPresCoords, inViewportDimensions, inPickEverything);
                     if (theResult.m_HitObject) {
                         theResult.m_OffscreenRenderer =
@@ -1333,12 +1333,12 @@ namespace render {
         }
     }
 
-    static inline SUICRenderPickSubResult ConstructSubResult(SRenderableImage &inImage)
+    static inline Qt3DSRenderPickSubResult ConstructSubResult(SRenderableImage &inImage)
     {
         return ConstructSubResult(inImage.m_Image);
     }
 
-    void CUICRendererImpl::IntersectRayWithSubsetRenderable(
+    void Qt3DSRendererImpl::IntersectRayWithSubsetRenderable(
         const SRay &inRay, SRenderableObject &inRenderableObject,
         TPickResultArray &outIntersectionResultList, NVAllocatorCallback &inTempAllocator)
     {
@@ -1362,24 +1362,24 @@ namespace render {
             thePickObject = &static_cast<SPathRenderable *>(&inRenderableObject)->m_Path;
 
         if (thePickObject != NULL) {
-            outIntersectionResultList.push_back(SUICRenderPickResult(
+            outIntersectionResultList.push_back(Qt3DSRenderPickResult(
                 *thePickObject, theResult.m_RayLengthSquared, theResult.m_RelXY));
 
             // For subsets, we know we can find images on them which may have been the result
             // of rendering a sub-presentation.
             if (inRenderableObject.m_RenderableFlags.IsDefaultMaterialMeshSubset()) {
-                SUICRenderPickSubResult *theLastResult = NULL;
+                Qt3DSRenderPickSubResult *theLastResult = NULL;
                 for (SRenderableImage *theImage =
                          static_cast<SSubsetRenderable *>(&inRenderableObject)->m_FirstImage;
                      theImage != NULL; theImage = theImage->m_NextImage) {
                     if (theImage->m_Image.m_LastFrameOffscreenRenderer != NULL
                         && theImage->m_Image.m_TextureData.m_Texture != NULL) {
-                        SUICRenderPickSubResult *theSubResult =
-                            (SUICRenderPickSubResult *)inTempAllocator.allocate(
-                                sizeof(SUICRenderPickSubResult), "SUICRenderPickSubResult",
+                        Qt3DSRenderPickSubResult *theSubResult =
+                            (Qt3DSRenderPickSubResult *)inTempAllocator.allocate(
+                                sizeof(Qt3DSRenderPickSubResult), "Qt3DSRenderPickSubResult",
                                 __FILE__, __LINE__);
 
-                        new (theSubResult) SUICRenderPickSubResult(ConstructSubResult(*theImage));
+                        new (theSubResult) Qt3DSRenderPickSubResult(ConstructSubResult(*theImage));
                         if (theLastResult == NULL)
                             outIntersectionResultList.back().m_FirstSubObject = theSubResult;
                         else
@@ -1395,7 +1395,7 @@ namespace render {
 #define _snprintf snprintf
 #endif
 
-    NVRenderShaderProgram *CUICRendererImpl::CompileShader(CRegisteredString inName,
+    NVRenderShaderProgram *Qt3DSRendererImpl::CompileShader(CRegisteredString inName,
                                                            const char8_t *inVert,
                                                            const char8_t *inFrag)
     {
@@ -1427,7 +1427,7 @@ namespace render {
         return attenuation * 0.0000001f;
     }
 
-    SShaderGeneratorGeneratedShader *CUICRendererImpl::GetShader(SSubsetRenderable &inRenderable,
+    SShaderGeneratorGeneratedShader *Qt3DSRendererImpl::GetShader(SSubsetRenderable &inRenderable,
                                                                  TShaderFeatureSet inFeatureSet)
     {
         if (m_CurrentLayer == NULL) {
@@ -1476,7 +1476,7 @@ namespace render {
     static QT3DSVec2 g_fullScreenRectUVs[] = { QT3DSVec2(0, 0), QT3DSVec2(0, 1), QT3DSVec2(1, 1),
                                             QT3DSVec2(1, 0) };
 
-    void CUICRendererImpl::GenerateXYQuad()
+    void Qt3DSRendererImpl::GenerateXYQuad()
     {
         if (m_QuadInputAssembler)
             return;
@@ -1521,7 +1521,7 @@ namespace render {
             toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
     }
 
-    void CUICRendererImpl::GenerateXYZPoint()
+    void Qt3DSRendererImpl::GenerateXYZPoint()
     {
         if (m_PointInputAssembler)
             return;
@@ -1552,7 +1552,7 @@ namespace render {
             toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
     }
 
-    eastl::pair<NVRenderVertexBuffer *, NVRenderIndexBuffer *> CUICRendererImpl::GetXYQuad()
+    eastl::pair<NVRenderVertexBuffer *, NVRenderIndexBuffer *> Qt3DSRendererImpl::GetXYQuad()
     {
         if (!m_QuadInputAssembler)
             GenerateXYQuad();
@@ -1560,7 +1560,7 @@ namespace render {
         return eastl::make_pair(m_QuadVertexBuffer.mPtr, m_QuadIndexBuffer.mPtr);
     }
 
-    SLayerGlobalRenderProperties CUICRendererImpl::GetLayerGlobalRenderProperties()
+    SLayerGlobalRenderProperties Qt3DSRendererImpl::GetLayerGlobalRenderProperties()
     {
         SLayerRenderData &theData = *m_CurrentLayer;
         SLayer &theLayer = theData.m_Layer;
@@ -1575,7 +1575,7 @@ namespace render {
             theLayer.m_Probe2Pos, theLayer.m_Probe2Fade, theLayer.m_ProbeFov);
     }
 
-    void CUICRendererImpl::GenerateXYQuadStrip()
+    void Qt3DSRendererImpl::GenerateXYQuadStrip()
     {
         if (m_QuadStripInputAssembler)
             return;
@@ -1605,7 +1605,7 @@ namespace render {
             toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
     }
 
-    void CUICRendererImpl::UpdateCbAoShadow(const SLayer *pLayer, const SCamera *pCamera,
+    void Qt3DSRendererImpl::UpdateCbAoShadow(const SLayer *pLayer, const SCamera *pCamera,
                                             CResourceTexture2D &inDepthTexture)
     {
         if (m_Context->GetConstantBufferSupport()) {
@@ -1669,7 +1669,7 @@ namespace render {
 
     // widget context implementation
 
-    NVRenderVertexBuffer &CUICRendererImpl::GetOrCreateVertexBuffer(CRegisteredString &inStr,
+    NVRenderVertexBuffer &Qt3DSRendererImpl::GetOrCreateVertexBuffer(CRegisteredString &inStr,
                                                                     QT3DSU32 stride,
                                                                     NVConstDataRef<QT3DSU8> bufferData)
     {
@@ -1685,7 +1685,7 @@ namespace render {
         return *retval;
     }
     NVRenderIndexBuffer &
-    CUICRendererImpl::GetOrCreateIndexBuffer(CRegisteredString &inStr,
+    Qt3DSRendererImpl::GetOrCreateIndexBuffer(CRegisteredString &inStr,
                                              qt3ds::render::NVRenderComponentTypes::Enum componentType,
                                              size_t size, NVConstDataRef<QT3DSU8> bufferData)
     {
@@ -1702,7 +1702,7 @@ namespace render {
         return *retval;
     }
 
-    NVRenderAttribLayout &CUICRendererImpl::CreateAttributeLayout(
+    NVRenderAttribLayout &Qt3DSRendererImpl::CreateAttributeLayout(
         NVConstDataRef<qt3ds::render::NVRenderVertexBufferEntry> attribs)
     {
         // create our attribute layout
@@ -1710,7 +1710,7 @@ namespace render {
         return *theAttribLAyout;
     }
 
-    NVRenderInputAssembler &CUICRendererImpl::GetOrCreateInputAssembler(
+    NVRenderInputAssembler &Qt3DSRendererImpl::GetOrCreateInputAssembler(
         CRegisteredString &inStr, NVRenderAttribLayout *attribLayout,
         NVConstDataRef<NVRenderVertexBuffer *> buffers, const NVRenderIndexBuffer *indexBuffer,
         NVConstDataRef<QT3DSU32> strides, NVConstDataRef<QT3DSU32> offsets)
@@ -1725,7 +1725,7 @@ namespace render {
         return *retval;
     }
 
-    NVRenderVertexBuffer *CUICRendererImpl::GetVertexBuffer(CRegisteredString &inStr)
+    NVRenderVertexBuffer *Qt3DSRendererImpl::GetVertexBuffer(CRegisteredString &inStr)
     {
         TStrVertBufMap::iterator theIter = m_WidgetVertexBuffers.find(inStr);
         if (theIter != m_WidgetVertexBuffers.end())
@@ -1733,7 +1733,7 @@ namespace render {
         return NULL;
     }
 
-    NVRenderIndexBuffer *CUICRendererImpl::GetIndexBuffer(CRegisteredString &inStr)
+    NVRenderIndexBuffer *Qt3DSRendererImpl::GetIndexBuffer(CRegisteredString &inStr)
     {
         TStrIndexBufMap::iterator theIter = m_WidgetIndexBuffers.find(inStr);
         if (theIter != m_WidgetIndexBuffers.end())
@@ -1741,7 +1741,7 @@ namespace render {
         return NULL;
     }
 
-    NVRenderInputAssembler *CUICRendererImpl::GetInputAssembler(CRegisteredString &inStr)
+    NVRenderInputAssembler *Qt3DSRendererImpl::GetInputAssembler(CRegisteredString &inStr)
     {
         TStrIAMap::iterator theIter = m_WidgetInputAssembler.find(inStr);
         if (theIter != m_WidgetInputAssembler.end())
@@ -1749,7 +1749,7 @@ namespace render {
         return NULL;
     }
 
-    NVRenderShaderProgram *CUICRendererImpl::GetShader(CRegisteredString inStr)
+    NVRenderShaderProgram *Qt3DSRendererImpl::GetShader(CRegisteredString inStr)
     {
         TStrShaderMap::iterator theIter = m_WidgetShaders.find(inStr);
         if (theIter != m_WidgetShaders.end())
@@ -1757,7 +1757,7 @@ namespace render {
         return NULL;
     }
 
-    NVRenderShaderProgram *CUICRendererImpl::CompileAndStoreShader(CRegisteredString inStr)
+    NVRenderShaderProgram *Qt3DSRendererImpl::CompileAndStoreShader(CRegisteredString inStr)
     {
         NVRenderShaderProgram *newProgram = GetProgramGenerator().CompileGeneratedShader(inStr);
         if (newProgram)
@@ -1765,30 +1765,30 @@ namespace render {
         return newProgram;
     }
 
-    IShaderProgramGenerator &CUICRendererImpl::GetProgramGenerator()
+    IShaderProgramGenerator &Qt3DSRendererImpl::GetProgramGenerator()
     {
-        return m_UICContext.GetShaderProgramGenerator();
+        return m_qt3dsContext.GetShaderProgramGenerator();
     }
 
-    STextDimensions CUICRendererImpl::MeasureText(const STextRenderInfo &inText)
+    STextDimensions Qt3DSRendererImpl::MeasureText(const STextRenderInfo &inText)
     {
-        if (m_UICContext.GetTextRenderer() != NULL)
-            return m_UICContext.GetTextRenderer()->MeasureText(inText, 0);
+        if (m_qt3dsContext.GetTextRenderer() != NULL)
+            return m_qt3dsContext.GetTextRenderer()->MeasureText(inText, 0);
         return STextDimensions();
     }
 
-    void CUICRendererImpl::RenderText(const STextRenderInfo &inText, const QT3DSVec3 &inTextColor,
+    void Qt3DSRendererImpl::RenderText(const STextRenderInfo &inText, const QT3DSVec3 &inTextColor,
                                       const QT3DSVec3 &inBackgroundColor, const QT3DSMat44 &inMVP)
     {
-        if (m_UICContext.GetTextRenderer() != NULL) {
-            ITextRenderer &theTextRenderer(*m_UICContext.GetTextRenderer());
-            NVRenderTexture2D *theTexture = m_UICContext.GetResourceManager().AllocateTexture2D(
+        if (m_qt3dsContext.GetTextRenderer() != NULL) {
+            ITextRenderer &theTextRenderer(*m_qt3dsContext.GetTextRenderer());
+            NVRenderTexture2D *theTexture = m_qt3dsContext.GetResourceManager().AllocateTexture2D(
                 32, 32, NVRenderTextureFormats::RGBA8);
             STextTextureDetails theTextTextureDetails =
                 theTextRenderer.RenderText(inText, *theTexture);
             STextRenderHelper theTextHelper(GetTextWidgetShader());
             if (theTextHelper.m_Shader != NULL) {
-                m_UICContext.GetRenderContext().SetBlendingEnabled(false);
+                m_qt3dsContext.GetRenderContext().SetBlendingEnabled(false);
                 STextScaleAndOffset theScaleAndOffset(*theTexture, theTextTextureDetails, inText);
                 theTextHelper.m_Shader->Render(*theTexture, theScaleAndOffset,
                                                QT3DSVec4(inTextColor, 1.0f), inMVP, QT3DSVec2(0, 0),
@@ -1796,21 +1796,21 @@ namespace render {
                                                theTextHelper.m_QuadInputAssembler.GetIndexCount(),
                                                theTextTextureDetails, inBackgroundColor);
             }
-            m_UICContext.GetResourceManager().Release(*theTexture);
+            m_qt3dsContext.GetResourceManager().Release(*theTexture);
         }
     }
 
-    void CUICRendererImpl::RenderText2D(QT3DSF32 x, QT3DSF32 y,
+    void Qt3DSRendererImpl::RenderText2D(QT3DSF32 x, QT3DSF32 y,
                                         qt3ds::foundation::Option<qt3ds::QT3DSVec3> inColor,
                                         const char *text)
     {
-        if (m_UICContext.GetOnscreenTextRenderer() != NULL) {
+        if (m_qt3dsContext.GetOnscreenTextRenderer() != NULL) {
             GenerateXYQuadStrip();
 
             if (PrepareTextureAtlasForRender()) {
                 TTextRenderAtlasDetailsAndTexture theRenderTextDetails;
-                ITextTextureAtlas *theTextureAtlas = m_UICContext.GetTextureAtlas();
-                SWindowDimensions theWindow = m_UICContext.GetWindowDimensions();
+                ITextTextureAtlas *theTextureAtlas = m_qt3dsContext.GetTextureAtlas();
+                SWindowDimensions theWindow = m_qt3dsContext.GetWindowDimensions();
 
                 const wchar_t *wText = m_StringTable->GetWideStr(text);
                 STextRenderInfo theInfo;
@@ -1859,7 +1859,7 @@ namespace render {
         }
     }
 
-    void CUICRendererImpl::RenderGpuProfilerStats(QT3DSF32 x, QT3DSF32 y,
+    void Qt3DSRendererImpl::RenderGpuProfilerStats(QT3DSF32 x, QT3DSF32 y,
                                                   qt3ds::foundation::Option<qt3ds::QT3DSVec3> inColor)
     {
         if (!IsLayerGpuProfilingEnabled())
@@ -1899,7 +1899,7 @@ namespace render {
     // a new position and a floating point scale factor so you can render in 1/2 perspective mode
     // or orthographic mode if you would like to.
     SWidgetRenderInformation
-    CUICRendererImpl::GetWidgetRenderInformation(SNode &inNode, const QT3DSVec3 &inPos,
+    Qt3DSRendererImpl::GetWidgetRenderInformation(SNode &inNode, const QT3DSVec3 &inPos,
                                                  RenderWidgetModes::Enum inWidgetMode)
     {
         SLayerRenderData *theData = GetOrCreateLayerRenderDataForNode(inNode);
@@ -1964,18 +1964,18 @@ namespace render {
             theScaleAndPos.m_Scale, *theCamera);
     }
 
-    Option<QT3DSVec2> CUICRendererImpl::GetLayerMouseCoords(SLayer &inLayer,
+    Option<QT3DSVec2> Qt3DSRendererImpl::GetLayerMouseCoords(SLayer &inLayer,
                                                          const QT3DSVec2 &inMouseCoords,
                                                          const QT3DSVec2 &inViewportDimensions,
                                                          bool forceImageIntersect) const
     {
         SLayerRenderData *theData =
-            const_cast<CUICRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inLayer);
+            const_cast<Qt3DSRendererImpl &>(*this).GetOrCreateLayerRenderDataForNode(inLayer);
         return GetLayerMouseCoords(*theData, inMouseCoords, inViewportDimensions,
                                    forceImageIntersect);
     }
 
-    bool IUICRenderer::IsGlEsContext(qt3ds::render::NVRenderContextType inContextType)
+    bool IQt3DSRenderer::IsGlEsContext(qt3ds::render::NVRenderContextType inContextType)
     {
         qt3ds::render::NVRenderContextType esContextTypes(NVRenderContextValues::GLES2
                                                        | NVRenderContextValues::GLES3
@@ -1987,7 +1987,7 @@ namespace render {
         return false;
     }
 
-    bool IUICRenderer::IsGlEs3Context(qt3ds::render::NVRenderContextType inContextType)
+    bool IQt3DSRenderer::IsGlEs3Context(qt3ds::render::NVRenderContextType inContextType)
     {
         if (inContextType == NVRenderContextValues::GLES3
             || inContextType == NVRenderContextValues::GLES3PLUS)
@@ -1996,7 +1996,7 @@ namespace render {
         return false;
     }
 
-    bool IUICRenderer::IsGl2Context(qt3ds::render::NVRenderContextType inContextType)
+    bool IQt3DSRenderer::IsGl2Context(qt3ds::render::NVRenderContextType inContextType)
     {
         if (inContextType == NVRenderContextValues::GL2)
             return true;
@@ -2004,9 +2004,9 @@ namespace render {
         return false;
     }
 
-    IUICRenderer &IUICRenderer::CreateRenderer(IUICRenderContext &inContext)
+    IQt3DSRenderer &IQt3DSRenderer::CreateRenderer(IQt3DSRenderContext &inContext)
     {
-        return *QT3DS_NEW(inContext.GetAllocator(), CUICRendererImpl)(inContext);
+        return *QT3DS_NEW(inContext.GetAllocator(), Qt3DSRendererImpl)(inContext);
     }
 }
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
index d05d940d..88d62709 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
@@ -111,10 +111,10 @@ namespace render {
         }
     };
 
-    struct SPickResultProcessResult : public SUICRenderPickResult
+    struct SPickResultProcessResult : public Qt3DSRenderPickResult
     {
-        SPickResultProcessResult(const SUICRenderPickResult &inSrc)
-            : SUICRenderPickResult(inSrc)
+        SPickResultProcessResult(const Qt3DSRenderPickResult &inSrc)
+            : Qt3DSRenderPickResult(inSrc)
             , m_WasPickConsumed(false)
         {
         }
@@ -150,14 +150,14 @@ namespace render {
         operator STextShader *() { return m_Shader; }
     };
 
-    class CUICRendererImpl : public IUICRenderer, public IRenderWidgetContext
+    class Qt3DSRendererImpl : public IQt3DSRenderer, public IRenderWidgetContext
     {
         typedef nvhash_map<SShaderDefaultMaterialKey, SShaderGeneratorGeneratedShader *> TShaderMap;
         typedef nvhash_map<CRegisteredString, NVScopedRefCounted<NVRenderConstantBuffer>>
             TStrConstanBufMap;
         typedef nvhash_map<const SLayer *, NVScopedRefCounted<SLayerRenderData>> TLayerRenderMap;
         typedef nvvector<SLayerRenderData *> TLayerRenderList;
-        typedef nvvector<SUICRenderPickResult> TPickResultArray;
+        typedef nvvector<Qt3DSRenderPickResult> TPickResultArray;
 
         // Items to implement the widget context.
         typedef nvhash_map<CRegisteredString, NVScopedRefCounted<NVRenderVertexBuffer>>
@@ -170,7 +170,7 @@ namespace render {
 
         typedef nvhash_map<long, SNode *> TBoneIdNodeMap;
 
-        IUICRenderContext &m_UICContext;
+        IQt3DSRenderContext &m_qt3dsContext;
         NVScopedRefCounted<NVRenderContext> m_Context;
         NVScopedRefCounted<IBufferManager> m_BufferManager;
         NVScopedRefCounted<IOffscreenRenderManager> m_OffscreenRenderManager;
@@ -292,8 +292,8 @@ namespace render {
         SShaderDefaultMaterialKeyProperties m_DefaultMaterialShaderKeyProperties;
 
     public:
-        CUICRendererImpl(IUICRenderContext &ctx);
-        virtual ~CUICRendererImpl();
+        Qt3DSRendererImpl(IQt3DSRenderContext &ctx);
+        virtual ~Qt3DSRendererImpl();
         SShaderDefaultMaterialKeyProperties &DefaultMaterialShaderKeyProperties()
         {
             return m_DefaultMaterialShaderKeyProperties;
@@ -330,7 +330,7 @@ namespace render {
         void EndFrame() override;
 
         void PickRenderPlugins(bool inPick) override { m_PickRenderPlugins = inPick; }
-        SUICRenderPickResult Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
+        Qt3DSRenderPickResult Pick(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions,
                                           const QT3DSVec2 &inMouseCoords, bool inPickSiblings,
                                           bool inPickEverything) override;
 
@@ -339,7 +339,7 @@ namespace render {
                      const QT3DSVec2 &inViewportDimensions, const QT3DSVec2 &inMouseCoords,
                      NVDataRef<SGraphObject *> inMapperObjects, SBasisPlanes::Enum inPlane) override;
 
-        virtual SUICRenderPickResult PickOffscreenLayer(SLayer &inLayer,
+        virtual Qt3DSRenderPickResult PickOffscreenLayer(SLayer &inLayer,
                                                         const QT3DSVec2 &inViewportDimensions,
                                                         const QT3DSVec2 &inMouseCoords,
                                                         bool inPickEverything);
@@ -361,7 +361,7 @@ namespace render {
         // Note that this allocator is completely reset on BeginFrame.
         NVAllocatorCallback &GetPerFrameAllocator() override
         {
-            return m_UICContext.GetPerFrameAllocator();
+            return m_qt3dsContext.GetPerFrameAllocator();
         }
         void RenderLayerRect(SLayer &inLayer, const QT3DSVec3 &inColor) override;
         void AddRenderWidget(IRenderWidget &inWidget) override;
@@ -462,7 +462,7 @@ namespace render {
 
         NVRenderContext &GetContext() { return *m_Context; }
 
-        IUICRenderContext &GetUICContext() { return m_UICContext; }
+        IQt3DSRenderContext &GetQt3DSContext() { return m_qt3dsContext; }
 
         void DrawScreenRect(NVRenderRectF inRect, const QT3DSVec3 &inColor);
         // Binds an offscreen texture.  Widgets are rendered last.
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
index c0a78a09..3da31ace 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
@@ -64,7 +64,7 @@
 #endif
 
 #define QT3DS_CACHED_POST_EFFECT
-const float UIC3D_DEGREES_TO_RADIANS = 0.0174532925199f;
+const float QT3DS_DEGREES_TO_RADIANS = 0.0174532925199f;
 
 namespace qt3ds {
 namespace render {
@@ -73,17 +73,17 @@ namespace render {
     using qt3ds::render::NVRenderContextScopedProperty;
     using qt3ds::QT3DSVec2;
 
-    SLayerRenderData::SLayerRenderData(SLayer &inLayer, CUICRendererImpl &inRenderer)
+    SLayerRenderData::SLayerRenderData(SLayer &inLayer, Qt3DSRendererImpl &inRenderer)
         : SLayerRenderPreparationData(inLayer, inRenderer)
-        , m_LayerTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_TemporalAATexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerDepthTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerPrepassDepthTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerWidgetTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerSsaoTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerMultisampleTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerMultisamplePrepassDepthTexture(inRenderer.GetUICContext().GetResourceManager())
-        , m_LayerMultisampleWidgetTexture(inRenderer.GetUICContext().GetResourceManager())
+        , m_LayerTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_TemporalAATexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerDepthTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerPrepassDepthTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerWidgetTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerSsaoTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerMultisampleTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerMultisamplePrepassDepthTexture(inRenderer.GetQt3DSContext().GetResourceManager())
+        , m_LayerMultisampleWidgetTexture(inRenderer.GetQt3DSContext().GetResourceManager())
         , m_LayerCachedTexture(NULL)
         , m_AdvancedBlendDrawTexture(NULL)
         , m_AdvancedBlendBlendTexture(NULL)
@@ -100,7 +100,7 @@ namespace render {
 
     SLayerRenderData::~SLayerRenderData()
     {
-        IResourceManager &theResourceManager(m_Renderer.GetUICContext().GetResourceManager());
+        IResourceManager &theResourceManager(m_Renderer.GetQt3DSContext().GetResourceManager());
         if (m_LayerCachedTexture && m_LayerCachedTexture != m_LayerTexture)
             theResourceManager.Release(*m_LayerCachedTexture);
         if (m_AdvancedModeDrawFB) {
@@ -120,7 +120,7 @@ namespace render {
     {
         SLayerRenderPreparationData::PrepareForRender(inViewportDimensions);
         SLayerRenderPreparationResult &thePrepResult(*m_LayerPrepResult);
-        IResourceManager &theResourceManager(m_Renderer.GetUICContext().GetResourceManager());
+        IResourceManager &theResourceManager(m_Renderer.GetQt3DSContext().GetResourceManager());
         // at that time all values shoud be updated
         m_Renderer.UpdateCbAoShadow(&m_Layer, m_Camera, m_LayerDepthTexture);
 
@@ -176,7 +176,7 @@ namespace render {
             theResourceManager.DestroyFreeSizedResources();
 
             // Effect system uses different resource manager, so clean that up too
-            m_Renderer.GetUICContext().GetEffectSystem().GetResourceManager()
+            m_Renderer.GetQt3DSContext().GetEffectSystem().GetResourceManager()
                     .DestroyFreeSizedResources();
         }
     }
@@ -359,7 +359,7 @@ namespace render {
                 inLightPos.z = -inLightPos.z;
 
             inLightPos -= inLightDir * inCamera.m_ClipNear;
-            theCamera.m_FOV = inLight->m_ShadowMapFov * UIC3D_DEGREES_TO_RADIANS;
+            theCamera.m_FOV = inLight->m_ShadowMapFov * QT3DS_DEGREES_TO_RADIANS;
 
             if (inLight->m_LightType == RenderLightTypes::Directional) {
                 QT3DSVec3 frustBounds[8], boundCtr;
@@ -429,7 +429,7 @@ namespace render {
             inCameras[i].m_Pivot = inLight->m_Pivot;
             inCameras[i].m_ClipNear = 1.0f;
             inCameras[i].m_ClipFar = NVMax<QT3DSF32>(2.0f, inLight->m_ShadowMapFar);
-            inCameras[i].m_FOV = inLight->m_ShadowMapFov * UIC3D_DEGREES_TO_RADIANS;
+            inCameras[i].m_FOV = inLight->m_ShadowMapFov * QT3DS_DEGREES_TO_RADIANS;
 
             inCameras[i].m_Position = inLightPos;
             inCameras[i].m_Rotation = rotOfs[i];
@@ -629,7 +629,7 @@ namespace render {
 
     void SLayerRenderData::RenderShadowMapPass(CResourceFrameBuffer *theFB)
     {
-        SStackPerfTimer ___timer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer ___timer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                  "SLayerRenderData::RenderShadowMapPass");
 
         if (m_Camera == NULL || !GetShadowMapManager())
@@ -771,7 +771,7 @@ namespace render {
 
     void SLayerRenderData::RenderDepthPass(bool inEnableTransparentDepthWrite)
     {
-        SStackPerfTimer ___timer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer ___timer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                  "SLayerRenderData::RenderDepthPass");
         if (m_Camera == NULL)
             return;
@@ -965,7 +965,7 @@ namespace render {
 
     void SLayerRenderData::Render(CResourceFrameBuffer *theFB)
     {
-        SStackPerfTimer ___timer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer ___timer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                  "SLayerRenderData::Render");
         if (m_Camera == NULL)
             return;
@@ -980,7 +980,7 @@ namespace render {
     {
         if (m_Renderer.GetContext().IsTimerQuerySupported()) {
             m_LayerProfilerGpu = IRenderProfiler::CreateGpuProfiler(
-                m_Renderer.GetContext().GetFoundation(), m_Renderer.GetUICContext(),
+                m_Renderer.GetContext().GetFoundation(), m_Renderer.GetQt3DSContext(),
                 m_Renderer.GetContext());
         }
     }
@@ -1003,7 +1003,7 @@ namespace render {
     {
         if (m_LayerProfilerGpu.mPtr) {
             CRegisteredString theStr(
-                m_Renderer.GetUICContext().GetStringTable().RegisterStr(nameID));
+                m_Renderer.GetQt3DSContext().GetStringTable().RegisterStr(nameID));
             m_LayerProfilerGpu->StartTimer(theStr, false, sync);
         }
     }
@@ -1012,7 +1012,7 @@ namespace render {
     {
         if (m_LayerProfilerGpu.mPtr) {
             CRegisteredString theStr(
-                m_Renderer.GetUICContext().GetStringTable().RegisterStr(nameID));
+                m_Renderer.GetQt3DSContext().GetStringTable().RegisterStr(nameID));
             m_LayerProfilerGpu->EndTimer(theStr);
         }
     }
@@ -1062,7 +1062,7 @@ namespace render {
             m_AdvancedModeDrawFB = theRenderContext.CreateFrameBuffer();
         if (!m_AdvancedBlendDrawTexture) {
             m_AdvancedBlendDrawTexture = theRenderContext.CreateTexture2D();
-            NVRenderRect theViewport = m_Renderer.GetUICContext().GetRenderList().GetViewport();
+            NVRenderRect theViewport = m_Renderer.GetQt3DSContext().GetRenderList().GetViewport();
             m_AdvancedBlendDrawTexture->SetTextureData(NVDataRef<QT3DSU8>(), 0,
                                                        theViewport.m_Width,
                                                        theViewport.m_Height,
@@ -1091,7 +1091,7 @@ namespace render {
                                              bool depthEnabled, CResourceFrameBuffer *theFB)
     {
         NVRenderContext &theRenderContext(m_Renderer.GetContext());
-        NVRenderRect theViewport = m_Renderer.GetUICContext().GetRenderList().GetViewport();
+        NVRenderRect theViewport = m_Renderer.GetQt3DSContext().GetRenderList().GetViewport();
         AdvancedBlendModes::Enum advancedMode;
 
         switch (blendMode) {
@@ -1147,7 +1147,7 @@ namespace render {
             if (GetOffscreenRenderer()) {
                 m_LastFrameOffscreenRenderer->Render(
                     CreateOffscreenRenderEnvironment(), m_Renderer.GetContext(),
-                    m_Renderer.GetUICContext().GetPresentationScaleFactor(),
+                    m_Renderer.GetQt3DSContext().GetPresentationScaleFactor(),
                     SScene::ClearIsOptional);
             } else {
                 RenderDepthPass(false);
@@ -1280,7 +1280,7 @@ namespace render {
         // If our pass index == thePreResult.m_MaxAAPassIndex then
         // we shouldn't get into here.
 
-        IResourceManager &theResourceManager = m_Renderer.GetUICContext().GetResourceManager();
+        IResourceManager &theResourceManager = m_Renderer.GetQt3DSContext().GetResourceManager();
         bool hadLayerTexture = true;
 
         if (renderColorTexture->EnsureTexture(theLayerTextureDimensions.m_Width,
@@ -1617,15 +1617,15 @@ namespace render {
     {
         if (m_Layer.m_FirstEffect == NULL) {
             if (m_LayerCachedTexture) {
-                IResourceManager &theResourceManager(m_Renderer.GetUICContext().GetResourceManager());
+                IResourceManager &theResourceManager(m_Renderer.GetQt3DSContext().GetResourceManager());
                 theResourceManager.Release(*m_LayerCachedTexture);
                 m_LayerCachedTexture = NULL;
             }
             return;
         }
 
-        IEffectSystem &theEffectSystem(m_Renderer.GetUICContext().GetEffectSystem());
-        IResourceManager &theResourceManager(m_Renderer.GetUICContext().GetResourceManager());
+        IEffectSystem &theEffectSystem(m_Renderer.GetQt3DSContext().GetEffectSystem());
+        IResourceManager &theResourceManager(m_Renderer.GetQt3DSContext().GetResourceManager());
         // we use the non MSAA buffer for the effect
         NVRenderTexture2D *theLayerColorTexture = m_LayerTexture;
         NVRenderTexture2D *theLayerDepthTexture = m_LayerDepthTexture;
@@ -1720,8 +1720,8 @@ namespace render {
                 (m_LayerCachedTexture) ? m_LayerCachedTexture : m_LayerTexture;
 #else
             // Then render all but the last effect
-            IEffectSystem &theEffectSystem(m_Renderer.GetUICContext().GetEffectSystem());
-            IResourceManager &theResourceManager(m_Renderer.GetUICContext().GetResourceManager());
+            IEffectSystem &theEffectSystem(m_Renderer.GetQt3DSContext().GetEffectSystem());
+            IResourceManager &theResourceManager(m_Renderer.GetQt3DSContext().GetResourceManager());
             // we use the non MSAA buffer for the effect
             NVRenderTexture2D *theLayerColorTexture = m_LayerTexture;
             NVRenderTexture2D *theLayerDepthTexture = m_LayerDepthTexture;
@@ -2034,13 +2034,13 @@ namespace render {
 
     void SLayerRenderData::AddLayerRenderStep()
     {
-        SStackPerfTimer __perfTimer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer __perfTimer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                     "SLayerRenderData::AddLayerRenderStep");
         QT3DS_ASSERT(m_Camera);
         if (!m_Camera)
             return;
 
-        IRenderList &theGraph(m_Renderer.GetUICContext().GetRenderList());
+        IRenderList &theGraph(m_Renderer.GetQt3DSContext().GetRenderList());
 
         qt3ds::render::NVRenderRect theCurrentViewport = theGraph.GetViewport();
         if (!m_LayerPrepResult.hasValue())
@@ -2052,7 +2052,7 @@ namespace render {
     {
         // When we render to the scene itself (as opposed to an offscreen buffer somewhere)
         // then we use the MVP of the layer somewhat.
-        NVRenderRect theViewport = m_Renderer.GetUICContext().GetRenderList().GetViewport();
+        NVRenderRect theViewport = m_Renderer.GetQt3DSContext().GetRenderList().GetViewport();
         PrepareForRender(
             SWindowDimensions((QT3DSU32)theViewport.m_Width, (QT3DSU32)theViewport.m_Height));
     }
@@ -2108,7 +2108,7 @@ namespace render {
     {
         OffscreenRendererDepthValues::Enum theOffscreenDepth(
             GetOffscreenRendererDepthValue(GetDepthBufferFormat()));
-        NVRenderRect theViewport = m_Renderer.GetUICContext().GetRenderList().GetViewport();
+        NVRenderRect theViewport = m_Renderer.GetQt3DSContext().GetRenderList().GetViewport();
         return SOffscreenRendererEnvironment(theViewport.m_Width, theViewport.m_Height,
                                              NVRenderTextureFormats::RGBA8, theOffscreenDepth,
                                              false, AAModeValues::NoAA);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
index 0a69976d..b7d8439f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
@@ -96,7 +96,7 @@ struct AdvancedBlendModes
 
         QSize m_previousDimensions;
 
-        SLayerRenderData(SLayer &inLayer, CUICRendererImpl &inRenderer);
+        SLayerRenderData(SLayer &inLayer, Qt3DSRendererImpl &inRenderer);
 
         virtual ~SLayerRenderData();
 
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index cf835ab5..87b5934a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
@@ -104,7 +104,7 @@ namespace render {
 #define MAX_AA_LEVELS 8
 
     SLayerRenderPreparationData::SLayerRenderPreparationData(SLayer &inLayer,
-                                                             CUICRendererImpl &inRenderer)
+                                                             Qt3DSRendererImpl &inRenderer)
         : m_Layer(inLayer)
         , m_Renderer(inRenderer)
         , m_Allocator(inRenderer.GetContext().GetAllocator())
@@ -175,7 +175,7 @@ namespace render {
 
     void SLayerRenderPreparationData::SetShaderFeature(const char *inName, bool inValue)
     {
-        CRegisteredString theStr(m_Renderer.GetUICContext().GetStringTable().RegisterStr(inName));
+        CRegisteredString theStr(m_Renderer.GetQt3DSContext().GetStringTable().RegisterStr(inName));
         SetShaderFeature(theStr, inValue);
     }
 
@@ -200,7 +200,7 @@ namespace render {
         if (m_ShadowMapManager.mPtr)
             return true;
 
-        m_ShadowMapManager.mPtr = UICShadowMap::Create(m_Renderer.GetUICContext());
+        m_ShadowMapManager.mPtr = Qt3DSShadowMap::Create(m_Renderer.GetQt3DSContext());
 
         return m_ShadowMapManager.mPtr != NULL;
     }
@@ -212,10 +212,10 @@ namespace render {
 
         if (m_Layer.m_RenderPlugin && m_Layer.m_RenderPlugin->m_Flags.IsActive()) {
             IRenderPluginInstance *theInstance =
-                m_Renderer.GetUICContext().GetRenderPluginManager().GetOrCreateRenderPluginInstance(
+                m_Renderer.GetQt3DSContext().GetRenderPluginManager().GetOrCreateRenderPluginInstance(
                     m_Layer.m_RenderPlugin->m_PluginPath, m_Layer.m_RenderPlugin);
             if (theInstance) {
-                m_Renderer.GetUICContext()
+                m_Renderer.GetQt3DSContext()
                     .GetOffscreenRenderManager()
                     .MaybeRegisterOffscreenRenderer(&theInstance, *theInstance);
                 m_LastFrameOffscreenRenderer = theInstance;
@@ -223,7 +223,7 @@ namespace render {
         }
         if (m_LastFrameOffscreenRenderer.mPtr == NULL)
             m_LastFrameOffscreenRenderer =
-                m_Renderer.GetUICContext().GetOffscreenRenderManager().GetOffscreenRenderer(
+                m_Renderer.GetQt3DSContext().GetOffscreenRenderManager().GetOffscreenRenderer(
                     m_Layer.m_TexturePath);
         return m_LastFrameOffscreenRenderer.mPtr != NULL;
     }
@@ -360,7 +360,7 @@ namespace render {
         SText &inText, const QT3DSMat44 &inViewProjection, QT3DSF32 inTextScaleFactor,
         SLayerRenderPreparationResultFlags &ioFlags)
     {
-        ITextTextureCache *theTextRenderer = m_Renderer.GetUICContext().GetTextureCache();
+        ITextTextureCache *theTextRenderer = m_Renderer.GetQt3DSContext().GetTextureCache();
         if (theTextRenderer == NULL)
             return false;
 
@@ -443,7 +443,7 @@ namespace render {
         QT3DSMat33 theNormalMatrix;
 
         inPath.CalculateMVPAndNormalMatrix(inViewProjection, theMVP, theNormalMatrix);
-        NVBounds3 theBounds(this->m_Renderer.GetUICContext().GetPathManager().GetBounds(inPath));
+        NVBounds3 theBounds(this->m_Renderer.GetQt3DSContext().GetPathManager().GetBounds(inPath));
 
         if (inPath.m_GlobalOpacity >= QT3DS_RENDER_MINIMUM_RENDER_OPACITY
             && inClipFrustum.hasValue()) {
@@ -508,11 +508,11 @@ namespace render {
                     prepResult.m_MaterialKey, isStroke);
                 theRenderable->m_FirstImage = prepResult.m_FirstImage;
 
-                IUICRenderContext &theUICContext(m_Renderer.GetUICContext());
-                IPathManager &thePathManager = theUICContext.GetPathManager();
+                IQt3DSRenderContext &qt3dsContext(m_Renderer.GetQt3DSContext());
+                IPathManager &thePathManager = qt3dsContext.GetPathManager();
                 retval = thePathManager.PrepareForRender(inPath) || retval;
-                retval |= (inPath.m_WireframeMode != theUICContext.GetWireframeMode());
-                inPath.m_WireframeMode = theUICContext.GetWireframeMode();
+                retval |= (inPath.m_WireframeMode != qt3dsContext.GetWireframeMode());
+                inPath.m_WireframeMode = qt3dsContext.GetWireframeMode();
 
                 if (theFlags.HasTransparency())
                     m_TransparentObjects.push_back(theRenderable);
@@ -551,11 +551,11 @@ namespace render {
                     prepResult.m_MaterialKey, isStroke);
                 theRenderable->m_FirstImage = prepResult.m_FirstImage;
 
-                IUICRenderContext &theUICContext(m_Renderer.GetUICContext());
-                IPathManager &thePathManager = theUICContext.GetPathManager();
+                IQt3DSRenderContext &qt3dsContext(m_Renderer.GetQt3DSContext());
+                IPathManager &thePathManager = qt3dsContext.GetPathManager();
                 retval = thePathManager.PrepareForRender(inPath) || retval;
-                retval |= (inPath.m_WireframeMode != theUICContext.GetWireframeMode());
-                inPath.m_WireframeMode = theUICContext.GetWireframeMode();
+                retval |= (inPath.m_WireframeMode != qt3dsContext.GetWireframeMode());
+                inPath.m_WireframeMode = qt3dsContext.GetWireframeMode();
 
                 if (theFlags.HasTransparency())
                     m_TransparentObjects.push_back(theRenderable);
@@ -571,11 +571,11 @@ namespace render {
         SRenderableImage *&ioNextImage, SRenderableObjectFlags &ioFlags,
         SShaderDefaultMaterialKey &inShaderKey, QT3DSU32 inImageIndex)
     {
-        IUICRenderContext &theUICContext(m_Renderer.GetUICContext());
-        IBufferManager &bufferManager = theUICContext.GetBufferManager();
+        IQt3DSRenderContext &qt3dsContext(m_Renderer.GetQt3DSContext());
+        IBufferManager &bufferManager = qt3dsContext.GetBufferManager();
         IOffscreenRenderManager &theOffscreenRenderManager(
-            theUICContext.GetOffscreenRenderManager());
-        IRenderPluginManager &theRenderPluginManager(theUICContext.GetRenderPluginManager());
+            qt3dsContext.GetOffscreenRenderManager());
+        IRenderPluginManager &theRenderPluginManager(qt3dsContext.GetRenderPluginManager());
         if (inImage.ClearDirty(bufferManager, theOffscreenRenderManager, theRenderPluginManager))
             ioFlags |= RenderPreparationResultFlagValues::Dirty;
 
@@ -659,7 +659,7 @@ namespace render {
 
         // set wireframe mode
         m_Renderer.DefaultMaterialShaderKeyProperties().m_WireframeMode.SetValue(
-            theGeneratedKey, m_Renderer.GetUICContext().GetWireframeMode());
+            theGeneratedKey, m_Renderer.GetQt3DSContext().GetWireframeMode());
 
         if (theMaterial->m_IblProbe && CheckLightProbeDirty(*theMaterial->m_IblProbe)) {
             m_Renderer.PrepareImageForIbl(*theMaterial->m_IblProbe);
@@ -770,7 +770,7 @@ namespace render {
 
         // set wireframe mode
         m_Renderer.DefaultMaterialShaderKeyProperties().m_WireframeMode.SetValue(
-            theGeneratedKey, m_Renderer.GetUICContext().GetWireframeMode());
+            theGeneratedKey, m_Renderer.GetQt3DSContext().GetWireframeMode());
 
         if (subsetOpacity < QT3DS_RENDER_MINIMUM_RENDER_OPACITY) {
             subsetOpacity = 0.0f;
@@ -813,8 +813,8 @@ namespace render {
         SModel &inModel, const QT3DSMat44 &inViewProjection,
         const Option<SClippingFrustum> &inClipFrustum, TNodeLightEntryList &inScopedLights)
     {
-        IUICRenderContext &theUICContext(m_Renderer.GetUICContext());
-        IBufferManager &bufferManager = theUICContext.GetBufferManager();
+        IQt3DSRenderContext &qt3dsContext(m_Renderer.GetQt3DSContext());
+        IBufferManager &bufferManager = qt3dsContext.GetBufferManager();
         SRenderMesh *theMesh = bufferManager.LoadMesh(inModel.m_MeshPath);
         if (theMesh == NULL)
             return false;
@@ -879,11 +879,11 @@ namespace render {
                     theSubset.m_InputAssembler->SetPatchVertexCount(3);
                     theSubset.m_InputAssemblerDepth->SetPatchVertexCount(3);
                     // check wireframe mode
-                    theSubset.m_WireframeMode = theUICContext.GetWireframeMode();
+                    theSubset.m_WireframeMode = qt3dsContext.GetWireframeMode();
 
                     subsetDirty =
                         subsetDirty | (theSubset.m_WireframeMode != inModel.m_WireframeMode);
-                    inModel.m_WireframeMode = theUICContext.GetWireframeMode();
+                    inModel.m_WireframeMode = qt3dsContext.GetWireframeMode();
                 } else {
                     theSubset.m_PrimitiveType = theSubset.m_InputAssembler->GetPrimitiveType();
                     theSubset.m_InputAssembler->SetPatchVertexCount(1);
@@ -935,7 +935,7 @@ namespace render {
                         static_cast<SCustomMaterial &>(*theMaterialObject));
 
                     ICustomMaterialSystem &theMaterialSystem(
-                        theUICContext.GetCustomMaterialSystem());
+                        qt3dsContext.GetCustomMaterialSystem());
                     subsetDirty |= theMaterialSystem.PrepareForRender(
                         theModelContext.m_Model, theSubset, theMaterial, clearMaterialDirtyFlags);
 
@@ -987,12 +987,12 @@ namespace render {
         const QT3DSMat44 &inViewProjection, const Option<SClippingFrustum> &inClipFrustum,
         QT3DSF32 inTextScaleFactor, SLayerRenderPreparationResultFlags &ioFlags)
     {
-        SStackPerfTimer __timer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer __timer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                 "SLayerRenderData::PrepareRenderablesForRender");
         m_ViewProjection = inViewProjection;
         QT3DSF32 theTextScaleFactor = inTextScaleFactor;
         bool wasDataDirty = false;
-        bool hasTextRenderer = m_Renderer.GetUICContext().GetTextRenderer() != NULL;
+        bool hasTextRenderer = m_Renderer.GetQt3DSContext().GetTextRenderer() != NULL;
         for (QT3DSU32 idx = 0, end = m_RenderableNodes.size(); idx < end; ++idx) {
             SRenderableNodeEntry &theNodeEntry(m_RenderableNodes[idx]);
             SNode *theNode = theNodeEntry.m_Node;
@@ -1037,7 +1037,7 @@ namespace render {
 
     bool SLayerRenderPreparationData::CheckLightProbeDirty(SImage &inLightProbe)
     {
-        IUICRenderContext &theContext(m_Renderer.GetUICContext());
+        IQt3DSRenderContext &theContext(m_Renderer.GetQt3DSContext());
         return inLightProbe.ClearDirty(theContext.GetBufferManager(),
                                        theContext.GetOffscreenRenderManager(),
                                        theContext.GetRenderPluginManager(), true);
@@ -1093,7 +1093,7 @@ namespace render {
     void
     SLayerRenderPreparationData::PrepareForRender(const SWindowDimensions &inViewportDimensions)
     {
-        SStackPerfTimer __timer(m_Renderer.GetUICContext().GetPerfTimer(),
+        SStackPerfTimer __timer(m_Renderer.GetQt3DSContext().GetPerfTimer(),
                                 "SLayerRenderData::PrepareForRender");
         if (m_LayerPrepResult.hasValue())
             return;
@@ -1102,7 +1102,7 @@ namespace render {
         m_FeatureSetHash = 0;
         QT3DSVec2 thePresentationDimensions((QT3DSF32)inViewportDimensions.m_Width,
                                          (QT3DSF32)inViewportDimensions.m_Height);
-        IRenderList &theGraph(m_Renderer.GetUICContext().GetRenderList());
+        IRenderList &theGraph(m_Renderer.GetQt3DSContext().GetRenderList());
         NVRenderRect theViewport(theGraph.GetViewport());
         NVRenderRect theScissor(theGraph.GetViewport());
         if (theGraph.IsScissorTestEnabled())
@@ -1131,7 +1131,7 @@ namespace render {
 
         if (m_Layer.m_Flags.IsActive()) {
             // Get the layer's width and height.
-            IEffectSystem &theEffectSystem(m_Renderer.GetUICContext().GetEffectSystem());
+            IEffectSystem &theEffectSystem(m_Renderer.GetQt3DSContext().GetEffectSystem());
             for (SEffect *theEffect = m_Layer.m_FirstEffect; theEffect;
                  theEffect = theEffect->m_NextEffect) {
                 if (theEffect->m_Flags.IsDirty()) {
@@ -1162,8 +1162,8 @@ namespace render {
 
             thePrepResult = SLayerRenderPreparationResult(SLayerRenderHelper(
                 theViewport, theScissor, m_Layer.m_Scene->m_Presentation->m_PresentationDimensions,
-                m_Layer, shouldRenderToTexture, m_Renderer.GetUICContext().GetScaleMode(),
-                m_Renderer.GetUICContext().GetPresentationScaleFactor()));
+                m_Layer, shouldRenderToTexture, m_Renderer.GetQt3DSContext().GetScaleMode(),
+                m_Renderer.GetQt3DSContext().GetPresentationScaleFactor()));
             thePrepResult.m_LastEffect = theLastEffect;
             thePrepResult.m_MaxAAPassIndex = maxNumAAPasses;
             thePrepResult.m_Flags.SetRequiresDepthTexture(requiresDepthPrepass
@@ -1174,7 +1174,7 @@ namespace render {
 
             if (thePrepResult.IsLayerVisible()) {
                 if (shouldRenderToTexture) {
-                    m_Renderer.GetUICContext().GetRenderList().AddRenderTask(
+                    m_Renderer.GetQt3DSContext().GetRenderList().AddRenderTask(
                         CreateRenderToTextureRunnable());
                 }
                 if (m_Layer.m_LightProbe && CheckLightProbeDirty(*m_Layer.m_LightProbe)) {
@@ -1371,7 +1371,7 @@ namespace render {
                     NVRenderRect theScissorRect =
                         thePrepResult.GetLayerToPresentationScissorRect().ToIntegerRect();
                     // This happens here because if there are any fancy render steps
-                    IRenderList &theRenderList(m_Renderer.GetUICContext().GetRenderList());
+                    IRenderList &theRenderList(m_Renderer.GetQt3DSContext().GetRenderList());
                     NVRenderContext &theContext(m_Renderer.GetContext());
                     SRenderListScopedProperty<bool> _listScissorEnabled(
                         theRenderList, &IRenderList::IsScissorTestEnabled,
@@ -1395,7 +1395,7 @@ namespace render {
                         theViewport);
                     SOffscreenRenderFlags theResult = m_LastFrameOffscreenRenderer->NeedsRender(
                         CreateOffscreenRenderEnvironment(),
-                        m_Renderer.GetUICContext().GetPresentationScaleFactor());
+                        m_Renderer.GetQt3DSContext().GetPresentationScaleFactor());
                     wasDataDirty = wasDataDirty || theResult.m_HasChangedSinceLastFrame;
                 }
             }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
index a18ec63f..b125126c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
@@ -46,7 +46,7 @@
 namespace qt3ds {
 namespace render {
     struct SLayerRenderData;
-    class CUICRendererImpl;
+    class Qt3DSRendererImpl;
     struct SRenderableObject;
 
     struct LayerRenderPreparationResultFlagValues
@@ -246,7 +246,7 @@ namespace render {
         };
 
         SLayer &m_Layer;
-        CUICRendererImpl &m_Renderer;
+        Qt3DSRendererImpl &m_Renderer;
         NVAllocatorCallback &m_Allocator;
         // List of nodes we can render, not all may be active.  Found by doing a depth-first
         // search through m_FirstChild if length is zero.
@@ -295,9 +295,9 @@ namespace render {
         bool m_TooManyLightsError;
 
         // shadow mapps
-        NVScopedRefCounted<UICShadowMap> m_ShadowMapManager;
+        NVScopedRefCounted<Qt3DSShadowMap> m_ShadowMapManager;
 
-        SLayerRenderPreparationData(SLayer &inLayer, CUICRendererImpl &inRenderer);
+        SLayerRenderPreparationData(SLayer &inLayer, Qt3DSRendererImpl &inRenderer);
         virtual ~SLayerRenderPreparationData();
         bool GetOffscreenRenderer();
         bool GetShadowMapManager();
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
index 3ecb6da0..ea4a7d4b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
@@ -180,16 +180,16 @@ namespace render {
     // Should be completely possible to use for custom materials with a bit of refactoring.
     struct SSubsetMaterialVertexPipeline : public SVertexPipelineImpl
     {
-        CUICRendererImpl &m_Renderer;
+        Qt3DSRendererImpl &m_Renderer;
         SSubsetRenderable &m_Renderable;
         TessModeValues::Enum m_TessMode;
 
-        SSubsetMaterialVertexPipeline(CUICRendererImpl &renderer, SSubsetRenderable &renderable,
+        SSubsetMaterialVertexPipeline(Qt3DSRendererImpl &renderer, SSubsetRenderable &renderable,
                                       bool inWireframeRequested)
-            : SVertexPipelineImpl(renderer.GetUICContext().GetAllocator(),
-                                  renderer.GetUICContext().GetDefaultMaterialShaderGenerator(),
-                                  renderer.GetUICContext().GetShaderProgramGenerator(),
-                                  renderer.GetUICContext().GetStringTable(), false)
+            : SVertexPipelineImpl(renderer.GetQt3DSContext().GetAllocator(),
+                                  renderer.GetQt3DSContext().GetDefaultMaterialShaderGenerator(),
+                                  renderer.GetQt3DSContext().GetShaderProgramGenerator(),
+                                  renderer.GetQt3DSContext().GetStringTable(), false)
             , m_Renderer(renderer)
             , m_Renderable(renderable)
             , m_TessMode(TessModeValues::NoTess)
@@ -251,7 +251,7 @@ namespace render {
             SetupTessIncludes(ShaderGeneratorStages::TessEval, m_TessMode);
 
             if (m_TessMode == TessModeValues::TessLinear)
-                m_Renderer.GetUICContext()
+                m_Renderer.GetQt3DSContext()
                     .GetDefaultMaterialShaderGenerator()
                     .AddDisplacementImageUniforms(tessEvalShader, m_DisplacementIdx,
                                                   m_DisplacementImage);
@@ -335,7 +335,7 @@ namespace render {
                 // displacement mapping makes only sense with linear tessellation
                 if (m_TessMode == TessModeValues::TessLinear && m_DisplacementImage) {
                     IDefaultMaterialShaderGenerator::SImageVariableNames theNames =
-                        m_Renderer.GetUICContext()
+                        m_Renderer.GetQt3DSContext()
                             .GetDefaultMaterialShaderGenerator()
                             .GetImageVariableNames(m_DisplacementIdx);
                     tessEvalShader << "\tpos.xyz = defaultMaterialFileDisplacementTexture( "
@@ -547,7 +547,7 @@ namespace render {
         IShaderStageGenerator &ActiveStage() override { return Vertex(); }
     };
 
-    NVRenderShaderProgram *CUICRendererImpl::GenerateShader(SSubsetRenderable &inRenderable,
+    NVRenderShaderProgram *Qt3DSRendererImpl::GenerateShader(SSubsetRenderable &inRenderable,
                                                             TShaderFeatureSet inFeatureSet)
     {
         // build a string that allows us to print out the shader we are generating to the log.
@@ -557,9 +557,9 @@ namespace render {
         m_GeneratedShaderString.clear();
         SShaderDefaultMaterialKey theKey(inRenderable.m_ShaderDescription);
         theKey.ToString(m_GeneratedShaderString, m_DefaultMaterialShaderKeyProperties);
-        IShaderCache &theCache = m_UICContext.GetShaderCache();
+        IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
         CRegisteredString theCacheKey =
-            m_UICContext.GetStringTable().RegisterStr(m_GeneratedShaderString.c_str());
+            m_qt3dsContext.GetStringTable().RegisterStr(m_GeneratedShaderString.c_str());
         NVRenderShaderProgram *cachedProgram = theCache.GetProgram(theCacheKey, inFeatureSet);
         if (cachedProgram)
             return cachedProgram;
@@ -567,7 +567,7 @@ namespace render {
         SSubsetMaterialVertexPipeline pipeline(
             *this, inRenderable,
             m_DefaultMaterialShaderKeyProperties.m_WireframeMode.GetValue(theKey));
-        return m_UICContext.GetDefaultMaterialShaderGenerator().GenerateShader(
+        return m_qt3dsContext.GetDefaultMaterialShaderGenerator().GenerateShader(
             inRenderable.m_Material, inRenderable.m_ShaderDescription, pipeline, inFeatureSet,
             m_CurrentLayer->m_Lights, inRenderable.m_FirstImage,
             inRenderable.m_RenderableFlags.HasTransparency(), "mesh subset pipeline-- ");
@@ -576,9 +576,9 @@ namespace render {
     // --------------  Special cases for shadows  -------------------
 
     SRenderableDepthPrepassShader *
-    CUICRendererImpl::GetParaboloidDepthShader(TessModeValues::Enum inTessMode)
+    Qt3DSRendererImpl::GetParaboloidDepthShader(TessModeValues::Enum inTessMode)
     {
-        if (!m_UICContext.GetRenderContext().IsTessellationSupported()
+        if (!m_qt3dsContext.GetRenderContext().IsTessellationSupported()
             || inTessMode == TessModeValues::NoTess) {
             return GetParaboloidDepthNoTessShader();
         } else if (inTessMode == TessModeValues::TessLinear) {
@@ -592,7 +592,7 @@ namespace render {
         return GetParaboloidDepthNoTessShader();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetParaboloidDepthNoTessShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetParaboloidDepthNoTessShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_ParaboloidDepthShader;
@@ -601,8 +601,8 @@ namespace render {
             TStrType name;
             name.assign("paraboloid depth shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -630,7 +630,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetParaboloidDepthTessLinearShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetParaboloidDepthTessLinearShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_ParaboloidDepthTessLinearShader;
@@ -639,8 +639,8 @@ namespace render {
             TStrType name;
             name.assign("paraboloid depth tess linear shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -704,7 +704,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetParaboloidDepthTessPhongShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetParaboloidDepthTessPhongShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_ParaboloidDepthTessPhongShader;
@@ -713,8 +713,8 @@ namespace render {
             TStrType name;
             name.assign("paraboloid depth tess phong shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -778,7 +778,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetParaboloidDepthTessNPatchShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetParaboloidDepthTessNPatchShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_ParaboloidDepthTessNPatchShader;
@@ -787,8 +787,8 @@ namespace render {
             TStrType name;
             name.assign("paraboloid depth tess NPatch shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -853,9 +853,9 @@ namespace render {
     }
 
     SRenderableDepthPrepassShader *
-    CUICRendererImpl::GetCubeShadowDepthShader(TessModeValues::Enum inTessMode)
+    Qt3DSRendererImpl::GetCubeShadowDepthShader(TessModeValues::Enum inTessMode)
     {
-        if (!m_UICContext.GetRenderContext().IsTessellationSupported()
+        if (!m_qt3dsContext.GetRenderContext().IsTessellationSupported()
             || inTessMode == TessModeValues::NoTess) {
             return GetCubeDepthNoTessShader();
         } else if (inTessMode == TessModeValues::TessLinear) {
@@ -869,7 +869,7 @@ namespace render {
         return GetCubeDepthNoTessShader();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetCubeDepthNoTessShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetCubeDepthNoTessShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_CubemapDepthShader;
@@ -878,8 +878,8 @@ namespace render {
             TStrType name;
             name.assign("cubemap face depth shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
 
@@ -918,7 +918,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetCubeDepthTessLinearShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetCubeDepthTessLinearShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_CubemapDepthTessLinearShader;
@@ -927,8 +927,8 @@ namespace render {
             TStrType name;
             name.assign("cubemap face depth linear tess shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
 
@@ -994,7 +994,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetCubeDepthTessPhongShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetCubeDepthTessPhongShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_CubemapDepthTessPhongShader;
@@ -1003,8 +1003,8 @@ namespace render {
             TStrType name;
             name.assign("cubemap face depth phong tess shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
 
@@ -1076,7 +1076,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetCubeDepthTessNPatchShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetCubeDepthTessNPatchShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_CubemapDepthTessNPatchShader;
@@ -1085,8 +1085,8 @@ namespace render {
             TStrType name;
             name.assign("cubemap face depth npatch tess shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
 
@@ -1165,9 +1165,9 @@ namespace render {
     }
 
     SRenderableDepthPrepassShader *
-    CUICRendererImpl::GetOrthographicDepthShader(TessModeValues::Enum inTessMode)
+    Qt3DSRendererImpl::GetOrthographicDepthShader(TessModeValues::Enum inTessMode)
     {
-        if (!m_UICContext.GetRenderContext().IsTessellationSupported()
+        if (!m_qt3dsContext.GetRenderContext().IsTessellationSupported()
             || inTessMode == TessModeValues::NoTess) {
             return GetOrthographicDepthNoTessShader();
         } else if (inTessMode == TessModeValues::TessLinear) {
@@ -1181,7 +1181,7 @@ namespace render {
         return GetOrthographicDepthNoTessShader();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetOrthographicDepthNoTessShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetOrthographicDepthNoTessShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_OrthographicDepthShader;
@@ -1190,8 +1190,8 @@ namespace render {
             TStrType name;
             name.assign("orthographic depth shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1229,7 +1229,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetOrthographicDepthTessLinearShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetOrthographicDepthTessLinearShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_OrthographicDepthTessLinearShader;
@@ -1238,8 +1238,8 @@ namespace render {
             TStrType name;
             name.assign("orthographic depth tess linear shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1300,7 +1300,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetOrthographicDepthTessPhongShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetOrthographicDepthTessPhongShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_OrthographicDepthTessPhongShader;
@@ -1309,8 +1309,8 @@ namespace render {
             TStrType name;
             name.assign("orthographic depth tess phong shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1377,7 +1377,7 @@ namespace render {
         return theDepthShader.getValue();
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetOrthographicDepthTessNPatchShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetOrthographicDepthTessNPatchShader()
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthShader =
             m_OrthographicDepthTessNPatchShader;
@@ -1386,8 +1386,8 @@ namespace render {
             TStrType name;
             name.assign("orthographic depth tess npatch shader");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1465,7 +1465,7 @@ namespace render {
 
     // ---------------------------------
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetDepthPrepassShader(bool inDisplaced)
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetDepthPrepassShader(bool inDisplaced)
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthPrePassShader =
             (!inDisplaced) ? m_DepthPrepassShader : m_DepthPrepassShaderDisplaced;
@@ -1477,8 +1477,8 @@ namespace render {
             if (inDisplaced)
                 name.append(" displacement");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1493,7 +1493,7 @@ namespace render {
                 vertexShader.Append("void main() {");
 
                 if (inDisplaced) {
-                    GetUICContext()
+                    GetQt3DSContext()
                         .GetDefaultMaterialShaderGenerator()
                         .AddDisplacementMappingForDepthPass(vertexShader);
                 } else {
@@ -1524,9 +1524,9 @@ namespace render {
     }
 
     SRenderableDepthPrepassShader *
-    CUICRendererImpl::GetDepthTessPrepassShader(TessModeValues::Enum inTessMode, bool inDisplaced)
+    Qt3DSRendererImpl::GetDepthTessPrepassShader(TessModeValues::Enum inTessMode, bool inDisplaced)
     {
-        if (!m_UICContext.GetRenderContext().IsTessellationSupported()
+        if (!m_qt3dsContext.GetRenderContext().IsTessellationSupported()
             || inTessMode == TessModeValues::NoTess) {
             return GetDepthPrepassShader(inDisplaced);
         } else if (inTessMode == TessModeValues::TessLinear) {
@@ -1541,7 +1541,7 @@ namespace render {
     }
 
     SRenderableDepthPrepassShader *
-    CUICRendererImpl::GetDepthTessLinearPrepassShader(bool inDisplaced)
+    Qt3DSRendererImpl::GetDepthTessLinearPrepassShader(bool inDisplaced)
     {
         Option<NVScopedRefCounted<SRenderableDepthPrepassShader>> &theDepthPrePassShader =
             (!inDisplaced) ? m_DepthTessLinearPrepassShader
@@ -1554,8 +1554,8 @@ namespace render {
             if (inDisplaced)
                 name.append(" displacement");
 
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
-            CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(name.c_str());
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
+            CRegisteredString theCacheKey = m_qt3dsContext.GetStringTable().RegisterStr(name.c_str());
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1680,12 +1680,12 @@ namespace render {
         return theDepthPrePassShader->mPtr;
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetDepthTessPhongPrepassShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetDepthTessPhongPrepassShader()
     {
         if (m_DepthTessPhongPrepassShader.hasValue() == false) {
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
             CRegisteredString theCacheKey =
-                m_UICContext.GetStringTable().RegisterStr("depth tess phong prepass shader");
+                m_qt3dsContext.GetStringTable().RegisterStr("depth tess phong prepass shader");
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1760,12 +1760,12 @@ namespace render {
         return m_DepthTessPhongPrepassShader->mPtr;
     }
 
-    SRenderableDepthPrepassShader *CUICRendererImpl::GetDepthTessNPatchPrepassShader()
+    SRenderableDepthPrepassShader *Qt3DSRendererImpl::GetDepthTessNPatchPrepassShader()
     {
         if (m_DepthTessNPatchPrepassShader.hasValue() == false) {
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
             CRegisteredString theCacheKey =
-                m_UICContext.GetStringTable().RegisterStr("depth tess npatch prepass shader");
+                m_qt3dsContext.GetStringTable().RegisterStr("depth tess npatch prepass shader");
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -1855,12 +1855,12 @@ namespace render {
         return m_DepthTessNPatchPrepassShader->mPtr;
     }
 
-    SDefaultAoPassShader *CUICRendererImpl::GetDefaultAoPassShader(TShaderFeatureSet inFeatureSet)
+    SDefaultAoPassShader *Qt3DSRendererImpl::GetDefaultAoPassShader(TShaderFeatureSet inFeatureSet)
     {
         if (m_DefaultAoPassShader.hasValue() == false) {
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
             CRegisteredString theCacheKey =
-                m_UICContext.GetStringTable().RegisterStr("fullscreen AO pass shader");
+                m_qt3dsContext.GetStringTable().RegisterStr("fullscreen AO pass shader");
             NVRenderShaderProgram *aoPassShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!aoPassShaderProgram) {
@@ -1979,12 +1979,12 @@ namespace render {
         return m_DefaultAoPassShader->mPtr;
     }
 
-    SDefaultAoPassShader *CUICRendererImpl::GetFakeDepthShader(TShaderFeatureSet inFeatureSet)
+    SDefaultAoPassShader *Qt3DSRendererImpl::GetFakeDepthShader(TShaderFeatureSet inFeatureSet)
     {
         if (m_FakeDepthShader.hasValue() == false) {
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
             CRegisteredString theCacheKey =
-                m_UICContext.GetStringTable().RegisterStr("depth display shader");
+                m_qt3dsContext.GetStringTable().RegisterStr("depth display shader");
             NVRenderShaderProgram *depthShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!depthShaderProgram) {
@@ -2026,12 +2026,12 @@ namespace render {
         return m_FakeDepthShader->mPtr;
     }
 
-    SDefaultAoPassShader *CUICRendererImpl::GetFakeCubeDepthShader(TShaderFeatureSet inFeatureSet)
+    SDefaultAoPassShader *Qt3DSRendererImpl::GetFakeCubeDepthShader(TShaderFeatureSet inFeatureSet)
     {
         if (!m_FakeCubemapDepthShader.hasValue()) {
-            IShaderCache &theCache = m_UICContext.GetShaderCache();
+            IShaderCache &theCache = m_qt3dsContext.GetShaderCache();
             CRegisteredString theCacheKey =
-                m_UICContext.GetStringTable().RegisterStr("cube depth display shader");
+                m_qt3dsContext.GetStringTable().RegisterStr("cube depth display shader");
             NVRenderShaderProgram *cubeShaderProgram =
                 theCache.GetProgram(theCacheKey, TShaderFeatureSet());
             if (!cubeShaderProgram) {
@@ -2071,7 +2071,7 @@ namespace render {
         return m_FakeCubemapDepthShader.getValue();
     }
 
-    STextRenderHelper CUICRendererImpl::GetTextShader(bool inUsePathRendering)
+    STextRenderHelper Qt3DSRendererImpl::GetTextShader(bool inUsePathRendering)
     {
         STextShaderPtr &thePtr = (!inUsePathRendering) ? m_TextShader : m_TextPathShader;
         if (thePtr.HasGeneratedShader())
@@ -2163,7 +2163,7 @@ namespace render {
         return STextRenderHelper(thePtr, *m_QuadInputAssembler);
     }
 
-    STextDepthShader *CUICRendererImpl::GetTextDepthShader()
+    STextDepthShader *Qt3DSRendererImpl::GetTextDepthShader()
     {
         if (m_TextDepthPrepassShader.hasValue() == false) {
             GetProgramGenerator().BeginProgram();
@@ -2217,7 +2217,7 @@ namespace render {
         return m_TextDepthPrepassShader->mPtr;
     }
 
-    STextRenderHelper CUICRendererImpl::GetTextWidgetShader()
+    STextRenderHelper Qt3DSRendererImpl::GetTextWidgetShader()
     {
         if (m_TextWidgetShader.HasGeneratedShader())
             return STextRenderHelper(m_TextWidgetShader, *m_QuadInputAssembler);
@@ -2275,7 +2275,7 @@ namespace render {
         return STextRenderHelper(m_TextWidgetShader, *m_QuadInputAssembler);
     }
 
-    STextRenderHelper CUICRendererImpl::GetOnscreenTextShader()
+    STextRenderHelper Qt3DSRendererImpl::GetOnscreenTextShader()
     {
         if (m_TextOnscreenShader.HasGeneratedShader())
             return STextRenderHelper(m_TextOnscreenShader, *m_QuadStripInputAssembler);
@@ -2319,7 +2319,7 @@ namespace render {
         return STextRenderHelper(m_TextOnscreenShader, *m_QuadStripInputAssembler);
     }
 
-    NVRenderShaderProgram *CUICRendererImpl::GetTextAtlasEntryShader()
+    NVRenderShaderProgram *Qt3DSRendererImpl::GetTextAtlasEntryShader()
     {
         GetProgramGenerator().BeginProgram();
 
@@ -2350,13 +2350,13 @@ namespace render {
         return theShader;
     }
 
-    STextRenderHelper CUICRendererImpl::GetShader(STextRenderable & /*inRenderable*/,
+    STextRenderHelper Qt3DSRendererImpl::GetShader(STextRenderable & /*inRenderable*/,
                                                   bool inUsePathRendering)
     {
         return GetTextShader(inUsePathRendering);
     }
 
-    SLayerSceneShader *CUICRendererImpl::GetSceneLayerShader()
+    SLayerSceneShader *Qt3DSRendererImpl::GetSceneLayerShader()
     {
         if (m_SceneLayerShader.hasValue())
             return m_SceneLayerShader.getValue();
@@ -2399,7 +2399,7 @@ namespace render {
         return m_SceneLayerShader.getValue();
     }
 
-    SLayerProgAABlendShader *CUICRendererImpl::GetLayerProgAABlendShader()
+    SLayerProgAABlendShader *Qt3DSRendererImpl::GetLayerProgAABlendShader()
     {
         if (m_LayerProgAAShader.hasValue())
             return m_LayerProgAAShader.getValue();
@@ -2435,7 +2435,7 @@ namespace render {
         return m_LayerProgAAShader.getValue();
     }
 
-    SShadowmapPreblurShader *CUICRendererImpl::GetCubeShadowBlurXShader()
+    SShadowmapPreblurShader *Qt3DSRendererImpl::GetCubeShadowBlurXShader()
     {
         if (m_CubeShadowBlurXShader.hasValue())
             return m_CubeShadowBlurXShader.getValue();
@@ -2566,7 +2566,7 @@ namespace render {
         return m_CubeShadowBlurXShader.getValue();
     }
 
-    SShadowmapPreblurShader *CUICRendererImpl::GetCubeShadowBlurYShader()
+    SShadowmapPreblurShader *Qt3DSRendererImpl::GetCubeShadowBlurYShader()
     {
         if (m_CubeShadowBlurYShader.hasValue())
             return m_CubeShadowBlurYShader.getValue();
@@ -2697,7 +2697,7 @@ namespace render {
         return m_CubeShadowBlurYShader.getValue();
     }
 
-    SShadowmapPreblurShader *CUICRendererImpl::GetOrthoShadowBlurXShader()
+    SShadowmapPreblurShader *Qt3DSRendererImpl::GetOrthoShadowBlurXShader()
     {
         if (m_OrthoShadowBlurXShader.hasValue())
             return m_OrthoShadowBlurXShader.getValue();
@@ -2740,7 +2740,7 @@ namespace render {
         return m_OrthoShadowBlurXShader.getValue();
     }
 
-    SShadowmapPreblurShader *CUICRendererImpl::GetOrthoShadowBlurYShader()
+    SShadowmapPreblurShader *Qt3DSRendererImpl::GetOrthoShadowBlurYShader()
     {
         if (m_OrthoShadowBlurYShader.hasValue())
             return m_OrthoShadowBlurYShader.getValue();
@@ -2785,7 +2785,7 @@ namespace render {
 
 #ifdef ADVANCED_BLEND_SW_FALLBACK
     SAdvancedModeBlendShader *
-    CUICRendererImpl::GetAdvancedBlendModeShader(AdvancedBlendModes::Enum blendMode)
+    Qt3DSRendererImpl::GetAdvancedBlendModeShader(AdvancedBlendModes::Enum blendMode)
     {
         // Select between blend equations.
         if (blendMode == AdvancedBlendModes::Overlay) {
@@ -2798,7 +2798,7 @@ namespace render {
         return {};
     }
 
-    SAdvancedModeBlendShader *CUICRendererImpl::GetOverlayBlendModeShader()
+    SAdvancedModeBlendShader *Qt3DSRendererImpl::GetOverlayBlendModeShader()
     {
         if (m_AdvancedModeOverlayBlendShader.hasValue())
             return m_AdvancedModeOverlayBlendShader.getValue();
@@ -2862,7 +2862,7 @@ namespace render {
         return m_AdvancedModeOverlayBlendShader.getValue();
     }
 
-    SAdvancedModeBlendShader *CUICRendererImpl::GetColorBurnBlendModeShader()
+    SAdvancedModeBlendShader *Qt3DSRendererImpl::GetColorBurnBlendModeShader()
     {
         if (m_AdvancedModeColorBurnBlendShader.hasValue())
             return m_AdvancedModeColorBurnBlendShader.getValue();
@@ -2925,7 +2925,7 @@ namespace render {
 
     }
 
-    SAdvancedModeBlendShader *CUICRendererImpl::GetColorDodgeBlendModeShader()
+    SAdvancedModeBlendShader *Qt3DSRendererImpl::GetColorDodgeBlendModeShader()
     {
         if (m_AdvancedModeColorDodgeBlendShader.hasValue())
             return m_AdvancedModeColorDodgeBlendShader.getValue();
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
index 2294fd8d..d9fd8b4f 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
@@ -264,9 +264,9 @@ struct SBufferManager : public IBufferManager
             if (inBsdfMipmaps
                 && NVRenderTextureFormats::isUncompressedTextureFormat(inLoadedImage.format)) {
                 theTexture->SetMinFilter(NVRenderTextureMinifyingOp::LinearMipmapLinear);
-                UICRenderPrefilterTexture *theBSDFMipMap = theImage.first->second.m_BSDFMipMap;
+                Qt3DSRenderPrefilterTexture *theBSDFMipMap = theImage.first->second.m_BSDFMipMap;
                 if (theBSDFMipMap == NULL) {
-                    theBSDFMipMap = UICRenderPrefilterTexture::Create(
+                    theBSDFMipMap = Qt3DSRenderPrefilterTexture::Create(
                         m_Context, inLoadedImage.width, inLoadedImage.height, *theTexture,
                         destFormat, m_Context->GetFoundation());
                     theImage.first->second.m_BSDFMipMap = theBSDFMipMap;
@@ -675,7 +675,7 @@ struct SBufferManager : public IBufferManager
         return theMesh.first->second;
     }
 
-    SRenderMesh *CreateMesh(UICBCharPtr inSourcePath, QT3DSU8 *inVertData, QT3DSU32 inNumVerts,
+    SRenderMesh *CreateMesh(Qt3DSBCharPtr inSourcePath, QT3DSU8 *inVertData, QT3DSU32 inNumVerts,
                             QT3DSU32 inVertStride, QT3DSU32 *inIndexData, QT3DSU32 inIndexCount,
                             qt3ds::NVBounds3 inBounds) override
     {
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
index 5ae3f2fa..5df99e3c 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
@@ -410,7 +410,7 @@ static void DecompressDDS(void *inSrc, QT3DSU32 inDataSize, QT3DSU32 inWidth, QT
     }
 }
 
-bool ScanDDSForAlpha(UICDDSImage *dds)
+bool ScanDDSForAlpha(Qt3DSDDSImage *dds)
 {
     bool hasAlpha = false;
     switch (dds->format) {
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
index 6777577e..870ef302 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
@@ -85,7 +85,7 @@ namespace render {
         QImage image;
         QT3DSU32 dataSizeInBytes;
         qt3ds::render::NVRenderTextureFormats::Enum format;
-        UICDDSImage *dds;
+        Qt3DSDDSImage *dds;
         ExtendedTextureFormats::Enum m_ExtendedFormat;
         // Used for palettized images.
         void *m_Palette;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
index 5866aa80..43247224 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
@@ -257,7 +257,7 @@ namespace render {
     }
 
     static void flip_data_vertical(FreeImageIO *io, QT3DSI8 *image, QT3DSI32 width, QT3DSI32 height,
-                                   UICDDSImage *info)
+                                   Qt3DSDDSImage *info)
     {
         if (info->compressed) {
             QT3DSI32 linesize, j;
@@ -333,7 +333,7 @@ namespace render {
         }
     }
 
-    static QT3DSI32 size_image(QT3DSI32 width, QT3DSI32 height, const UICDDSImage *image)
+    static QT3DSI32 size_image(QT3DSI32 width, QT3DSI32 height, const Qt3DSDDSImage *image)
     {
         if (image->compressed) {
             return ((width + 3) / 4) * ((height + 3) / 4)
@@ -343,7 +343,7 @@ namespace render {
         }
     }
 
-    static QT3DSI32 total_image_data_size(UICDDSImage *image)
+    static QT3DSI32 total_image_data_size(Qt3DSDDSImage *image)
     {
         QT3DSI32 i, j, index = 0, size = 0, w, h;
         QT3DSI32 cubeCount = image->cubemap ? 6 : 1;
@@ -372,7 +372,7 @@ namespace render {
         return (size);
     }
 
-    void *UICDDSAllocDataBlock(FreeImageIO *io, UICDDSImage *image)
+    void *Qt3DSDDSAllocDataBlock(FreeImageIO *io, Qt3DSDDSImage *image)
     {
         if (image) {
             QT3DSI32 i;
@@ -404,7 +404,7 @@ namespace render {
         FIBITMAP *dib = NULL;
         DDS_HEADER ddsh;
         QT3DSI8 filecode[4];
-        UICDDSImage *image = NULL;
+        Qt3DSDDSImage *image = NULL;
         bool needsBGRASwap = false;
         ;
         bool isAllreadyFlipped = false;
@@ -416,11 +416,11 @@ namespace render {
                 throw "Invalid DDS file";
             }
 
-            image = (UICDDSImage *)QT3DS_ALLOC(io->m_Allocator, sizeof(UICDDSImage), "DoLoadDDS");
+            image = (Qt3DSDDSImage *)QT3DS_ALLOC(io->m_Allocator, sizeof(Qt3DSDDSImage), "DoLoadDDS");
             if (image == NULL) {
                 throw "Qt3DSDDSImage allocation failed";
             }
-            memset(image, 0, sizeof(UICDDSImage));
+            memset(image, 0, sizeof(Qt3DSDDSImage));
 
             // read in DDS header
             inStream.Read(&ddsh, 1);
@@ -580,7 +580,7 @@ namespace render {
             }
 
             // allocate the meta datablock for all mip storage.
-            UICDDSAllocDataBlock(io, image);
+            Qt3DSDDSAllocDataBlock(io, image);
             if (image->dataBlock == NULL) {
                 throw "Failed to allocate memory for image data storage";
             }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
index 61b56232..97cc77f5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
@@ -47,7 +47,7 @@ namespace render {
             always use NVHHDDSAlloc/NVHHDDSAllocData/NVHHDDSFree to manage them properly.
     */
 
-    struct UICDDSImage
+    struct Qt3DSDDSImage
     {
         /** Width of the overall texture in texels */
         int width;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
index 304bddbc..023964f5 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
@@ -37,9 +37,8 @@
 using namespace qt3ds;
 using namespace qt3ds::render;
 using namespace qt3ds::foundation;
-using namespace qt3ds::render;
 
-UICRenderPrefilterTexture::UICRenderPrefilterTexture(NVRenderContext *inNVRenderContext,
+Qt3DSRenderPrefilterTexture::Qt3DSRenderPrefilterTexture(NVRenderContext *inNVRenderContext,
                                                      QT3DSI32 inWidth, QT3DSI32 inHeight,
                                                      NVRenderTexture2D &inTexture2D,
                                                      NVRenderTextureFormats::Enum inDestFormat,
@@ -61,21 +60,21 @@ UICRenderPrefilterTexture::UICRenderPrefilterTexture(NVRenderContext *inNVRender
     m_NoOfComponent = NVRenderTextureFormats::getNumberOfComponent(m_DestinationFormat);
 }
 
-UICRenderPrefilterTexture *
-UICRenderPrefilterTexture::Create(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight,
+Qt3DSRenderPrefilterTexture *
+Qt3DSRenderPrefilterTexture::Create(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight,
                                   NVRenderTexture2D &inTexture2D,
                                   NVRenderTextureFormats::Enum inDestFormat,
                                   qt3ds::NVFoundationBase &inFnd)
 {
-    UICRenderPrefilterTexture *theBSDFMipMap = NULL;
+    Qt3DSRenderPrefilterTexture *theBSDFMipMap = NULL;
 
     if (inNVRenderContext->IsComputeSupported()) {
-        theBSDFMipMap = QT3DS_NEW(inFnd.getAllocator(), UICRenderPrefilterTextureCompute)(
+        theBSDFMipMap = QT3DS_NEW(inFnd.getAllocator(), Qt3DSRenderPrefilterTextureCompute)(
             inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat, inFnd);
     }
 
     if (!theBSDFMipMap) {
-        theBSDFMipMap = QT3DS_NEW(inFnd.getAllocator(), UICRenderPrefilterTextureCPU)(
+        theBSDFMipMap = QT3DS_NEW(inFnd.getAllocator(), Qt3DSRenderPrefilterTextureCPU)(
             inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat, inFnd);
     }
 
@@ -85,7 +84,7 @@ UICRenderPrefilterTexture::Create(NVRenderContext *inNVRenderContext, QT3DSI32 i
     return theBSDFMipMap;
 }
 
-UICRenderPrefilterTexture::~UICRenderPrefilterTexture()
+Qt3DSRenderPrefilterTexture::~Qt3DSRenderPrefilterTexture()
 {
 }
 
@@ -93,20 +92,20 @@ UICRenderPrefilterTexture::~UICRenderPrefilterTexture()
 // CPU based filtering
 //------------------------------------------------------------------------------------
 
-UICRenderPrefilterTextureCPU::UICRenderPrefilterTextureCPU(
+Qt3DSRenderPrefilterTextureCPU::Qt3DSRenderPrefilterTextureCPU(
     NVRenderContext *inNVRenderContext, int inWidth, int inHeight, NVRenderTexture2D &inTexture2D,
     NVRenderTextureFormats::Enum inDestFormat, NVFoundationBase &inFnd)
-    : UICRenderPrefilterTexture(inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat,
+    : Qt3DSRenderPrefilterTexture(inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat,
                                 inFnd)
 {
 }
 
-inline int UICRenderPrefilterTextureCPU::wrapMod(int a, int base)
+inline int Qt3DSRenderPrefilterTextureCPU::wrapMod(int a, int base)
 {
     return (a >= 0) ? a % base : (a % base) + base;
 }
 
-inline void UICRenderPrefilterTextureCPU::getWrappedCoords(int &sX, int &sY, int width, int height)
+inline void Qt3DSRenderPrefilterTextureCPU::getWrappedCoords(int &sX, int &sY, int width, int height)
 {
     if (sY < 0) {
         sX -= width >> 1;
@@ -120,7 +119,7 @@ inline void UICRenderPrefilterTextureCPU::getWrappedCoords(int &sX, int &sY, int
 }
 
 STextureData
-UICRenderPrefilterTextureCPU::CreateBsdfMipLevel(STextureData &inCurMipLevel,
+Qt3DSRenderPrefilterTextureCPU::CreateBsdfMipLevel(STextureData &inCurMipLevel,
                                                  STextureData &inPrevMipLevel, int width,
                                                  int height) //, IPerfTimer& inPerfTimer )
 {
@@ -198,7 +197,7 @@ UICRenderPrefilterTextureCPU::CreateBsdfMipLevel(STextureData &inCurMipLevel,
     return retval;
 }
 
-void UICRenderPrefilterTextureCPU::Build(void *inTextureData, QT3DSI32 inTextureDataSize,
+void Qt3DSRenderPrefilterTextureCPU::Build(void *inTextureData, QT3DSI32 inTextureDataSize,
                                          NVRenderTextureFormats::Enum inFormat)
 {
 
@@ -417,11 +416,11 @@ static bool isGLESContext(NVRenderContext *context)
 
 #define WORKGROUP_SIZE 16
 
-UICRenderPrefilterTextureCompute::UICRenderPrefilterTextureCompute(
+Qt3DSRenderPrefilterTextureCompute::Qt3DSRenderPrefilterTextureCompute(
     NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight,
     NVRenderTexture2D &inTexture2D, NVRenderTextureFormats::Enum inDestFormat,
     NVFoundationBase &inFnd)
-    : UICRenderPrefilterTexture(inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat,
+    : Qt3DSRenderPrefilterTexture(inNVRenderContext, inWidth, inHeight, inTexture2D, inDestFormat,
                                 inFnd)
     , m_BSDFProgram(NULL)
     , m_UploadProgram_RGBA8(NULL)
@@ -431,7 +430,7 @@ UICRenderPrefilterTextureCompute::UICRenderPrefilterTextureCompute(
 {
 }
 
-UICRenderPrefilterTextureCompute::~UICRenderPrefilterTextureCompute()
+Qt3DSRenderPrefilterTextureCompute::~Qt3DSRenderPrefilterTextureCompute()
 {
     m_UploadProgram_RGB8 = NULL;
     m_UploadProgram_RGBA8 = NULL;
@@ -439,7 +438,7 @@ UICRenderPrefilterTextureCompute::~UICRenderPrefilterTextureCompute()
     m_Level0Tex = NULL;
 }
 
-void UICRenderPrefilterTextureCompute::createComputeProgram(NVRenderContext *context)
+void Qt3DSRenderPrefilterTextureCompute::createComputeProgram(NVRenderContext *context)
 {
     std::string computeProg;
 
@@ -452,7 +451,7 @@ void UICRenderPrefilterTextureCompute::createComputeProgram(NVRenderContext *con
     }
 }
 
-NVRenderShaderProgram *UICRenderPrefilterTextureCompute::getOrCreateUploadComputeProgram(
+NVRenderShaderProgram *Qt3DSRenderPrefilterTextureCompute::getOrCreateUploadComputeProgram(
     NVRenderContext *context, NVRenderTextureFormats::Enum inFormat)
 {
     std::string computeProg;
@@ -482,7 +481,7 @@ NVRenderShaderProgram *UICRenderPrefilterTextureCompute::getOrCreateUploadComput
     }
 }
 
-void UICRenderPrefilterTextureCompute::CreateLevel0Tex(void *inTextureData, QT3DSI32 inTextureDataSize,
+void Qt3DSRenderPrefilterTextureCompute::CreateLevel0Tex(void *inTextureData, QT3DSI32 inTextureDataSize,
                                                        NVRenderTextureFormats::Enum inFormat)
 {
     NVRenderTextureFormats::Enum theFormat = inFormat;
@@ -507,7 +506,7 @@ void UICRenderPrefilterTextureCompute::CreateLevel0Tex(void *inTextureData, QT3D
     }
 }
 
-void UICRenderPrefilterTextureCompute::Build(void *inTextureData, QT3DSI32 inTextureDataSize,
+void Qt3DSRenderPrefilterTextureCompute::Build(void *inTextureData, QT3DSI32 inTextureDataSize,
                                              NVRenderTextureFormats::Enum inFormat)
 {
     bool needMipUpload = (inFormat != m_DestinationFormat);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
index fc72e2fd..e633eb14 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
@@ -40,19 +40,19 @@
 namespace qt3ds {
 namespace render {
 
-    class UICRenderPrefilterTexture : public NVRefCounted
+    class Qt3DSRenderPrefilterTexture : public NVRefCounted
     {
     public:
-        UICRenderPrefilterTexture(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight,
+        Qt3DSRenderPrefilterTexture(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth, QT3DSI32 inHeight,
                                   NVRenderTexture2D &inTexture,
                                   NVRenderTextureFormats::Enum inDestFormat,
                                   qt3ds::NVFoundationBase &inFnd);
-        virtual ~UICRenderPrefilterTexture();
+        virtual ~Qt3DSRenderPrefilterTexture();
 
         virtual void Build(void *inTextureData, QT3DSI32 inTextureDataSize,
                            NVRenderTextureFormats::Enum inFormat) = 0;
 
-        static UICRenderPrefilterTexture *Create(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
+        static Qt3DSRenderPrefilterTexture *Create(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
                                                  QT3DSI32 inHeight, NVRenderTexture2D &inTexture,
                                                  NVRenderTextureFormats::Enum inDestFormat,
                                                  qt3ds::NVFoundationBase &inFnd);
@@ -75,10 +75,10 @@ namespace render {
         NVRenderContext *m_NVRenderContext;
     };
 
-    class UICRenderPrefilterTextureCPU : public UICRenderPrefilterTexture
+    class Qt3DSRenderPrefilterTextureCPU : public Qt3DSRenderPrefilterTexture
     {
     public:
-        UICRenderPrefilterTextureCPU(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
+        Qt3DSRenderPrefilterTextureCPU(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
                                      QT3DSI32 inHeight, NVRenderTexture2D &inTexture,
                                      NVRenderTextureFormats::Enum inDestFormat,
                                      qt3ds::NVFoundationBase &inFnd);
@@ -94,14 +94,14 @@ namespace render {
         void getWrappedCoords(int &sX, int &sY, int width, int height);
     };
 
-    class UICRenderPrefilterTextureCompute : public UICRenderPrefilterTexture
+    class Qt3DSRenderPrefilterTextureCompute : public Qt3DSRenderPrefilterTexture
     {
     public:
-        UICRenderPrefilterTextureCompute(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
+        Qt3DSRenderPrefilterTextureCompute(NVRenderContext *inNVRenderContext, QT3DSI32 inWidth,
                                          QT3DSI32 inHeight, NVRenderTexture2D &inTexture,
                                          NVRenderTextureFormats::Enum inDestFormat,
                                          qt3ds::NVFoundationBase &inFnd);
-        ~UICRenderPrefilterTextureCompute();
+        ~Qt3DSRenderPrefilterTextureCompute();
 
         void Build(void *inTextureData, QT3DSI32 inTextureDataSize,
                    NVRenderTextureFormats::Enum inFormat) override;
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
index 0f6841d0..8eaf36db 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
@@ -152,7 +152,7 @@ struct SOffscreenRunnable : public IRenderTask
 struct SOffscreenRenderManager : public IOffscreenRenderManager
 {
     typedef nvhash_map<SOffscreenRendererKey, SRenderDataReleaser> TRendererMap;
-    IUICRenderContext &m_Context;
+    IQt3DSRenderContext &m_Context;
     NVAllocatorCallback &m_Allocator;
     NVScopedRefCounted<IStringTable> m_StringTable;
     NVScopedRefCounted<IResourceManager> m_ResourceManager;
@@ -163,7 +163,7 @@ struct SOffscreenRenderManager : public IOffscreenRenderManager
     volatile QT3DSI32 mRefCount;
 
     SOffscreenRenderManager(NVAllocatorCallback &inCallback, IStringTable &inStringTable,
-                            IResourceManager &inManager, IUICRenderContext &inContext)
+                            IResourceManager &inManager, IQt3DSRenderContext &inContext)
         : m_Context(inContext)
         , m_Allocator(inCallback)
         , m_StringTable(inStringTable)
@@ -490,7 +490,7 @@ void SOffscreenRunnable::Run()
 
 IOffscreenRenderManager &IOffscreenRenderManager::CreateOffscreenRenderManager(
     NVAllocatorCallback &inCallback, IStringTable &inStringTable, IResourceManager &inManager,
-    IUICRenderContext &inContext)
+    IQt3DSRenderContext &inContext)
 {
     return *QT3DS_NEW(inCallback, SOffscreenRenderManager)(inCallback, inStringTable, inManager,
                                                         inContext);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
index 3c7d262b..76792b3b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
@@ -40,7 +40,7 @@
 namespace qt3ds {
 namespace render {
 
-    COldNBustedPluginRenderer::COldNBustedPluginRenderer(IUICRenderContext &inRenderContext,
+    COldNBustedPluginRenderer::COldNBustedPluginRenderer(IQt3DSRenderContext &inRenderContext,
                                                          long inDLLHandle)
         : m_RenderContext(inRenderContext)
         , m_DLLHandle(inDLLHandle)
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
index aaafa7cd..4b74c511 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
@@ -129,7 +129,7 @@ struct STextAtlasFont
 
 // This class is only for rendering 2D screen aligned text
 // it uses a predefined true type font and character set with various sizes
-struct UICOnscreenTextRenderer : public ITextRenderer
+struct Qt3DSOnscreenTextRenderer : public ITextRenderer
 {
 
     static const QT3DSI32 TEXTURE_ATLAS_DIM =
@@ -144,7 +144,7 @@ private:
     NVScopedRefCounted<STextAtlasFont> m_TextFont;
     QRawFont *m_font;
 public:
-    UICOnscreenTextRenderer(NVFoundationBase &inFoundation)
+    Qt3DSOnscreenTextRenderer(NVFoundationBase &inFoundation)
         : m_Foundation(inFoundation)
         , mRefCount(0)
         , m_TextureAtlasInitialized(false)
@@ -152,7 +152,7 @@ public:
     {
     }
 
-    virtual ~UICOnscreenTextRenderer()
+    virtual ~Qt3DSOnscreenTextRenderer()
     {
     }
 
@@ -415,7 +415,7 @@ public:
 
 ITextRendererCore &ITextRendererCore::CreateOnscreenTextRenderer(NVFoundationBase &inFnd)
 {
-    return *QT3DS_NEW(inFnd.getAllocator(), UICOnscreenTextRenderer)(inFnd);
+    return *QT3DS_NEW(inFnd.getAllocator(), Qt3DSOnscreenTextRenderer)(inFnd);
 }
 
 #endif // QT3DS_RENDER_ONSCREEN_TEXT
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
index 56736886..5e5157aa 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
@@ -58,7 +58,7 @@ using namespace qt3ds::render;
 
 namespace {
 
-struct UICQtTextRenderer : public ITextRenderer
+struct Qt3DSQtTextRenderer : public ITextRenderer
 {
     struct FontInfo
     {
@@ -127,7 +127,7 @@ struct UICQtTextRenderer : public ITextRenderer
     QStringList m_nameFilters;
     qreal m_pixelRatio;
 
-    UICQtTextRenderer(NVFoundationBase &inFoundation, IStringTable &inStrTable)
+    Qt3DSQtTextRenderer(NVFoundationBase &inFoundation, IStringTable &inStrTable)
         : m_foundation(inFoundation)
         , m_stringTable(inStrTable)
         , mRefCount(0)
@@ -145,7 +145,7 @@ struct UICQtTextRenderer : public ITextRenderer
         m_nameFilters << QStringLiteral("*.ttf");
         m_nameFilters << QStringLiteral("*.otf");
     }
-    virtual ~UICQtTextRenderer()
+    virtual ~Qt3DSQtTextRenderer()
     {
         QFontDatabase::removeAllApplicationFonts();
     }
@@ -308,7 +308,7 @@ struct UICQtTextRenderer : public ITextRenderer
 
     static void PreloadThreadCallback(void *inData)
     {
-        UICQtTextRenderer *theRenderer(reinterpret_cast<UICQtTextRenderer *>(inData));
+        Qt3DSQtTextRenderer *theRenderer(reinterpret_cast<Qt3DSQtTextRenderer *>(inData));
         theRenderer->PreloadFonts();
         theRenderer->m_PreloadSync.set();
     }
@@ -605,5 +605,5 @@ struct UICQtTextRenderer : public ITextRenderer
 ITextRendererCore &ITextRendererCore::CreateQtTextRenderer(NVFoundationBase &inFnd,
                                                            IStringTable &inStrTable)
 {
-    return *QT3DS_NEW(inFnd.getAllocator(), UICQtTextRenderer)(inFnd, inStrTable);
+    return *QT3DS_NEW(inFnd.getAllocator(), Qt3DSQtTextRenderer)(inFnd, inStrTable);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
index 2fb3b4a9..602f966a 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
@@ -70,7 +70,7 @@ using namespace qt3ds::render;
 
 namespace {
 
-struct SRenderContextCore : public IUICRenderContextCore
+struct SRenderContextCore : public IQt3DSRenderContextCore
 {
     NVFoundationBase &m_Foundation;
     NVScopedRefCounted<IStringTable> m_StringTable;
@@ -123,7 +123,7 @@ struct SRenderContextCore : public IUICRenderContextCore
     IBufferLoader &GetBufferLoader() override { return *m_BufferLoader; }
     IRenderPluginManagerCore &GetRenderPluginCore() override { return *m_RenderPluginManagerCore; }
     IPathManagerCore &GetPathManagerCore() override { return *m_PathManagerCore; }
-    IUICRenderContext &CreateRenderContext(NVRenderContext &inContext,
+    IQt3DSRenderContext &CreateRenderContext(NVRenderContext &inContext,
                                                    const char8_t *inPrimitivesDirectory) override;
     void SetTextRendererCore(ITextRendererCore &inRenderer) override { m_TextRenderer = inRenderer; }
     ITextRendererCore *GetTextRendererCore() override { return m_TextRenderer.mPtr; }
@@ -201,17 +201,17 @@ struct SPerFrameAllocator : public NVAllocatorCallback
     void deallocate(void *) override {}
 };
 
-struct SRenderContext : public IUICRenderContext
+struct SRenderContext : public IQt3DSRenderContext
 {
     NVScopedRefCounted<NVRenderContext> m_RenderContext;
-    NVScopedRefCounted<IUICRenderContextCore> m_CoreContext;
+    NVScopedRefCounted<IQt3DSRenderContextCore> m_CoreContext;
     NVScopedRefCounted<IStringTable> m_StringTable;
     NVScopedRefCounted<IPerfTimer> m_PerfTimer;
     NVScopedRefCounted<IInputStreamFactory> m_InputStreamFactory;
     NVScopedRefCounted<IBufferManager> m_BufferManager;
     NVScopedRefCounted<IResourceManager> m_ResourceManager;
     NVScopedRefCounted<IOffscreenRenderManager> m_OffscreenRenderManager;
-    NVScopedRefCounted<IUICRenderer> m_Renderer;
+    NVScopedRefCounted<IQt3DSRenderer> m_Renderer;
     NVScopedRefCounted<ITextRenderer> m_TextRenderer;
     NVScopedRefCounted<ITextRenderer> m_OnscreenTextRenderer;
     NVScopedRefCounted<ITextTextureCache> m_TextTextureCache;
@@ -256,7 +256,7 @@ struct SRenderContext : public IUICRenderContext
     QPair<QT3DSF32, int> m_FPS;
     bool m_AuthoringMode;
 
-    SRenderContext(NVRenderContext &ctx, IUICRenderContextCore &inCore,
+    SRenderContext(NVRenderContext &ctx, IQt3DSRenderContextCore &inCore,
                    const char8_t *inApplicationDirectory)
         : m_RenderContext(ctx)
         , m_CoreContext(inCore)
@@ -285,7 +285,7 @@ struct SRenderContext : public IUICRenderContext
     {
         m_OffscreenRenderManager = IOffscreenRenderManager::CreateOffscreenRenderManager(
             ctx.GetAllocator(), *m_StringTable, *m_ResourceManager, *this);
-        m_Renderer = IUICRenderer::CreateRenderer(*this);
+        m_Renderer = IQt3DSRenderer::CreateRenderer(*this);
         if (inApplicationDirectory && *inApplicationDirectory)
             m_InputStreamFactory->AddSearchDirectory(inApplicationDirectory);
 
@@ -361,7 +361,7 @@ struct SRenderContext : public IUICRenderContext
     IStringTable &GetStringTable() override { return *m_StringTable; }
     NVFoundationBase &GetFoundation() override { return m_RenderContext->GetFoundation(); }
     NVAllocatorCallback &GetAllocator() override { return m_RenderContext->GetAllocator(); }
-    IUICRenderer &GetRenderer() override { return *m_Renderer; }
+    IQt3DSRenderer &GetRenderer() override { return *m_Renderer; }
     IBufferManager &GetBufferManager() override { return *m_BufferManager; }
     IResourceManager &GetResourceManager() override { return *m_ResourceManager; }
     NVRenderContext &GetRenderContext() override { return *m_RenderContext; }
@@ -914,7 +914,7 @@ struct SRenderContext : public IUICRenderContext
     }
 };
 
-IUICRenderContext &SRenderContextCore::CreateRenderContext(NVRenderContext &inContext,
+IQt3DSRenderContext &SRenderContextCore::CreateRenderContext(NVRenderContext &inContext,
                                                            const char8_t *inPrimitivesDirectory)
 {
     return *QT3DS_NEW(m_Foundation.getAllocator(), SRenderContext)(inContext, *this,
@@ -922,7 +922,7 @@ IUICRenderContext &SRenderContextCore::CreateRenderContext(NVRenderContext &inCo
 }
 }
 
-IUICRenderContextCore &IUICRenderContextCore::Create(NVFoundationBase &fnd, IStringTable &strt)
+IQt3DSRenderContextCore &IQt3DSRenderContextCore::Create(NVFoundationBase &fnd, IStringTable &strt)
 {
     return *QT3DS_NEW(fnd.getAllocator(), SRenderContextCore)(fnd, strt);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
index 4569407a..0feb8bae 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
@@ -240,7 +240,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator
                                        NVScopedRefCounted<qt3ds::render::NVRenderConstantBuffer>>
         TStrConstanBufMap;
 
-    IUICRenderContext &m_RenderContext;
+    IQt3DSRenderContext &m_RenderContext;
     IShaderProgramGenerator &m_ProgramGenerator;
 
     const SCustomMaterial *m_CurrentMaterial;
@@ -270,7 +270,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator
 
     QT3DSI32 m_RefCount;
 
-    SShaderGenerator(IUICRenderContext &inRc)
+    SShaderGenerator(IQt3DSRenderContext &inRc)
         : m_RenderContext(inRc)
         , m_ProgramGenerator(m_RenderContext.GetShaderProgramGenerator())
         , m_CurrentMaterial(NULL)
@@ -554,7 +554,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator
     void SetGlobalProperties(NVRenderShaderProgram &inProgram, const SLayer & /*inLayer*/
                              ,
                              SCamera &inCamera, QT3DSVec3, NVDataRef<SLight *> inLights,
-                             NVDataRef<QT3DSVec3>, UICShadowMap *inShadowMaps)
+                             NVDataRef<QT3DSVec3>, Qt3DSShadowMap *inShadowMaps)
     {
         SShaderGeneratorGeneratedShader &theShader(GetShaderForProgram(inProgram));
         m_RenderContext.GetRenderContext().SetActiveShader(&inProgram);
@@ -1095,7 +1095,7 @@ struct SShaderGenerator : public ICustomMaterialShaderGenerator
 }
 
 ICustomMaterialShaderGenerator &
-ICustomMaterialShaderGenerator::CreateCustomMaterialShaderGenerator(IUICRenderContext &inRc)
+ICustomMaterialShaderGenerator::CreateCustomMaterialShaderGenerator(IQt3DSRenderContext &inRc)
 {
     return *QT3DS_NEW(inRc.GetAllocator(), SShaderGenerator)(inRc);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
index 215953b8..472fadfd 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
@@ -67,19 +67,19 @@ using qt3ds::render::NVRenderContextScopedProperty;
 using qt3ds::render::NVRenderCachedShaderProperty;
 using qt3ds::render::NVRenderCachedShaderBuffer;
 
-SCustomMaterialVertexPipeline::SCustomMaterialVertexPipeline(IUICRenderContext *inContext,
+SCustomMaterialVertexPipeline::SCustomMaterialVertexPipeline(IQt3DSRenderContext *inContext,
                                                              TessModeValues::Enum inTessMode)
     : SVertexPipelineImpl(
           inContext->GetAllocator(), inContext->GetCustomMaterialShaderGenerator(),
           inContext->GetShaderProgramGenerator(), inContext->GetStringTable(), false)
-    , m_UICContext(inContext)
+    , m_Context(inContext)
     , m_TessMode(TessModeValues::NoTess)
 {
-    if (m_UICContext->GetRenderContext().IsTessellationSupported()) {
+    if (m_Context->GetRenderContext().IsTessellationSupported()) {
         m_TessMode = inTessMode;
     }
 
-    if (m_UICContext->GetRenderContext().IsGeometryStageSupported()
+    if (m_Context->GetRenderContext().IsGeometryStageSupported()
         && m_TessMode != TessModeValues::NoTess) {
         m_Wireframe = inContext->GetWireframeMode();
     }
@@ -946,8 +946,8 @@ struct SMaterialSystem : public ICustomMaterialSystem
         TMaterialLuaContextMap;
     typedef eastl::pair<CRegisteredString, SImage *> TAllocatedImageEntry;
 
-    IUICRenderContextCore &m_CoreContext;
-    IUICRenderContext *m_UICContext;
+    IQt3DSRenderContextCore &m_CoreContext;
+    IQt3DSRenderContext *m_Context;
     mutable qt3ds::render::SPreAllocatedAllocator m_Allocator;
     TStringMaterialMap m_StringMaterialMap;
     TShaderMap m_ShaderMap;
@@ -962,9 +962,9 @@ struct SMaterialSystem : public ICustomMaterialSystem
     QT3DSF32 m_MillisecondsSinceLastFrame;
     QT3DSI32 mRefCount;
 
-    SMaterialSystem(IUICRenderContextCore &ct)
+    SMaterialSystem(IQt3DSRenderContextCore &ct)
         : m_CoreContext(ct)
-        , m_UICContext(NULL)
+        , m_Context(NULL)
         , m_Allocator(ct.GetAllocator())
         , m_StringMaterialMap(ct.GetAllocator(), "SMaterialSystem::m_StringMaterialMap")
         , m_ShaderMap(ct.GetAllocator(), "SMaterialSystem::m_ShaderMap")
@@ -1001,7 +1001,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         // Don't call this on MaterialSystem destroy.
         // This causes issues for scene liftime buffers
         // because the resource manager is destroyed before
-        IResourceManager &theManager(m_UICContext->GetResourceManager());
+        IResourceManager &theManager(m_Context->GetResourceManager());
         SCustomMaterialBuffer &theEntry(m_AllocatedBuffers[inIdx]);
         theEntry.m_FrameBuffer->Attach(NVRenderFrameBufferAttachments::Color0,
                                        NVRenderTextureOrRenderBuffer());
@@ -1257,14 +1257,14 @@ struct SMaterialSystem : public ICustomMaterialSystem
                                      const dynamic::SDynamicShaderProgramFlags &inFlags)
     {
         ICustomMaterialShaderGenerator &theMaterialGenerator(
-            m_UICContext->GetCustomMaterialShaderGenerator());
+            m_Context->GetCustomMaterialShaderGenerator());
 
         // generate key
         CRenderString theShaderKeyBuffer;
         CRegisteredString theKey = GetShaderCacheKey(theShaderKeyBuffer, inCommand.m_ShaderPath,
                                                      inCommand.m_ShaderDefine, inFlags);
 
-        SCustomMaterialVertexPipeline thePipeline(m_UICContext,
+        SCustomMaterialVertexPipeline thePipeline(m_Context,
                                                   inRenderContext.m_Model.m_TessellationMode);
 
         NVRenderShaderProgram *theProgram = theMaterialGenerator.GenerateShader(
@@ -1308,13 +1308,13 @@ struct SMaterialSystem : public ICustomMaterialSystem
         if (theProgram) {
             if (theProgram->GetProgramType() == NVRenderShaderProgram::ProgramType::Graphics) {
                 if (theInsertResult.first->second) {
-                    NVRenderContext &theContext(m_UICContext->GetRenderContext());
+                    NVRenderContext &theContext(m_Context->GetRenderContext());
                     theContext.SetActiveShader(theInsertResult.first->second->m_Shader);
                 }
 
                 return *theInsertResult.first->second;
             } else {
-                NVRenderContext &theContext(m_UICContext->GetRenderContext());
+                NVRenderContext &theContext(m_Context->GetRenderContext());
                 theContext.SetActiveShader(theProgram);
                 return *(static_cast<NVRenderShaderProgram *>(theProgram));
             }
@@ -1333,7 +1333,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         theFlags.SetGeometryShaderEnabled(inRenderContext.m_Subset.m_WireframeMode);
 
         TShaderAndFlags theProgramAndFlags =
-            m_UICContext->GetDynamicObjectSystem().GetShaderProgram(
+            m_Context->GetDynamicObjectSystem().GetShaderProgram(
                 inCommand.m_ShaderPath, inCommand.m_ShaderDefine, inFeatureSet, theFlags);
 
         NVRenderShaderProgram *theProgram = theProgramAndFlags.first;
@@ -1353,13 +1353,13 @@ struct SMaterialSystem : public ICustomMaterialSystem
                 }
 
                 if (theInsertResult.first->second) {
-                    NVRenderContext &theContext(m_UICContext->GetRenderContext());
+                    NVRenderContext &theContext(m_Context->GetRenderContext());
                     theContext.SetActiveShader(theInsertResult.first->second->m_Shader);
                 }
 
                 return *theInsertResult.first->second;
             } else {
-                NVRenderContext &theContext(m_UICContext->GetRenderContext());
+                NVRenderContext &theContext(m_Context->GetRenderContext());
                 theContext.SetActiveShader(theProgram);
                 return *(static_cast<NVRenderShaderProgram *>(theProgram));
             }
@@ -1382,7 +1382,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
                     StaticAssert<sizeof(CRegisteredString)
                                  == sizeof(NVRenderTexture2DPtr)>::valid_expression();
                     CRegisteredString *theStrPtr = reinterpret_cast<CRegisteredString *>(inDataPtr);
-                    IBufferManager &theBufferManager(m_UICContext->GetBufferManager());
+                    IBufferManager &theBufferManager(m_Context->GetBufferManager());
                     NVRenderTexture2D *theTexture = NULL;
 
                     if (theStrPtr->IsValid()) {
@@ -1454,7 +1454,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
 
     void ApplyBlending(const SApplyBlending &inCommand)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
 
         theContext.SetBlendingEnabled(true);
 
@@ -1531,7 +1531,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
                 return;
             }
         } else {
-            NVRenderContext &theContext = m_UICContext->GetRenderContext();
+            NVRenderContext &theContext = m_Context->GetRenderContext();
             // if we allocate a buffer based on the default target use viewport to get the dimension
             NVRenderRect theViewport(theContext.GetViewport());
             theSourceTextureDetails.m_Height = theViewport.m_Height;
@@ -1543,7 +1543,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         NVRenderTextureFormats::Enum theFormat = inCommand.m_Format;
         if (theFormat == NVRenderTextureFormats::Unknown)
             theFormat = theSourceTextureDetails.m_Format;
-        IResourceManager &theResourceManager(m_UICContext->GetResourceManager());
+        IResourceManager &theResourceManager(m_Context->GetResourceManager());
         // size intentionally requiried every loop;
         QT3DSU32 bufferIdx = FindBuffer(inCommand.m_Name);
         if (bufferIdx < m_AllocatedBuffers.size()) {
@@ -1594,7 +1594,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
 
         if (theTexture) {
             STextureDetails theDetails(theTexture->GetTextureDetails());
-            m_UICContext->GetRenderContext().SetViewport(
+            m_Context->GetRenderContext().SetViewport(
                 NVRenderRect(0, 0, (QT3DSU32)theDetails.m_Width, (QT3DSU32)theDetails.m_Height));
             outDestSize = QT3DSVec2((QT3DSF32)theDetails.m_Width, (QT3DSF32)theDetails.m_Height);
             outClearTarget = inCommand.m_NeedsClear;
@@ -1606,7 +1606,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
     void computeScreenCoverage(SCustomMaterialRenderContext &inRenderContext, QT3DSI32 *xMin,
                                QT3DSI32 *yMin, QT3DSI32 *xMax, QT3DSI32 *yMax)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
         TNVBounds2BoxPoints outPoints;
         QT3DSVec4 projMin(QT3DS_MAX_REAL);
         QT3DSVec4 projMax(-QT3DS_MAX_REAL);
@@ -1663,7 +1663,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
     void BlitFramebuffer(SCustomMaterialRenderContext &inRenderContext,
                          const SApplyBlitFramebuffer &inCommand, NVRenderFrameBuffer *inTarget)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
         // we change the read/render targets here
         NVRenderContextScopedProperty<NVRenderFrameBuffer *> __framebuffer(
             theContext, &NVRenderContext::GetRenderTarget, &NVRenderContext::SetRenderTarget);
@@ -1752,7 +1752,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
                     NVRenderFrameBuffer *inFrameBuffer, bool inRenderTargetNeedsClear,
                     NVRenderInputAssembler &inAssembler, QT3DSU32 inCount, QT3DSU32 inOffset)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
         theContext.SetRenderTarget(inFrameBuffer);
 
         QT3DSVec4 clearColor(0.0);
@@ -1764,7 +1764,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         }
 
         ICustomMaterialShaderGenerator &theMaterialGenerator(
-            m_UICContext->GetCustomMaterialShaderGenerator());
+            m_Context->GetCustomMaterialShaderGenerator());
 
         theMaterialGenerator.SetMaterialProperties(
             *inShader.m_Shader, inRenderContext.m_Material, QT3DSVec2(1.0, 1.0),
@@ -1819,7 +1819,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
                                 const SCustomMaterial &inMaterial, SMaterialClass &inClass,
                                 NVRenderFrameBuffer *inTarget, TShaderFeatureSet inFeatureSet)
     {
-        NVRenderContext &theContext = m_UICContext->GetRenderContext();
+        NVRenderContext &theContext = m_Context->GetRenderContext();
         SCustomMaterialShader *theCurrentShader(NULL);
 
         NVRenderFrameBuffer *theCurrentRenderTarget(inTarget);
@@ -2153,20 +2153,20 @@ struct SMaterialSystem : public ICustomMaterialSystem
 
         // Ensure that our overall render context comes back no matter what the client does.
         qt3ds::render::NVRenderContextScopedProperty<qt3ds::render::NVRenderBlendFunctionArgument>
-            __blendFunction(m_UICContext->GetRenderContext(), &NVRenderContext::GetBlendFunction,
+            __blendFunction(m_Context->GetRenderContext(), &NVRenderContext::GetBlendFunction,
                             &NVRenderContext::SetBlendFunction,
                             qt3ds::render::NVRenderBlendFunctionArgument());
         qt3ds::render::NVRenderContextScopedProperty<qt3ds::render::NVRenderBlendEquationArgument>
-            __blendEquation(m_UICContext->GetRenderContext(), &NVRenderContext::GetBlendEquation,
+            __blendEquation(m_Context->GetRenderContext(), &NVRenderContext::GetBlendEquation,
                             &NVRenderContext::SetBlendEquation,
                             qt3ds::render::NVRenderBlendEquationArgument());
 
-        NVRenderContextScopedProperty<bool> theBlendEnabled(m_UICContext->GetRenderContext(),
+        NVRenderContextScopedProperty<bool> theBlendEnabled(m_Context->GetRenderContext(),
                                                             &NVRenderContext::IsBlendingEnabled,
                                                             &NVRenderContext::SetBlendingEnabled);
 
         DoRenderCustomMaterial(inRenderContext, inRenderContext.m_Material, *theClass,
-                               m_UICContext->GetRenderContext().GetRenderTarget(), inFeatureSet);
+                               m_Context->GetRenderContext().GetRenderTarget(), inFeatureSet);
     }
 
     bool RenderDepthPrepass(const QT3DSMat44 &inMVP, const SCustomMaterial &inMaterial,
@@ -2180,7 +2180,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
             const SCommand &theCommand = *theCommands[idx];
             if (theCommand.m_Type == CommandTypes::BindShader) {
                 const SBindShader &theBindCommand = static_cast<const SBindShader &>(theCommand);
-                thePrepassShader = m_UICContext->GetDynamicObjectSystem().GetDepthPrepassShader(
+                thePrepassShader = m_Context->GetDynamicObjectSystem().GetDepthPrepassShader(
                     theBindCommand.m_ShaderPath, CRegisteredString(), TShaderFeatureSet());
             }
         }
@@ -2188,7 +2188,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         if (thePrepassShader.first.mPtr == NULL)
             return false;
 
-        NVRenderContext &theContext = m_UICContext->GetRenderContext();
+        NVRenderContext &theContext = m_Context->GetRenderContext();
         NVRenderShaderProgram &theProgram = *thePrepassShader.first;
         theContext.SetActiveShader(&theProgram);
         theProgram.SetPropertyValue("model_view_projection", inMVP);
@@ -2271,12 +2271,12 @@ struct SMaterialSystem : public ICustomMaterialSystem
         }
     }
 
-    ICustomMaterialSystem &GetCustomMaterialSystem(IUICRenderContext &inContext) override
+    ICustomMaterialSystem &GetCustomMaterialSystem(IQt3DSRenderContext &inContext) override
     {
-        m_UICContext = &inContext;
+        m_Context = &inContext;
 
         // check for fast blits
-        NVRenderContext &theContext = m_UICContext->GetRenderContext();
+        NVRenderContext &theContext = m_Context->GetRenderContext();
         m_UseFastBlits = theContext.GetRenderBackendCap(
             qt3ds::render::NVRenderBackend::NVRenderBackendCaps::FastBlits);
 
@@ -2338,7 +2338,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         lua_register(m_LuaState, "setUniform", LuaSetUniform);
         lua_register(m_LuaState, "invertMatrix", LuaInvertMatrix);
         lua_register(m_LuaState, "getAttribute", LuaGetAttribute);
-        lua_pushboolean(m_LuaState, m_UICContext->IsAuthoringMode() ? 1 : 0);
+        lua_pushboolean(m_LuaState, m_Context->IsAuthoringMode() ? 1 : 0);
         lua_setfield(m_LuaState, LUA_GLOBALSINDEX, "authoring_mode");
     }
 
@@ -2468,7 +2468,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
 
         if (currentContext->m_CurrentShader.IsComputeShader()) {
             NVRenderContext &theContext =
-                currentContext->m_MaterialSystem.m_UICContext->GetRenderContext();
+                currentContext->m_MaterialSystem.m_Context->GetRenderContext();
             theContext.DispatchCompute(&currentContext->m_CurrentShader.ComputeShader(), workgroupX,
                                        workgroupY, workgroupZ);
         }
@@ -2497,7 +2497,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         if (flags == 0)
             flags = (QT3DSU32)qt3ds::render::NVRenderBufferBarrierValues::All;
         NVRenderContext &theContext =
-            currentContext->m_MaterialSystem.m_UICContext->GetRenderContext();
+            currentContext->m_MaterialSystem.m_Context->GetRenderContext();
         theContext.SetMemoryBarrier(qt3ds::render::NVRenderBufferBarrierFlags(flags));
         return 0;
     }
@@ -2513,7 +2513,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
         const char *assemblerIdStr = lua_tostring(inState, 1);
         IStringTable &theStrTable(currentContext->m_MaterialSystem.m_CoreContext.GetStringTable());
         NVRenderContext &theRenderContext =
-            currentContext->m_MaterialSystem.m_UICContext->GetRenderContext();
+            currentContext->m_MaterialSystem.m_Context->GetRenderContext();
         CRegisteredString assemblerId = theStrTable.RegisterStr(assemblerIdStr);
         eastl::pair<TStringAssemblerMap::iterator, bool> inserter =
             currentContext->m_InputAssemblers.insert(
@@ -2627,7 +2627,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
             return 0;
         }
         NVRenderContext &theContext(
-            currentContext->m_MaterialSystem.m_UICContext->GetRenderContext());
+            currentContext->m_MaterialSystem.m_Context->GetRenderContext());
         if (lua_gettop(inState) == 0) {
             theContext.SetBlendingEnabled(false);
         } else {
@@ -2764,7 +2764,7 @@ struct SMaterialSystem : public ICustomMaterialSystem
             return 0;
         }
         CRegisteredString propName =
-            currentContext->m_MaterialSystem.m_UICContext->GetStringTable().RegisterStr(attName);
+            currentContext->m_MaterialSystem.m_Context->GetStringTable().RegisterStr(attName);
         NVConstDataRef<dynamic::SPropertyDefinition> props =
             currentContext->m_Class.m_Class->GetProperties();
         for (QT3DSU32 idx = 0, end = props.size(); idx < end; ++idx) {
@@ -2883,7 +2883,7 @@ bool SMaterialLuaContext::GetOrCreateVertexBuffer(const char *inIdStr, QT3DSU32
         eastl::make_pair(mapKey, NVScopedRefCounted<NVRenderVertexBuffer>()));
     if (inserter.second) {
         inserter.first->second =
-            m_MaterialSystem.m_UICContext->GetRenderContext().CreateVertexBuffer(
+            m_MaterialSystem.m_Context->GetRenderContext().CreateVertexBuffer(
                 qt3ds::render::NVRenderBufferUsageType::Dynamic, inSize, inStride);
     }
     return inserter.second;
@@ -2903,7 +2903,7 @@ NVRenderVertexBuffer *SMaterialLuaContext::GetVertexBuffer(const char *inIdStr)
 }
 
 ICustomMaterialSystemCore &
-ICustomMaterialSystemCore::CreateCustomMaterialSystemCore(IUICRenderContextCore &ctx)
+ICustomMaterialSystemCore::CreateCustomMaterialSystemCore(IQt3DSRenderContextCore &ctx)
 {
     return *QT3DS_NEW(ctx.GetAllocator(), SMaterialSystem)(ctx);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
index 7cd9c62a..7c0c6720 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
@@ -398,12 +398,12 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator
                                        NVScopedRefCounted<qt3ds::render::NVRenderConstantBuffer>>
         TStrConstanBufMap;
 
-    IUICRenderContext &m_RenderContext;
+    IQt3DSRenderContext &m_RenderContext;
     IShaderProgramGenerator &m_ProgramGenerator;
 
     const SDefaultMaterial *m_CurrentMaterial;
     SShaderDefaultMaterialKey *m_CurrentKey;
-    UICShadowMap *m_ShadowMapManager;
+    Qt3DSShadowMap *m_ShadowMapManager;
     IDefaultMaterialVertexPipeline *m_CurrentPipeline;
     TShaderFeatureSet m_CurrentFeatureSet;
     NVDataRef<SLight *> m_Lights;
@@ -453,7 +453,7 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator
 
     QT3DSI32 m_RefCount;
 
-    SShaderGenerator(IUICRenderContext &inRc)
+    SShaderGenerator(IQt3DSRenderContext &inRc)
         : m_RenderContext(inRc)
         , m_ProgramGenerator(m_RenderContext.GetShaderProgramGenerator())
         , m_CurrentMaterial(NULL)
@@ -1694,7 +1694,7 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator
                              ,
                              SCamera &inCamera, QT3DSVec3 inCameraDirection,
                              NVDataRef<SLight *> inLights, NVDataRef<QT3DSVec3> inLightDirections,
-                             UICShadowMap *inShadowMapManager)
+                             Qt3DSShadowMap *inShadowMapManager)
     {
         SShaderGeneratorGeneratedShader &shader(GetShaderForProgram(inProgram));
         m_RenderContext.GetRenderContext().SetActiveShader(&inProgram);
@@ -2060,7 +2060,7 @@ struct SShaderGenerator : public IDefaultMaterialShaderGenerator
 }
 
 IDefaultMaterialShaderGenerator &
-IDefaultMaterialShaderGenerator::CreateDefaultMaterialShaderGenerator(IUICRenderContext &inRc)
+IDefaultMaterialShaderGenerator::CreateDefaultMaterialShaderGenerator(IQt3DSRenderContext &inRc)
 {
     return *QT3DS_NEW(inRc.GetAllocator(), SShaderGenerator)(inRc);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
index a656ce24..1cea27c4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
@@ -611,8 +611,8 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
 {
     NVFoundationBase &m_Foundation;
     mutable qt3ds::render::SPreAllocatedAllocator m_Allocator;
-    IUICRenderContextCore &m_CoreContext;
-    IUICRenderContext *m_UICContext;
+    IQt3DSRenderContextCore &m_CoreContext;
+    IQt3DSRenderContext *m_Context;
     TStringClassMap m_Classes;
     TPathDataMap m_ExpandedFiles;
     CRenderString m_ShaderKeyBuilder;
@@ -628,11 +628,11 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
     mutable Mutex m_PropertyLoadMutex;
     QT3DSI32 mRefCount;
 
-    SDynamicObjectSystemImpl(IUICRenderContextCore &inCore)
+    SDynamicObjectSystemImpl(IQt3DSRenderContextCore &inCore)
         : m_Foundation(inCore.GetFoundation())
         , m_Allocator(inCore.GetAllocator())
         , m_CoreContext(inCore)
-        , m_UICContext(NULL)
+        , m_Context(NULL)
         , m_Classes(inCore.GetAllocator(), "Classes")
         , m_ExpandedFiles(inCore.GetAllocator(), "ExpandedShaderFiles")
         , m_ShaderMap(inCore.GetAllocator(), "ShaderMap")
@@ -994,11 +994,11 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
         CRenderString &theReadBuffer(outShaderData);
         if (theInsert.second) {
 
-            const QString defaultDir = m_UICContext->GetDynamicObjectSystem()
+            const QString defaultDir = m_Context->GetDynamicObjectSystem()
                     .GetShaderCodeLibraryDirectory();
-            const QString platformDir = m_UICContext->GetDynamicObjectSystem()
+            const QString platformDir = m_Context->GetDynamicObjectSystem()
                     .shaderCodeLibraryPlatformDirectory();
-            const QString ver = m_UICContext->GetDynamicObjectSystem()
+            const QString ver = m_Context->GetDynamicObjectSystem()
                     .shaderCodeLibraryVersion();
 
             QString fullPath;
@@ -1247,9 +1247,9 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
         }
     }
 
-    IDynamicObjectSystem &CreateDynamicSystem(IUICRenderContext &rc) override
+    IDynamicObjectSystem &CreateDynamicSystem(IQt3DSRenderContext &rc) override
     {
-        m_UICContext = &rc;
+        m_Context = &rc;
         return *this;
     }
 
@@ -1394,9 +1394,9 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
             m_FragShader.append(inProgramSource);
         }
 
-        IShaderCache &theShaderCache = m_UICContext->GetShaderCache();
+        IShaderCache &theShaderCache = m_Context->GetShaderCache();
 
-        CRegisteredString theKey = m_UICContext->GetStringTable().RegisterStr(
+        CRegisteredString theKey = m_Context->GetStringTable().RegisterStr(
             GetShaderCacheKey(inId, inProgramMacroName, inFlags));
 
         if (inForceCompilation) {
@@ -1432,7 +1432,7 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
             TShaderAndFlags());
         eastl::pair<TShaderMap::iterator, bool> theInsertResult(m_ShaderMap.insert(theInserter));
         if (theInsertResult.second || inForceCompilation) {
-            NVRenderShaderProgram *theProgram = m_UICContext->GetShaderCache().GetProgram(
+            NVRenderShaderProgram *theProgram = m_Context->GetShaderCache().GetProgram(
                 GetShaderCacheKey(inPath, inProgramMacro, inFlags), inFeatureSet);
             SDynamicShaderProgramFlags theFlags(inFlags);
             if (!theProgram || inForceCompilation) {
@@ -1449,7 +1449,7 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
                 } else {
                     CRenderString theShaderBuffer;
                     const char8_t *shaderVersionStr = "#version 430\n";
-                    if ((QT3DSU32)m_UICContext->GetRenderContext().GetRenderContextType()
+                    if ((QT3DSU32)m_Context->GetRenderContext().GetRenderContextType()
                         == NVRenderContextValues::GLES3PLUS)
                         shaderVersionStr = "#version 310 es\n";
                     DoLoadShader(inPath, theShaderBuffer);
@@ -1457,7 +1457,7 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
                     const char8_t *programSource = theShaderBuffer.c_str();
                     QT3DSU32 len = (QT3DSU32)strlen(nonNull(programSource)) + 1;
                     theProgram =
-                        m_UICContext->GetRenderContext()
+                        m_Context->GetRenderContext()
                             .CompileComputeSource(inPath.c_str(),
                                                   NVConstDataRef<QT3DSI8>((QT3DSI8 *)programSource, len))
                             .mShader;
@@ -1483,7 +1483,7 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
         m_ShaderKeyBuilder.append("depthprepass");
 
         CRegisteredString theProgramMacro =
-            m_UICContext->GetStringTable().RegisterStr(m_ShaderKeyBuilder.c_str());
+            m_Context->GetStringTable().RegisterStr(m_ShaderKeyBuilder.c_str());
 
         eastl::pair<const SShaderMapKey, TShaderAndFlags> theInserter(
             SShaderMapKey(TStrStrPair(inPath, theProgramMacro), inFeatureSet, theFlags.m_TessMode,
@@ -1491,18 +1491,18 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
             TShaderAndFlags());
         eastl::pair<TShaderMap::iterator, bool> theInsertResult(m_ShaderMap.insert(theInserter));
         if (theInsertResult.second) {
-            NVRenderShaderProgram *theProgram = m_UICContext->GetShaderCache().GetProgram(
+            NVRenderShaderProgram *theProgram = m_Context->GetShaderCache().GetProgram(
                 GetShaderCacheKey(inPath, theProgramMacro, theFlags), inFeatureSet);
             SDynamicShaderProgramFlags theFlags(theFlags);
             if (!theProgram) {
                 CRenderString theShaderBuffer;
                 const char8_t *geomSource = DoLoadShader(inPath, theShaderBuffer);
                 SShaderVertexCodeGenerator vertexShader(
-                    m_UICContext->GetStringTable(), m_Allocator,
-                    m_UICContext->GetRenderContext().GetRenderContextType());
+                    m_Context->GetStringTable(), m_Allocator,
+                    m_Context->GetRenderContext().GetRenderContextType());
                 SShaderFragmentCodeGenerator fragmentShader(
                     vertexShader, m_Allocator,
-                    m_UICContext->GetRenderContext().GetRenderContextType());
+                    m_Context->GetRenderContext().GetRenderContextType());
 
                 vertexShader.AddAttribute("attr_pos", "vec3");
                 vertexShader.AddUniform("model_view_projection", "mat4");
@@ -1554,7 +1554,7 @@ struct SDynamicObjectSystemImpl : public IDynamicObjectSystem
 }
 
 IDynamicObjectSystemCore &
-IDynamicObjectSystemCore::CreateDynamicSystemCore(IUICRenderContextCore &rc)
+IDynamicObjectSystemCore::CreateDynamicSystemCore(IQt3DSRenderContextCore &rc)
 {
     return *QT3DS_NEW(rc.GetAllocator(), SDynamicObjectSystemImpl)(rc);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
index 3f150c17..f4b4ccfc 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
@@ -304,7 +304,7 @@ namespace render {
     struct SEffectContext
     {
         CRegisteredString m_ClassName;
-        IUICRenderContext &m_Context;
+        IQt3DSRenderContext &m_Context;
         IResourceManager *m_ResourceManager;
         nvvector<SAllocatedBufferEntry> m_AllocatedBuffers;
         nvvector<SAllocatedImageEntry> m_AllocatedImages;
@@ -313,7 +313,7 @@ namespace render {
         nvvector<TNamedImageEntry> m_ImageEntries;
         nvvector<TNamedDataBufferEntry> m_DataBufferEntries;
 
-        SEffectContext(CRegisteredString inName, IUICRenderContext &ctx, IResourceManager *inManager)
+        SEffectContext(CRegisteredString inName, IQt3DSRenderContext &ctx, IResourceManager *inManager)
             : m_ClassName(inName)
             , m_Context(ctx)
             , m_ResourceManager(inManager)
@@ -497,8 +497,8 @@ struct SEffectSystem : public IEffectSystem
     typedef nvhash_map<TStrStrPair, NVScopedRefCounted<SEffectShader>> TShaderMap;
     typedef nvvector<SEffectContext *> TContextList;
 
-    IUICRenderContextCore &m_CoreContext;
-    IUICRenderContext *m_UICContext;
+    IQt3DSRenderContextCore &m_CoreContext;
+    IQt3DSRenderContext *m_Context;
     NVScopedRefCounted<IResourceManager> m_ResourceManager;
     mutable qt3ds::render::SPreAllocatedAllocator m_Allocator;
     // Keep from dual-including headers.
@@ -512,15 +512,15 @@ struct SEffectSystem : public IEffectSystem
     nvvector<NVScopedRefCounted<NVRenderDepthStencilState>> m_DepthStencilStates;
     volatile QT3DSI32 mRefCount;
 
-    SEffectSystem(IUICRenderContextCore &inUICContext)
-        : m_CoreContext(inUICContext)
-        , m_UICContext(NULL)
-        , m_Allocator(inUICContext.GetAllocator())
-        , m_EffectClasses(inUICContext.GetAllocator(), "SEffectSystem::m_EffectClasses")
-        , m_EffectList(inUICContext.GetAllocator(), "SEffectSystem::m_EffectList")
-        , m_Contexts(inUICContext.GetAllocator(), "SEffectSystem::m_Contexts")
-        , m_ShaderMap(inUICContext.GetAllocator(), "SEffectSystem::m_ShaderMap")
-        , m_DepthStencilStates(inUICContext.GetAllocator(), "SEffectSystem::m_DepthStencilStates")
+    SEffectSystem(IQt3DSRenderContextCore &inContext)
+        : m_CoreContext(inContext)
+        , m_Context(NULL)
+        , m_Allocator(inContext.GetAllocator())
+        , m_EffectClasses(inContext.GetAllocator(), "SEffectSystem::m_EffectClasses")
+        , m_EffectList(inContext.GetAllocator(), "SEffectSystem::m_EffectList")
+        , m_Contexts(inContext.GetAllocator(), "SEffectSystem::m_Contexts")
+        , m_ShaderMap(inContext.GetAllocator(), "SEffectSystem::m_ShaderMap")
+        , m_DepthStencilStates(inContext.GetAllocator(), "SEffectSystem::m_DepthStencilStates")
         , mRefCount(0)
     {
     }
@@ -537,7 +537,7 @@ struct SEffectSystem : public IEffectSystem
         if (inEffect.m_Context == NULL) {
             inEffect.m_Context =
                 QT3DS_NEW(m_Allocator, SEffectContext)(inEffect.m_ClassName,
-                                                       *m_UICContext, m_ResourceManager);
+                                                       *m_Context, m_ResourceManager);
             m_Contexts.push_back(inEffect.m_Context);
         }
         return *inEffect.m_Context;
@@ -910,7 +910,7 @@ struct SEffectSystem : public IEffectSystem
 
         if (theDataBuffer == NULL) {
             SEffectContext &theContext(GetEffectContext(inEffect));
-            NVRenderContext &theRenderContext(m_UICContext->GetRenderContext());
+            NVRenderContext &theRenderContext(m_Context->GetRenderContext());
             QT3DSU8 *initialData = (QT3DSU8 *)theContext.m_Context.GetAllocator().allocate(
                 theBufferSize, "SEffectContext::AllocateDataBuffer", __FILE__, __LINE__);
             NVDataRef<QT3DSU8> data((QT3DSU8 *)initialData, theBufferSize);
@@ -987,7 +987,7 @@ struct SEffectSystem : public IEffectSystem
         if (theTexture) {
             SCamera::SetupOrthographicCameraForOffscreenRender(*theTexture, outMVP);
             STextureDetails theDetails(theTexture->GetTextureDetails());
-            m_UICContext->GetRenderContext().SetViewport(
+            m_Context->GetRenderContext().SetViewport(
                 NVRenderRect(0, 0, (QT3DSU32)theDetails.m_Width, (QT3DSU32)theDetails.m_Height));
             outDestSize = QT3DSVec2((QT3DSF32)theDetails.m_Width, (QT3DSF32)theDetails.m_Height);
         }
@@ -1012,7 +1012,7 @@ struct SEffectSystem : public IEffectSystem
 
         if (theInsertResult.second || forceCompilation) {
             NVRenderShaderProgram *theProgram =
-                m_UICContext->GetDynamicObjectSystem()
+                m_Context->GetDynamicObjectSystem()
                     .GetShaderProgram(inCommand.m_ShaderPath, inCommand.m_ShaderDefine,
                                       TShaderFeatureSet(), SDynamicShaderProgramFlags(),
                                       forceCompilation).first;
@@ -1020,7 +1020,7 @@ struct SEffectSystem : public IEffectSystem
                 theInsertResult.first->second = QT3DS_NEW(m_Allocator, SEffectShader)(*theProgram);
         }
         if (theInsertResult.first->second) {
-            NVRenderContext &theContext(m_UICContext->GetRenderContext());
+            NVRenderContext &theContext(m_Context->GetRenderContext());
             theContext.SetActiveShader(theInsertResult.first->second->m_Shader);
         }
 
@@ -1041,9 +1041,9 @@ struct SEffectSystem : public IEffectSystem
                     StaticAssert<sizeof(CRegisteredString)
                                  == sizeof(NVRenderTexture2DPtr)>::valid_expression();
                     CRegisteredString *theStrPtr = reinterpret_cast<CRegisteredString *>(inDataPtr);
-                    IBufferManager &theBufferManager(m_UICContext->GetBufferManager());
+                    IBufferManager &theBufferManager(m_Context->GetBufferManager());
                     IOffscreenRenderManager &theOffscreenRenderer(
-                        m_UICContext->GetOffscreenRenderManager());
+                        m_Context->GetOffscreenRenderManager());
                     bool needsAlphaMultiply = true;
                     NVRenderTexture2D *theTexture = NULL;
                     if (theStrPtr->IsValid()) {
@@ -1142,7 +1142,7 @@ struct SEffectSystem : public IEffectSystem
 
     bool ApplyBlending(const SApplyBlending &inCommand)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
 
         theContext.SetBlendingEnabled(true);
 
@@ -1174,7 +1174,7 @@ struct SEffectSystem : public IEffectSystem
                 if (bufferIdx < theContext.m_AllocatedBuffers.size()) {
                     SAllocatedBufferEntry &theEntry(theContext.m_AllocatedBuffers[bufferIdx]);
                     if (theEntry.m_NeedsClear) {
-                        NVRenderContext &theRenderContext(m_UICContext->GetRenderContext());
+                        NVRenderContext &theRenderContext(m_Context->GetRenderContext());
 
                         theRenderContext.SetRenderTarget(theEntry.m_FrameBuffer);
                         // Note that depth/stencil buffers need an explicit clear in their bind
@@ -1352,7 +1352,7 @@ struct SEffectSystem : public IEffectSystem
                                NVRenderTexture2D *inDepthStencilTexture,
                                const SApplyRenderState &theCommand)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
         QT3DSU32 inState = (QT3DSU32)theCommand.m_RenderState;
         bool inEnable = theCommand.m_Enabled;
 
@@ -1396,7 +1396,7 @@ struct SEffectSystem : public IEffectSystem
                     NVRenderTexture2D *inDepthStencil, Option<SDepthStencil> inDepthStencilCommand,
                     bool drawIndirect)
     {
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
         theContext.SetRenderTarget(inFrameBuffer);
         if (inDepthStencil && inFrameBuffer) {
             inFrameBuffer->Attach(NVRenderFrameBufferAttachments::DepthStencil, *inDepthStencil);
@@ -1447,16 +1447,16 @@ struct SEffectSystem : public IEffectSystem
         inShader.m_FragColorAlphaSettings.Set(QT3DSVec2(1.0f, 0.0f));
         inShader.m_DestSize.Set(inDestSize);
         if (inShader.m_AppFrame.IsValid())
-            inShader.m_AppFrame.Set((QT3DSF32)m_UICContext->GetFrameCount());
+            inShader.m_AppFrame.Set((QT3DSF32)m_Context->GetFrameCount());
         if (inShader.m_FPS.IsValid())
-            inShader.m_FPS.Set((QT3DSF32)m_UICContext->GetFPS().first);
+            inShader.m_FPS.Set((QT3DSF32)m_Context->GetFPS().first);
         if (inShader.m_CameraClipRange.IsValid())
             inShader.m_CameraClipRange.Set(inCameraClipRange);
 
         if (!drawIndirect)
-            m_UICContext->GetRenderer().RenderQuad();
+            m_Context->GetRenderer().RenderQuad();
         else
-            m_UICContext->GetRenderer().RenderPointsIndirect();
+            m_Context->GetRenderer().RenderPointsIndirect();
 
         if (inDepthStencil && inFrameBuffer) {
             inFrameBuffer->Attach(NVRenderFrameBufferAttachments::DepthStencil,
@@ -1473,7 +1473,7 @@ struct SEffectSystem : public IEffectSystem
     {
         // Run through the effect commands and render the effect.
         // NVRenderTexture2D* theCurrentTexture(&inSourceTexture);
-        NVRenderContext &theContext = m_UICContext->GetRenderContext();
+        NVRenderContext &theContext = m_Context->GetRenderContext();
 
         // Context variables that are updated during the course of a pass.
         SEffectTextureData theCurrentSourceTexture(&inSourceTexture, false);
@@ -1544,7 +1544,7 @@ struct SEffectSystem : public IEffectSystem
                     break;
 
                 case CommandTypes::BindTarget: {
-                    m_UICContext->GetRenderContext().SetRenderTarget(inTarget);
+                    m_Context->GetRenderContext().SetRenderTarget(inTarget);
                     theCurrentRenderTarget = inTarget;
                     theMVP = inMVP;
                     theContext.SetViewport(theOriginalViewport);
@@ -1681,8 +1681,8 @@ struct SEffectSystem : public IEffectSystem
         QT3DSMat44 theMVP;
         SCamera::SetupOrthographicCameraForOffscreenRender(inRenderArgument.m_ColorBuffer, theMVP);
         // setup a render target
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
-        IResourceManager &theManager(m_UICContext->GetResourceManager());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
+        IResourceManager &theManager(m_Context->GetResourceManager());
         NVRenderContextScopedProperty<NVRenderFrameBuffer *> __framebuffer(
             theContext, &NVRenderContext::GetRenderTarget, &NVRenderContext::SetRenderTarget);
         STextureDetails theDetails(inRenderArgument.m_ColorBuffer.GetTextureDetails());
@@ -1707,7 +1707,7 @@ struct SEffectSystem : public IEffectSystem
             &NVRenderContext::SetScissorTestEnabled, false);
 
         DoRenderEffect(inRenderArgument.m_Effect, *theClass, inRenderArgument.m_ColorBuffer, theMVP,
-                       m_UICContext->GetRenderContext().GetRenderTarget(), false,
+                       m_Context->GetRenderContext().GetRenderTarget(), false,
                        inRenderArgument.m_DepthTexture, inRenderArgument.m_DepthStencilBuffer,
                        inRenderArgument.m_CameraClipRange);
 
@@ -1727,7 +1727,7 @@ struct SEffectSystem : public IEffectSystem
         }
 
         DoRenderEffect(inRenderArgument.m_Effect, *theClass, inRenderArgument.m_ColorBuffer, inMVP,
-                       m_UICContext->GetRenderContext().GetRenderTarget(),
+                       m_Context->GetRenderContext().GetRenderTarget(),
                        inEnableBlendWhenRenderToTarget, inRenderArgument.m_DepthTexture,
                        inRenderArgument.m_DepthStencilBuffer, inRenderArgument.m_CameraClipRange);
         return true;
@@ -1810,11 +1810,11 @@ struct SEffectSystem : public IEffectSystem
         }
     }
 
-    IEffectSystem &GetEffectSystem(IUICRenderContext &context) override
+    IEffectSystem &GetEffectSystem(IQt3DSRenderContext &context) override
     {
-        m_UICContext = &context;
+        m_Context = &context;
 
-        NVRenderContext &theContext(m_UICContext->GetRenderContext());
+        NVRenderContext &theContext(m_Context->GetRenderContext());
 
         m_ResourceManager = &IResourceManager::CreateResourceManager(theContext);
 
@@ -1839,7 +1839,7 @@ struct SEffectSystem : public IEffectSystem
 };
 }
 
-IEffectSystemCore &IEffectSystemCore::CreateEffectSystemCore(IUICRenderContextCore &inContext)
+IEffectSystemCore &IEffectSystemCore::CreateEffectSystemCore(IQt3DSRenderContextCore &inContext)
 {
     return *QT3DS_NEW(inContext.GetAllocator(), SEffectSystem)(inContext);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
index f99568f6..740d8a71 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
@@ -45,7 +45,6 @@
 #define RECORDED_FRAME_DELAY_MASK 0x0003
 
 using namespace qt3ds::render;
-using namespace qt3ds::render;
 
 namespace {
 
@@ -165,14 +164,14 @@ struct SGpuTimerInfo
     }
 };
 
-class UICRenderGpuProfiler : public IRenderProfiler
+class Qt3DSCRenderGpuProfiler : public IRenderProfiler
 {
     typedef nvhash_map<CRegisteredString, NVScopedRefCounted<SGpuTimerInfo>> TStrGpuTimerInfoMap;
 
 private:
     NVFoundationBase &m_Foundation;
     NVScopedRefCounted<NVRenderContext> m_RenderContext;
-    IUICRenderContext &m_UICContext;
+    IQt3DSRenderContext &m_Context;
     volatile QT3DSI32 mRefCount;
 
     TStrGpuTimerInfoMap m_StrToGpuTimerMap;
@@ -180,11 +179,11 @@ private:
     mutable QT3DSU32 m_VertexCount;
 
 public:
-    UICRenderGpuProfiler(NVFoundationBase &inFoundation, IUICRenderContext &inContext,
+    Qt3DSCRenderGpuProfiler(NVFoundationBase &inFoundation, IQt3DSRenderContext &inContext,
                          NVRenderContext &inRenderContext)
         : m_Foundation(inFoundation)
         , m_RenderContext(inRenderContext)
-        , m_UICContext(inContext)
+        , m_Context(inContext)
         , mRefCount(0)
         , m_StrToGpuTimerMap(inContext.GetAllocator(), "Qt3DSRenderGpuProfiler::m_StrToGpuTimerMap")
         , m_StrToIDVec(inContext.GetAllocator(), "Qt3DSRenderGpuProfiler::m_StrToIDVec")
@@ -192,7 +191,7 @@ public:
     {
     }
 
-    virtual ~UICRenderGpuProfiler() { m_StrToGpuTimerMap.clear(); }
+    virtual ~Qt3DSCRenderGpuProfiler() { m_StrToGpuTimerMap.clear(); }
 
     QT3DS_IMPLEMENT_REF_COUNT_ADDREF_RELEASE(m_Foundation.getAllocator())
 
@@ -205,7 +204,7 @@ public:
                 theGpuTimerData->AddSync();
 
             theGpuTimerData->m_AbsoluteTime = absoluteTime;
-            theGpuTimerData->StartTimerQuery(m_UICContext.GetFrameCount());
+            theGpuTimerData->StartTimerQuery(m_Context.GetFrameCount());
         }
     }
 
@@ -224,7 +223,7 @@ public:
         SGpuTimerInfo *theGpuTimerData = GetGpuTimerInfo(nameID);
 
         if (theGpuTimerData) {
-            time = theGpuTimerData->GetElapsedTimeInMs(m_UICContext.GetFrameCount());
+            time = theGpuTimerData->GetElapsedTimeInMs(m_Context.GetFrameCount());
         }
 
         return time;
@@ -249,7 +248,7 @@ private:
             return const_cast<SGpuTimerInfo *>(theIter->second.mPtr);
 
         SGpuTimerInfo *theGpuTimerData =
-            QT3DS_NEW(m_UICContext.GetAllocator(), SGpuTimerInfo)(m_Foundation);
+            QT3DS_NEW(m_Context.GetAllocator(), SGpuTimerInfo)(m_Foundation);
 
         if (theGpuTimerData) {
             // create queries
@@ -278,8 +277,8 @@ private:
 }
 
 IRenderProfiler &IRenderProfiler::CreateGpuProfiler(NVFoundationBase &inFnd,
-                                                    IUICRenderContext &inContext,
+                                                    IQt3DSRenderContext &inContext,
                                                     NVRenderContext &inRenderContext)
 {
-    return *QT3DS_NEW(inFnd.getAllocator(), UICRenderGpuProfiler)(inFnd, inContext, inRenderContext);
+    return *QT3DS_NEW(inFnd.getAllocator(), Qt3DSCRenderGpuProfiler)(inFnd, inContext, inRenderContext);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
index c2d43e86..d846f039 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
@@ -220,7 +220,7 @@ struct SWriteRemapper
     // traversal.
     void Remap(const SNode *) {}
 #ifdef _INTEGRITYPLATFORM
-    // explicit specialization of class "<unnamed>::SGraphObjectSerializerImpl<uic::render::SCustomMaterial>"
+    // explicit specialization of class "<unnamed>::SGraphObjectSerializerImpl<qt3ds::render::SCustomMaterial>"
     // must precede its first use struct SGraphObjectSerializerImpl<SCustomMaterial>
     template <typename TObjType>
     void Remap(const TObjType *inObj);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
index 2a00761c..6dc5980d 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
@@ -778,8 +778,8 @@ struct SPathManager : public IPathManager
         TPaintedShaderMap;
     typedef nvhash_map<CRegisteredString, TPathBufferPtr> TStringPathBufferMap;
 
-    IUICRenderContextCore &m_CoreContext;
-    IUICRenderContext *m_RenderContext;
+    IQt3DSRenderContextCore &m_CoreContext;
+    IQt3DSRenderContext *m_RenderContext;
     eastl::string m_IdBuilder;
     TPathSubPathBufferHash m_SubPathBuffers;
     TPathBufferHash m_Buffers;
@@ -811,7 +811,7 @@ struct SPathManager : public IPathManager
 
     QT3DSI32 m_RefCount;
 
-    SPathManager(IUICRenderContextCore &inRC)
+    SPathManager(IQt3DSRenderContextCore &inRC)
         : m_CoreContext(inRC)
         , m_RenderContext(NULL)
         , m_SubPathBuffers(inRC.GetAllocator(), "m_SubPathBuffers")
@@ -944,7 +944,7 @@ struct SPathManager : public IPathManager
         return retval;
     }
 
-    IPathManager &OnRenderSystemInitialize(IUICRenderContext &context) override
+    IPathManager &OnRenderSystemInitialize(IQt3DSRenderContext &context) override
     {
         m_RenderContext = &context;
         return *this;
@@ -1942,7 +1942,7 @@ QT3DSVec2 IPathManagerCore::GetAngleDistanceFromControlPoint(QT3DSVec2 inPositio
     return QT3DSVec2(radToDeg(angleRad), distance);
 }
 
-IPathManagerCore &IPathManagerCore::CreatePathManagerCore(IUICRenderContextCore &ctx)
+IPathManagerCore &IPathManagerCore::CreatePathManagerCore(IQt3DSRenderContextCore &ctx)
 {
     return *QT3DS_NEW(ctx.GetAllocator(), SPathManager)(ctx);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
index 343be41f..43f7c0b4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
@@ -89,7 +89,7 @@ struct SPGRectShader
 
 struct SPGRenderer : public IPixelGraphicsRenderer
 {
-    IUICRenderContext &m_RenderContext;
+    IQt3DSRenderContext &m_RenderContext;
     IStringTable &m_StringTable;
     NVScopedRefCounted<NVRenderVertexBuffer> m_QuadVertexBuffer;
     NVScopedRefCounted<NVRenderIndexBuffer> m_QuadIndexBuffer;
@@ -100,7 +100,7 @@ struct SPGRenderer : public IPixelGraphicsRenderer
     SPGRectShader m_RectShader;
     QT3DSI32 mRefCount;
 
-    SPGRenderer(IUICRenderContext &ctx, IStringTable &strt)
+    SPGRenderer(IQt3DSRenderContext &ctx, IStringTable &strt)
         : m_RenderContext(ctx)
         , m_StringTable(strt)
         , m_VertexGenerator(m_StringTable, ctx.GetAllocator(),
@@ -304,7 +304,7 @@ struct SPGRenderer : public IPixelGraphicsRenderer
 };
 }
 
-IPixelGraphicsRenderer &IPixelGraphicsRenderer::CreateRenderer(IUICRenderContext &ctx,
+IPixelGraphicsRenderer &IPixelGraphicsRenderer::CreateRenderer(IQt3DSRenderContext &ctx,
                                                                IStringTable &strt)
 {
     return *QT3DS_NEW(ctx.GetAllocator(), SPGRenderer)(ctx, strt);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
index ffd60eb3..98abb868 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
@@ -63,20 +63,20 @@ typedef struct _RenderPluginSurfaceDescriptionV1
 {
     long m_Width;
     long m_Height;
-    enum EUICRenderPluginDepthTypes m_DepthBuffer;
-    enum EUICRenderPluginTextureTypes m_ColorBuffer;
-    TUICBOOL m_HasStencilBuffer;
+    enum QT3DSRenderPluginDepthTypes m_DepthBuffer;
+    enum QT3DSRenderPluginTextureTypes m_ColorBuffer;
+    TBool m_HasStencilBuffer;
 } TRenderPluginSurfaceDescriptionV1;
 
 typedef TNeedsRenderResult (*TNeedsRenderFunctionV1)(TRenderPluginClassPtr cls,
                                                      TRenderPluginInstancePtr instance,
                                                      TRenderPluginSurfaceDescriptionV1 surface,
-                                                     TUICVec2 presScaleFactor);
+                                                     TVec2 presScaleFactor);
 
 typedef void (*TRenderFunctionV1)(TRenderPluginClassPtr cls, TRenderPluginInstancePtr instance,
                                   TRenderPluginSurfaceDescriptionV1 surface,
-                                  TUICVec2 presScaleFactor,
-                                  EUICRenderPluginColorClearState inClearColorBuffer);
+                                  TVec2 presScaleFactor,
+                                  QT3DSRenderPluginColorClearState inClearColorBuffer);
 
 // End API version 1 definitions
 
@@ -85,22 +85,22 @@ TRenderPluginSurfaceDescription ToCInterface(const SOffscreenRendererEnvironment
     TRenderPluginSurfaceDescription retval;
     retval.m_Width = (long)env.m_Width;
     retval.m_Height = (long)env.m_Height;
-    retval.m_ColorBuffer = static_cast<EUICRenderPluginTextureTypes>(env.m_Format);
-    retval.m_DepthBuffer = static_cast<EUICRenderPluginDepthTypes>(env.m_Depth);
-    retval.m_HasStencilBuffer = env.m_Stencil ? UICTRUE : UICFALSE;
-    retval.m_MSAALevel = EUICRenderPluginMSAALevelNoMSAA;
+    retval.m_ColorBuffer = static_cast<QT3DSRenderPluginTextureTypes>(env.m_Format);
+    retval.m_DepthBuffer = static_cast<QT3DSRenderPluginDepthTypes>(env.m_Depth);
+    retval.m_HasStencilBuffer = env.m_Stencil ? TTRUE : TFALSE;
+    retval.m_MSAALevel = QT3DSRenderPluginMSAALevelNoMSAA;
     // note no supersampling AA support for plugins
     // we fall back to 4xMSAA
     switch (env.m_MSAAMode) {
     case AAModeValues::X2:
-        retval.m_MSAALevel = EUICRenderPluginMSAALevelTwo;
+        retval.m_MSAALevel = QT3DSRenderPluginMSAALevelTwo;
         break;
     case AAModeValues::SSAA:
     case AAModeValues::X4:
-        retval.m_MSAALevel = EUICRenderPluginMSAALevelFour;
+        retval.m_MSAALevel = QT3DSRenderPluginMSAALevelFour;
         break;
     case AAModeValues::X8:
-        retval.m_MSAALevel = EUICRenderPluginMSAALevelEight;
+        retval.m_MSAALevel = QT3DSRenderPluginMSAALevelEight;
         break;
     default:
         QT3DS_ASSERT(false);
@@ -116,29 +116,29 @@ TRenderPluginSurfaceDescriptionV1 ToCInterfaceV1(const SOffscreenRendererEnviron
     TRenderPluginSurfaceDescriptionV1 retval;
     retval.m_Width = (long)env.m_Width;
     retval.m_Height = (long)env.m_Height;
-    retval.m_ColorBuffer = static_cast<EUICRenderPluginTextureTypes>(env.m_Format);
-    retval.m_DepthBuffer = static_cast<EUICRenderPluginDepthTypes>(env.m_Depth);
-    retval.m_HasStencilBuffer = env.m_Stencil ? UICTRUE : UICFALSE;
+    retval.m_ColorBuffer = static_cast<QT3DSRenderPluginTextureTypes>(env.m_Format);
+    retval.m_DepthBuffer = static_cast<QT3DSRenderPluginDepthTypes>(env.m_Depth);
+    retval.m_HasStencilBuffer = env.m_Stencil ? TTRUE : TFALSE;
     return retval;
 }
 
-TUICVec2 ToCInterface(const QT3DSVec2 &item)
+TVec2 ToCInterface(const QT3DSVec2 &item)
 {
-    TUICVec2 retval = { item.x, item.y };
+    TVec2 retval = { item.x, item.y };
     return retval;
 }
 
-EUICRenderPluginColorClearState ToCInterface(SScene::RenderClearCommand inClearCommand)
+QT3DSRenderPluginColorClearState ToCInterface(SScene::RenderClearCommand inClearCommand)
 {
     switch (inClearCommand) {
     case SScene::DoNotClear:
-        return EUICRenderPluginColorClearStateDoNotClear;
+        return QT3DSRenderPluginColorClearStateDoNotClear;
     case SScene::AlwaysClear:
-        return EUICRenderPluginColorClearStateAlwaysClear;
+        return QT3DSRenderPluginColorClearStateAlwaysClear;
     default:
         QT3DS_ASSERT(false); // fallthrough intentional
     case SScene::ClearIsOptional:
-        return EUICRenderPluginColorClearStateClearIsOptional;
+        return QT3DSRenderPluginColorClearStateClearIsOptional;
     };
 }
 
@@ -183,22 +183,22 @@ public:
         retval.m_PropName = inPropName.c_str();
         switch (m_Value.getType()) {
         case RenderPluginPropertyValueTypes::Long: {
-            retval.m_PropertyType = EUICRenderPluginPropertyTypeLong;
+            retval.m_PropertyType = QT3DSRenderPluginPropertyTypeLong;
             long temp = (long)m_Value.getData<QT3DSI32>();
             retval.m_PropertyValue = *reinterpret_cast<void **>(&temp);
         } break;
         case RenderPluginPropertyValueTypes::Float: {
-            retval.m_PropertyType = EUICRenderPluginPropertyTypeFloat;
+            retval.m_PropertyType = QT3DSRenderPluginPropertyTypeFloat;
             float temp = m_Value.getData<QT3DSF32>();
             retval.m_PropertyValue = *reinterpret_cast<void **>(&temp);
         } break;
         case RenderPluginPropertyValueTypes::Boolean: {
-            retval.m_PropertyType = EUICRenderPluginPropertyTypeLong;
-            long temp = m_Value.getData<bool>() ? UICTRUE : UICFALSE;
+            retval.m_PropertyType = QT3DSRenderPluginPropertyTypeLong;
+            long temp = m_Value.getData<bool>() ? TTRUE : TFALSE;
             retval.m_PropertyValue = *reinterpret_cast<void **>(&temp);
         } break;
         case RenderPluginPropertyValueTypes::String: {
-            retval.m_PropertyType = EUICRenderPluginPropertyTypeCharPtr;
+            retval.m_PropertyType = QT3DSRenderPluginPropertyTypeCharPtr;
             const char *temp = m_Value.getData<CRegisteredString>().c_str();
             retval.m_PropertyValue = reinterpret_cast<void *>(const_cast<char *>(temp));
         } break;
@@ -220,46 +220,46 @@ struct IInternalPluginClass : public IRenderPluginClass
     virtual QT3DSI32 GetAPIVersion() = 0;
 };
 
-static NVRenderTextureFormats::Enum ToTextureFormat(EUICRenderPluginTextureTypes inTextureType)
+static NVRenderTextureFormats::Enum ToTextureFormat(QT3DSRenderPluginTextureTypes inTextureType)
 {
     switch (inTextureType) {
     default:
-    case EUICRenderPluginTextureTypeRGBA8:
+    case QT3DSRenderPluginTextureTypeRGBA8:
         return NVRenderTextureFormats::RGBA8;
-    case EUICRenderPluginTextureTypeRGB8:
+    case QT3DSRenderPluginTextureTypeRGB8:
         return NVRenderTextureFormats::RGB8;
-    case EUICRenderPluginTextureTypeRGB565:
+    case QT3DSRenderPluginTextureTypeRGB565:
         return NVRenderTextureFormats::RGB565;
-    case EUICRenderPluginTextureTypeRGBA5551:
+    case QT3DSRenderPluginTextureTypeRGBA5551:
         return NVRenderTextureFormats::RGBA5551;
     }
 }
 
-static OffscreenRendererDepthValues::Enum ToDepthValue(EUICRenderPluginDepthTypes inType)
+static OffscreenRendererDepthValues::Enum ToDepthValue(QT3DSRenderPluginDepthTypes inType)
 {
     switch (inType) {
     default:
-    case EUICRenderPluginDepthTypeDepth16:
+    case QT3DSRenderPluginDepthTypeDepth16:
         return OffscreenRendererDepthValues::Depth16;
-    case EUICRenderPluginDepthTypeDepth24:
+    case QT3DSRenderPluginDepthTypeDepth24:
         return OffscreenRendererDepthValues::Depth24;
-    case EUICRenderPluginDepthTypeDepth32:
+    case QT3DSRenderPluginDepthTypeDepth32:
         return OffscreenRendererDepthValues::Depth32;
     }
 }
 
-static AAModeValues::Enum ToAAMode(EUICRenderPluginMSAALevel inMode)
+static AAModeValues::Enum ToAAMode(QT3DSRenderPluginMSAALevel inMode)
 {
     switch (inMode) {
-    case EUICRenderPluginMSAALevelTwo:
+    case QT3DSRenderPluginMSAALevelTwo:
         return AAModeValues::X2;
-    case EUICRenderPluginMSAALevelFour:
+    case QT3DSRenderPluginMSAALevelFour:
         return AAModeValues::X4;
-    case EUICRenderPluginMSAALevelEight:
+    case QT3DSRenderPluginMSAALevelEight:
         return AAModeValues::X8;
     default:
         QT3DS_ASSERT(false); // fallthrough intentional
-    case EUICRenderPluginMSAALevelNoMSAA:
+    case QT3DSRenderPluginMSAALevelNoMSAA:
         return AAModeValues::NoAA;
     }
 }
@@ -310,7 +310,7 @@ struct InstanceImpl : public IRenderPluginInstance
     SOffscreenRendererEnvironment GetDesiredEnvironment(QT3DSVec2 inPresentationScaleFactor) override
     {
         if (m_Class.QueryInstanceRenderSurface) {
-            EUICRenderPluginMSAALevel theLevel = EUICRenderPluginMSAALevelNoMSAA;
+            QT3DSRenderPluginMSAALevel theLevel = QT3DSRenderPluginMSAALevelNoMSAA;
             TRenderPluginSurfaceDescription desc = m_Class.QueryInstanceRenderSurface(
                 m_Class.m_Class, m_Instance, ToCInterface(inPresentationScaleFactor));
             if (m_Owner->GetAPIVersion() > 1)
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
index 37722a80..63d7cace 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
@@ -294,7 +294,7 @@ struct ShaderCache : public IShaderCache
                 m_InsertStr += "#extension GL_OES_standard_derivatives : disable\n";
         }
 
-        if (IUICRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
+        if (IQt3DSRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
             if (shaderType == ShaderType::TessControl || shaderType == ShaderType::TessEval) {
                 m_InsertStr += "#extension GL_EXT_tessellation_shader : enable\n";
             } else if (shaderType == ShaderType::Geometry) {
@@ -333,7 +333,7 @@ struct ShaderCache : public IShaderCache
         // Don't use shading language version returned by the driver as it might
         // differ from the context version. Instead use the context type to specify
         // the version string.
-        bool isGlES = IUICRenderer::IsGlEsContext(m_RenderContext.GetRenderContextType());
+        bool isGlES = IQt3DSRenderer::IsGlEsContext(m_RenderContext.GetRenderContextType());
         m_InsertStr.clear();
         int minor = m_RenderContext.format().minorVersion();
         QString versionStr;
@@ -368,7 +368,7 @@ struct ShaderCache : public IShaderCache
         m_InsertStr.append(versionStr.toLatin1().data());
 
         if (isGlES) {
-            if (!IUICRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
+            if (!IQt3DSRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
                 if (shaderType == ShaderType::Fragment) {
                     m_InsertStr += "#define fragOutput gl_FragData[0]\n";
                 }
@@ -380,7 +380,7 @@ struct ShaderCache : public IShaderCache
             AddShaderExtensionStrings(shaderType, isGlES);
 
             // add precision qualifier depending on backend
-            if (IUICRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
+            if (IQt3DSRenderer::IsGlEs3Context(m_RenderContext.GetRenderContextType())) {
                 m_InsertStr.append("precision highp float;\n"
                                    "precision highp int;\n");
                 if( m_RenderContext.GetRenderBackendCap(render::NVRenderBackend::NVRenderBackendCaps::gpuShader5) ) {
@@ -404,7 +404,7 @@ struct ShaderCache : public IShaderCache
                     m_InsertStr.append("#define textureLod(s, co, lod) texture2D(s, co)\n");
             }
         } else {
-            if (!IUICRenderer::IsGl2Context(m_RenderContext.GetRenderContextType())) {
+            if (!IQt3DSRenderer::IsGl2Context(m_RenderContext.GetRenderContextType())) {
                 m_InsertStr += "#define texture2D texture\n";
 
                 AddShaderExtensionStrings(shaderType, isGlES);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
index e233e065..173ba431 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
@@ -373,7 +373,7 @@ struct SShaderGeneratedProgramOutput
 
 struct SProgramGenerator : public IShaderProgramGenerator
 {
-    IUICRenderContext &m_UICContext;
+    IQt3DSRenderContext &m_Context;
     SVertexShaderGenerator m_VS;
     STessControlShaderGenerator m_TC;
     STessEvalShaderGenerator m_TE;
@@ -384,8 +384,8 @@ struct SProgramGenerator : public IShaderProgramGenerator
 
     QT3DSI32 m_RefCount;
 
-    SProgramGenerator(IUICRenderContext &inContext)
-        : m_UICContext(inContext)
+    SProgramGenerator(IQt3DSRenderContext &inContext)
+        : m_Context(inContext)
         , m_VS(inContext.GetFoundation(), inContext.GetStringTable())
         , m_TC(inContext.GetFoundation(), inContext.GetStringTable())
         , m_TE(inContext.GetFoundation(), inContext.GetStringTable())
@@ -400,7 +400,7 @@ struct SProgramGenerator : public IShaderProgramGenerator
     {
         atomicDecrement(&m_RefCount);
         if (m_RefCount <= 0) {
-            NVFoundationBase &theFoundation(m_UICContext.GetFoundation());
+            NVFoundationBase &theFoundation(m_Context.GetFoundation());
             NVDelete(theFoundation.getAllocator(), this);
         }
     }
@@ -478,7 +478,7 @@ struct SProgramGenerator : public IShaderProgramGenerator
             return NULL;
         }
 
-        qt3ds::render::IDynamicObjectSystem &theDynamicSystem(m_UICContext.GetDynamicObjectSystem());
+        qt3ds::render::IDynamicObjectSystem &theDynamicSystem(m_Context.GetDynamicObjectSystem());
         SShaderCacheProgramFlags theCacheFlags(inFlags);
         for (QT3DSU32 stageIdx = 0, stageEnd = ShaderGeneratorStages::StageCount; stageIdx < stageEnd;
              ++stageIdx) {
@@ -499,8 +499,8 @@ struct SProgramGenerator : public IShaderProgramGenerator
         const char *geShaderSource = m_GS.m_FinalBuilder.c_str();
         const char *fragmentShaderSource = m_FS.m_FinalBuilder.c_str();
 
-        IShaderCache &theCache = m_UICContext.GetShaderCache();
-        CRegisteredString theCacheKey = m_UICContext.GetStringTable().RegisterStr(inShaderName);
+        IShaderCache &theCache = m_Context.GetShaderCache();
+        CRegisteredString theCacheKey = m_Context.GetStringTable().RegisterStr(inShaderName);
         return theCache.CompileProgram(theCacheKey, vertexShaderSource, fragmentShaderSource,
                                        tcShaderSource, teShaderSource, geShaderSource,
                                        theCacheFlags, inFeatureSet, separableProgram);
@@ -509,7 +509,7 @@ struct SProgramGenerator : public IShaderProgramGenerator
 };
 
 IShaderProgramGenerator &
-IShaderProgramGenerator::CreateProgramGenerator(IUICRenderContext &inContext)
+IShaderProgramGenerator::CreateProgramGenerator(IQt3DSRenderContext &inContext)
 {
     return *QT3DS_NEW(inContext.GetAllocator(), SProgramGenerator)(inContext);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
index 941ce1ac..cfc49d61 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
@@ -39,14 +39,14 @@ using namespace qt3ds::render;
 using qt3ds::render::NVRenderContextScopedProperty;
 using qt3ds::render::NVRenderCachedShaderProperty;
 
-UICShadowMap::UICShadowMap(IUICRenderContext &inContext)
-    : m_UICContext(inContext)
+Qt3DSShadowMap::Qt3DSShadowMap(IQt3DSRenderContext &inContext)
+    : m_Context(inContext)
     , mRefCount(0)
     , m_ShadowMapList(inContext.GetAllocator(), "Qt3DSShadowMap::m_ShadowMapList")
 {
 }
 
-UICShadowMap::~UICShadowMap()
+Qt3DSShadowMap::~Qt3DSShadowMap()
 {
     m_ShadowMapList.clear();
 }
@@ -66,11 +66,11 @@ bool IsDepthFormat(NVRenderTextureFormats::Enum format)
 }
 }
 
-void UICShadowMap::AddShadowMapEntry(QT3DSU32 index, QT3DSU32 width, QT3DSU32 height,
+void Qt3DSShadowMap::AddShadowMapEntry(QT3DSU32 index, QT3DSU32 width, QT3DSU32 height,
                                      NVRenderTextureFormats::Enum format, QT3DSU32 samples,
                                      ShadowMapModes::Enum mode, ShadowFilterValues::Enum filter)
 {
-    IResourceManager &theManager(m_UICContext.GetResourceManager());
+    IResourceManager &theManager(m_Context.GetResourceManager());
     SShadowMapEntry *pEntry = NULL;
 
     if (index < m_ShadowMapList.size())
@@ -200,7 +200,7 @@ void UICShadowMap::AddShadowMapEntry(QT3DSU32 index, QT3DSU32 width, QT3DSU32 he
     }
 }
 
-SShadowMapEntry *UICShadowMap::GetShadowMapEntry(QT3DSU32 index)
+SShadowMapEntry *Qt3DSShadowMap::GetShadowMapEntry(QT3DSU32 index)
 {
     SShadowMapEntry *pEntry = NULL;
 
@@ -213,7 +213,7 @@ SShadowMapEntry *UICShadowMap::GetShadowMapEntry(QT3DSU32 index)
     return NULL;
 }
 
-UICShadowMap *UICShadowMap::Create(IUICRenderContext &inContext)
+Qt3DSShadowMap *Qt3DSShadowMap::Create(IQt3DSRenderContext &inContext)
 {
-    return QT3DS_NEW(inContext.GetFoundation().getAllocator(), UICShadowMap)(inContext);
+    return QT3DS_NEW(inContext.GetFoundation().getAllocator(), Qt3DSShadowMap)(inContext);
 }
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
index 88bd17dd..2ca0bf4b 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
@@ -36,14 +36,14 @@
 namespace qt3ds {
 namespace render {
 
-    SUICRenderPickResult CSubPresentationPickQuery::Pick(const QT3DSVec2 &inMouseCoords,
+    Qt3DSRenderPickResult CSubPresentationPickQuery::Pick(const QT3DSVec2 &inMouseCoords,
                                                          const QT3DSVec2 &inViewportDimensions,
                                                          bool inPickEverything)
     {
         return m_Renderer.DoGraphQueryPick(inMouseCoords, inViewportDimensions, inPickEverything);
     }
 
-    CSubPresentationRenderer::CSubPresentationRenderer(IUICRenderContext &inRenderContext,
+    CSubPresentationRenderer::CSubPresentationRenderer(IQt3DSRenderContext &inRenderContext,
                                                        SPresentation &inPresentation)
         : m_RenderContext(inRenderContext)
         , m_Presentation(inPresentation)
@@ -95,10 +95,10 @@ namespace render {
     }
 
     // You know the viewport dimensions because
-    SUICRenderPickResult CSubPresentationRenderer::DoGraphQueryPick(
+    Qt3DSRenderPickResult CSubPresentationRenderer::DoGraphQueryPick(
         const QT3DSVec2 &inMouseCoords, const QT3DSVec2 &inViewportDimensions, bool inPickEverything)
     {
-        SUICRenderPickResult thePickResult;
+        Qt3DSRenderPickResult thePickResult;
 
         if (m_Presentation.m_Scene && m_Presentation.m_Scene->m_FirstChild) {
             thePickResult = m_RenderContext.GetRenderer().Pick(
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
index 931f27fb..81c1d232 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
@@ -42,7 +42,7 @@ namespace {
 struct STextTextureAtlas : public ITextTextureAtlas
 {
     static const QT3DSI32 TEXTURE_ATLAS_DIM =
-        256; // if you change this you need to adjust UICOnscreenTextRenderer size as well
+        256; // if you change this you need to adjust Qt3DSOnscreenTextRenderer size as well
 
     NVFoundationBase &m_Foundation;
     volatile QT3DSI32 mRefCount;
@@ -88,7 +88,7 @@ struct STextTextureAtlas : public ITextTextureAtlas
             if (m_textureAtlas && count) {
                 m_TextureAtlasInitialized = true;
                 m_textureAtlas->addRef();
-                // if you change the size you need to adjust UICOnscreenTextRenderer too
+                // if you change the size you need to adjust Qt3DSOnscreenTextRenderer too
                 if (m_RenderContext->GetRenderContextType() == NVRenderContextValues::GLES2) {
                     m_textureAtlas->SetTextureData(NVDataRef<QT3DSU8>(), 0, TEXTURE_ATLAS_DIM,
                                                TEXTURE_ATLAS_DIM, NVRenderTextureFormats::RGBA8);
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
index 82379f7b..06d0c2f1 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
@@ -34,7 +34,7 @@
 #include <QSize>
 #include <QOpenGLContext>
 
-Q3DSQmlRender::Q3DSQmlRender(IUICRenderContext &inRenderContext, const char *asset)
+Q3DSQmlRender::Q3DSQmlRender(IQt3DSRenderContext &inRenderContext, const char *asset)
     : m_RenderContext(inRenderContext)
     , m_qmlStreamRenderer(nullptr)
     , m_offscreenRenderType(inRenderContext.GetStringTable().RegisterStr(GetRendererName()))
diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
index c3f4fe65..d8bb164a 100644
--- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
+++ b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
@@ -91,7 +91,7 @@ namespace state {
         // EndPreloadScripts
         // This function is only used for binary loading, eg, .uiab
         // virtual void		BeginPreloadScripts( const eastl::vector<const char*>& inScripts,
-        // uic::render::IThreadPool& inThreadPool, const char* inProjectDir ) = 0;
+        // qt3ds::render::IThreadPool& inThreadPool, const char* inProjectDir ) = 0;
         // This function is blocking if m_LuaState == NULL, which only holds during binary loading
         // virtual void		EndPreloadScripts() = 0;
         // Fast loading support
@@ -116,7 +116,7 @@ namespace state {
         virtual void AddGlobalFunction(const Q3DStudio::CHAR *inFunctionName,
                                        lua_CFunction inFunction) = 0;
         // virtual void
-        // EnableDebugging(uic::state::debugger::IMultiProtocolSocket& socket ) = 0;
+        // EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket& socket ) = 0;
         // virtual void				EnableProfiling() = 0;
         virtual void StepGC() = 0;
     };
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
index 9370b64e..ab363cbf 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
+++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
@@ -1066,7 +1066,7 @@ void CNDDStateEngine::CancelEvent(const char *inCancelId, const char *inMachineI
 
 namespace {
 
-class SUICFNDTimer : public Q3DStudio::ITimeProvider
+class Qt3DSFNDTimer : public Q3DStudio::ITimeProvider
 {
     Q3DStudio::INT64 GetCurrentTimeMicroSeconds() override
     {
@@ -1081,7 +1081,7 @@ class CNDDStateEngineDefault : public qt3ds::state::INDDStateEngine
 public:
     qt3ds::foundation::CAllocator m_Allocator;
     qt3ds::foundation::NVScopedRefCounted<qt3ds::NVFoundation> m_Foundation;
-    SUICFNDTimer m_TimeProvider;
+    Qt3DSFNDTimer m_TimeProvider;
     CNDDStateEngine &m_RealEngine;
 
     CNDDStateEngineDefault()
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
index 7641b313..d54c9579 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
+++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
@@ -617,7 +617,7 @@ struct SLuaEngineImpl : public qt3ds::state::INDDStateLuaEngine
     void SetApplication(qt3ds::state::INDDStateApplication &inApplication) override;
 
     //	virtual void		BeginPreloadScripts( const eastl::vector<const char*>& inScripts,
-    //uic::render::IThreadPool& inThreadPool, const char* inProjectDir );
+    //qt3ds::render::IThreadPool& inThreadPool, const char* inProjectDir );
     //	virtual void		EndPreloadScripts();
     eastl::vector<eastl::string> GetLoadedScripts() override;
 
@@ -628,7 +628,7 @@ struct SLuaEngineImpl : public qt3ds::state::INDDStateLuaEngine
     //CScriptEngineCallFunctionArgRetriever &inArgRetriever );
 
     void AddGlobalFunction(const CHAR *inFunctionName, lua_CFunction inFunction) override;
-    //	virtual void		EnableDebugging(uic::state::debugger::IMultiProtocolSocket& socket
+    //	virtual void		EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket& socket
     //);
     //	virtual void		EnableProfiling();
     void StepGC() override;
@@ -662,7 +662,7 @@ namespace __SLuaEngineImpl_Static_Calls__ {
     //		eastl::string theLuaBinFile = theEngine->m_PreloadProjectDir;
     //		CFileTools::CombineBaseAndRelative( theEngine->m_PreloadProjectDir.c_str(),
     //"binary/compiledlua.bin", theLuaBinFile );
-    //		NVScopedRefCounted<uic::render::IRefCountedInputStream> theBinFile
+    //		NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theBinFile
     //			=
     //theEngine->m_ApplicationCore->GetRuntimeFactoryCore().GetInputStreamFactory().GetStreamForFile(
     //theLuaBinFile.c_str() );
@@ -893,7 +893,7 @@ void SLuaEngineImpl::SetApplication(qt3ds::state::INDDStateApplication &inApplic
 // Starts preloading scripts offline.  This sets m_LuaState to NULL until after EndPreloadScripts to
 // avoid multithreaded lua state access.  Some calls may be queued till EndPreloadScripts
 // void SLuaEngineImpl::BeginPreloadScripts( const eastl::vector<const char*>& inScripts,
-// uic::render::IThreadPool& inThreadPool, const char* inProjDir )
+// qt3ds::render::IThreadPool& inThreadPool, const char* inProjDir )
 //{
 //	m_PreloadScripts.assign( inScripts.begin(), inScripts.end() );
 //	m_PreloadState = m_LuaState;
@@ -1073,18 +1073,18 @@ void SLuaEngineImpl::AddGlobalFunction(const CHAR *inFunctionName, lua_CFunction
     }
 }
 
-// void SLuaEngineImpl::EnableDebugging(uic::state::debugger::IMultiProtocolSocket& socket)
+// void SLuaEngineImpl::EnableDebugging(qt3ds::state::debugger::IMultiProtocolSocket& socket)
 //{
 //	LUA_ENGINE_MULTITHREAD_PROTECT_METHOD;
-//	using namespace uic::state::debugger;
+//	using namespace qt3ds::state::debugger;
 //	QT3DS_ASSERT( m_ApplicationCore );
-//	NVScopedRefCounted<uic::state::debugger::IMultiProtocolSocketStream> theStream
+//	NVScopedRefCounted<qt3ds::state::debugger::IMultiProtocolSocketStream> theStream
 //		= socket.CreateProtocol(
-//uic::state::debugger::ILuaArchitectDebugServer::LuaProtocolName(), 0 );
+//qt3ds::state::debugger::ILuaArchitectDebugServer::LuaProtocolName(), 0 );
 //	m_LuaListener = QT3DS_NEW( m_Foundation.getAllocator(), SLuaEngineListener)( m_Foundation,
 //*this );
 //
-//	m_LuaDebugger = uic::state::debugger::ILuaDebugger::CreateLuaSideDebugger(
+//	m_LuaDebugger = qt3ds::state::debugger::ILuaDebugger::CreateLuaSideDebugger(
 //		  m_ApplicationCore->GetRuntimeFactoryCore().GetFoundation()
 //		, *theStream
 //		, m_LuaState
@@ -1369,7 +1369,7 @@ int SLuaEngineImpl::PCall(int argcount, int retcount, int errorIndex)
 
 // void SLuaEngineImpl::OnBreak()
 //{
-//	uic::state::debugger::IDebugger& theDebugger = m_ApplicationCore->GetStateDebugger();
+//	qt3ds::state::debugger::IDebugger& theDebugger = m_ApplicationCore->GetStateDebugger();
 //	theDebugger.OnExternalBreak();
 //}
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSLuaArchitectDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSLuaArchitectDebugger.cpp
index aa08790c..51cad627 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSLuaArchitectDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSLuaArchitectDebugger.cpp
@@ -41,8 +41,8 @@
 #include "foundation/StringTable.h"
 
 using namespace qt3ds::foundation;
-using namespace uic::state::debugger;
-using namespace uic::state::debugger::lua;
+using namespace qt3ds::state::debugger;
+using namespace qt3ds::state::debugger::lua;
 using namespace qt3ds;
 
 namespace {
@@ -129,7 +129,7 @@ struct SDebugClient : public ILuaArchitectDebugClient,
         return toConstDataRef(m_OutgoingStackTrace.data(), (QT3DSU32)m_OutgoingStackTrace.size());
     }
 
-    virtual uic::state::debugger::SFunctionInfo GetFunctionInfo(SDatamodelFunction &inFunction)
+    virtual qt3ds::state::debugger::SFunctionInfo GetFunctionInfo(SDatamodelFunction &inFunction)
     {
         return m_DataCache->GetFunctionInfo(inFunction);
     }
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp
index 28e34e7d..e15f587d 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSSceneGraphArchitectDebugger.cpp
@@ -41,10 +41,10 @@
 #include "Qt3DSHash.h" //we need to duplicate the hash attribute calls
 #include "EASTL/set.h"
 
-using namespace uic;
-using namespace uic::state;
-using namespace uic::app;
-using namespace uic::state::debugger;
+using namespace qt3ds;
+using namespace qt3ds::state;
+using namespace qt3ds::app;
+using namespace qt3ds::state::debugger;
 
 namespace {
 
@@ -332,7 +332,7 @@ struct SArchitectDebuggerImpl : public ISceneGraphArchitectDebugger
         newValue.m_FormalName = formalName;
         newValue.m_DataType = dtype;
         theEntry.m_AttList.push_back(newValue);
-        theEntry.m_RuntimeValues.push_back(uic::app::SDatamodelValue());
+        theEntry.m_RuntimeValues.push_back(qt3ds::app::SDatamodelValue());
     }
 
     void LoadAppElement(SAppElement &elem, SPresentationEntry &entry)
@@ -565,7 +565,7 @@ struct SArchitectDebuggerImpl : public ISceneGraphArchitectDebugger
 }
 
 ISceneGraphArchitectDebugger &
-ISceneGraphArchitectDebugger::Create(uic::app::IDatamodel &inDatamodel)
+ISceneGraphArchitectDebugger::Create(qt3ds::app::IDatamodel &inDatamodel)
 {
     SArchitectDebuggerImpl &retval =
         *QT3DS_NEW(inDatamodel.GetFoundation().getAllocator(), SArchitectDebuggerImpl)(inDatamodel);
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp
index e57a40bd..83fe016f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateDebuggerMaster.cpp
@@ -32,8 +32,8 @@
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSAtomic.h"
 
-using namespace uic::state;
-using namespace uic::state::debugger;
+using namespace qt3ds::state;
+using namespace qt3ds::state::debugger;
 
 namespace {
 MallocAllocator g_MallocAlloc;
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp
index 06774b86..6891fab0 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditor.cpp
@@ -32,10 +32,10 @@
 #include "Qt3DSStateExecutionContext.h"
 #include "EASTL/sort.h"
 
-using namespace uic::state;
-using namespace uic::state::editor;
+using namespace qt3ds::state;
+using namespace qt3ds::state::editor;
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h
index ddfb5cc9..fc9411d2 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorEditorsImpl.h
@@ -44,7 +44,7 @@
 #include "Qt3DSStateContext.h"
 #include "Qt3DSStateEditorImpl.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
@@ -191,7 +191,7 @@ namespace state {
             virtual IEditor &GetEditor() { return m_Editor; }
         };
 
-#define UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE                                            \
+#define QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE                                            \
     void addRef() { atomicIncrement(&mRefCount); }                                                 \
     void release()                                                                                 \
     {                                                                                              \
@@ -288,7 +288,7 @@ namespace state {
 
             virtual CRegisteredString GetId() const { return m_Data.m_Id; }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -578,7 +578,7 @@ namespace state {
                     m_Editor.GetStateContext().InsertId(m_Data.m_Id, &m_Data);
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -850,7 +850,7 @@ namespace state {
             }
             virtual CRegisteredString GetId() const { return m_Data.m_Id; }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -928,7 +928,7 @@ namespace state {
             }
             virtual CRegisteredString GetId() const { return m_Data.m_Id; }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -1028,7 +1028,7 @@ namespace state {
 
             virtual CRegisteredString GetId() const { return m_Data.m_Id; }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -1136,7 +1136,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -1342,7 +1342,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1373,7 +1373,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1406,7 +1406,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1439,7 +1439,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1471,7 +1471,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1503,7 +1503,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1524,7 +1524,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1557,7 +1557,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1592,7 +1592,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual SExecutableContent &GetContent() { return m_Data; }
             virtual void *GetWrappedObject() { return &m_Data; }
@@ -1626,7 +1626,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
@@ -1661,7 +1661,7 @@ namespace state {
             {
             }
 
-            UICSTATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
+            QT3DS_STATE_EDITOR_OBJECT_IMPLEMENT_ADDREF_RELEASE;
 
             virtual void *GetWrappedObject() { return &m_Data; }
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h
index 13200410..c1a691ee 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorImpl.h
@@ -40,7 +40,7 @@
 #include "Qt3DSStateExecutionTypes.h"
 #include "Qt3DSStateContext.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h
index 3d3004aa..5f06fbdb 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorProperties.h
@@ -27,14 +27,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef UICSTATE_EDITOR_PROPERTIES_H
-#define UICSTATE_EDITOR_PROPERTIES_H
+#ifndef QT3DS_STATE_EDITOR_PROPERTIES_H
+#define QT3DS_STATE_EDITOR_PROPERTIES_H
 #pragma once
 
 #include "Qt3DSStateEditorFoundation.h"
 #include "Qt3DSStateEditorImpl.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp
index cb39349b..1bc0faf7 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.cpp
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #include "Qt3DSStateEditorTransactionImpl.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h
index 2f128b5a..9996c351 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransactionImpl.h
@@ -33,7 +33,7 @@
 #include "Qt3DSStateEditorFoundation.h"
 #include "Qt3DSStateEditorProperties.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp
index bbd16785..7fb4ab9f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.cpp
@@ -31,8 +31,8 @@
 
 namespace {
 
-using namespace uic::state::editor;
-using namespace uic::state;
+using namespace qt3ds::state::editor;
+using namespace qt3ds::state;
 
 bool inBounds(QT3DSF32 item, QT3DSF32 lower, QT3DSF32 upper)
 {
@@ -97,7 +97,7 @@ inline bool RectDiffers(const Option<SRect> &inLhs, const SRect &inRhs)
 }
 }
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h
index 8d269de4..bacf60f2 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSStateEditorTransitionPath.h
@@ -35,7 +35,7 @@
 #include "EASTL/vector.h"
 #include "foundation/Qt3DSOption.h"
 
-namespace uic {
+namespace qt3ds {
 namespace state {
     namespace editor {
 
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp
index ce9b99aa..b07caad7 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/Qt3DSUIADatamodel.cpp
@@ -42,10 +42,10 @@
 #include "foundation/StringConversionImpl.h"
 #include "Qt3DSDMStringTable.h"
 
-using namespace uic::app;
-using uic::render::IInputStreamFactory;
+using namespace qt3ds::app;
+using qt3ds::render::IInputStreamFactory;
 
-namespace uic {
+namespace qt3ds {
 namespace app {
 
     struct ElementSubTypes
@@ -1347,8 +1347,8 @@ struct DatamodelImpl : public IDatamodel,
         }
     };
 
-    static const char *GetUICNamespace() { return "http://qt.io/qt3dstudio/uia"; }
-    static const char *GetOldUICNamespace() { return "http://qt.io/qt3dstudio/uicomposer"; }
+    static const char *GetNamespace() { return "http://qt.io/qt3dstudio/uia"; }
+    static const char *GetOldNamespace() { return "http://qt.io/qt3dstudio/uicomposer"; }
 
     void LoadUIADatabase()
     {
@@ -1397,9 +1397,9 @@ struct DatamodelImpl : public IDatamodel,
             CDOMSerializer::Read(*theFactory, inStream, &theXmlErrorWriter);
         if (parseResult.second != NULL) {
             qt3ds::foundation::CRegisteredString theRegisteredOldNamespace =
-                m_StringTable->RegisterStr(GetOldUICNamespace());
+                m_StringTable->RegisterStr(GetOldNamespace());
             qt3ds::foundation::CRegisteredString theRegisteredNamespace =
-                m_StringTable->RegisterStr(GetUICNamespace());
+                m_StringTable->RegisterStr(GetNamespace());
 
             ReplaceDOMNamespace(*parseResult.second, theRegisteredOldNamespace,
                                 theRegisteredNamespace);
@@ -1416,12 +1416,12 @@ struct DatamodelImpl : public IDatamodel,
 
         if (m_UIADocument.first.mPtr == NULL) {
             m_UIADocument = IDOMWriter::CreateDOMWriter(m_Foundation->getAllocator(), "application",
-                                                        m_StringTable, GetUICNamespace());
+                                                        m_StringTable, GetNamespace());
             m_Dirty = true;
         }
         if (m_UIANamespaces.empty())
             m_UIANamespaces.push_back(
-                SNamespacePair(m_StringTable->RegisterStr(GetUICNamespace())));
+                SNamespacePair(m_StringTable->RegisterStr(GetNamespace())));
 
         {
             NVScopedReleasable<Q3DStudio::IRuntimeMetaData> theMetaData(
@@ -1597,7 +1597,7 @@ struct DatamodelImpl : public IDatamodel,
         // Get an ID for the editor
         IDOMReader::Scope __appScope(*m_UIADocument.second);
         if (!m_UIADocument.second->MoveToFirstChild("assets")) {
-            m_UIADocument.first->Begin("assets", GetUICNamespace());
+            m_UIADocument.first->Begin("assets", GetNamespace());
         }
 
         {
@@ -1619,8 +1619,8 @@ struct DatamodelImpl : public IDatamodel,
 
         eastl::string dirname, fname, extension;
         CFileTools::Split(normalizedPath.c_str(), dirname, fname, extension);
-        m_UIADocument.first->Begin("statemachine", GetUICNamespace());
-        m_UIADocument.first->Att("id", fname.c_str(), GetUICNamespace());
+        m_UIADocument.first->Begin("statemachine", GetNamespace());
+        m_UIADocument.first->Att("id", fname.c_str(), GetNamespace());
         eastl::string relativePath;
         CFileTools::GetRelativeFromBase(appDir, normalizedPath, relativePath);
         m_UIADocument.first->Att("src", relativePath.c_str());
@@ -2087,12 +2087,12 @@ struct DatamodelImpl : public IDatamodel,
             break;
         }
         if (!isTrivial(elemName))
-            inWriter.Begin(elemName, GetUICNamespace());
+            inWriter.Begin(elemName, GetNamespace());
 
         eastl::vector<SPropertyDeclaration> properties;
         for (size_t idx = 0, end = inEntry->m_Editors.size(); idx < end; ++idx) {
             TObjPtr editor(inEntry->m_Editors[idx]);
-            IDOMWriter::Scope __contentScope(inWriter, editor->TypeName(), GetUICNamespace());
+            IDOMWriter::Scope __contentScope(inWriter, editor->TypeName(), GetNamespace());
             editor->GetProperties(properties);
             bool theNoProperty = true;
             for (size_t idx = 0, end = properties.size(); idx < end; ++idx) {
@@ -2100,12 +2100,12 @@ struct DatamodelImpl : public IDatamodel,
                     editor->GetPropertyValue(properties[idx].m_Name)->getData<TEditorStr>();
                 if (theProp.empty() == false) {
                     inWriter.Att(properties[idx].m_Name.c_str(), theProp.c_str(),
-                                 GetUICNamespace());
+                                 GetNamespace());
                     theNoProperty = false;
                 }
             }
             if (theNoProperty && properties.size() > 0)
-                inWriter.Att(properties[0].m_Name.c_str(), "", GetUICNamespace());
+                inWriter.Att(properties[0].m_Name.c_str(), "", GetNamespace());
         }
 
         if (!isTrivial(elemName))
@@ -2119,7 +2119,7 @@ struct DatamodelImpl : public IDatamodel,
         if (AreEqual(typeName, "transition"))
             stateName = "transition";
         eastl::string tempAtt;
-        IDOMWriter::Scope __stateScope(writer, stateName, GetUICNamespace());
+        IDOMWriter::Scope __stateScope(writer, stateName, GetNamespace());
         tempAtt.assign("#");
         tempAtt.append(id);
         writer.Att("ref", tempAtt.c_str());
@@ -2135,7 +2135,7 @@ struct DatamodelImpl : public IDatamodel,
             IDOMFactory::CreateDOMFactory(m_Foundation->getAllocator(), m_StringTable));
         NVScopedRefCounted<IDOMWriter> outgoingDoc =
             IDOMWriter::CreateDOMWriter(m_Foundation->getAllocator(), "application", m_StringTable,
-                                        GetUICNamespace())
+                                        GetNamespace())
                 .first;
         {
             m_UIADocument.second->MoveToFirstChild("application");
@@ -2162,11 +2162,11 @@ struct DatamodelImpl : public IDatamodel,
                     QT3DS_ASSERT(false);
                     return false;
                 }
-                IDOMWriter::Scope __machineScope(*outgoingDoc, "statemachine", GetUICNamespace());
+                IDOMWriter::Scope __machineScope(*outgoingDoc, "statemachine", GetNamespace());
                 tempAtt.assign("#");
                 tempAtt.append(iter->first);
                 outgoingDoc->Att("ref", tempAtt.c_str());
-                IDOMWriter::Scope __vsScope(*outgoingDoc, "visual-states", GetUICNamespace());
+                IDOMWriter::Scope __vsScope(*outgoingDoc, "visual-states", GetNamespace());
                 const TIdEntryExitMap &itemMap = iter->second;
                 for (TIdEntryExitMap::const_iterator stateIter = itemMap.begin(),
                                                      stateEnd = itemMap.end();
@@ -2347,7 +2347,7 @@ struct DatamodelImpl : public IDatamodel,
     virtual void OnCopy(TEditorPtr inEditor, eastl::vector<SStateNode *> &ioCopiedRoots,
                         IDOMWriter &ioWriter, eastl::vector<SNamespacePair> &ioNamespaces)
     {
-        ioNamespaces.push_back(SNamespacePair(m_StringTable->RegisterStr(GetUICNamespace()),
+        ioNamespaces.push_back(SNamespacePair(m_StringTable->RegisterStr(GetNamespace()),
                                               m_StringTable->RegisterStr("uia")));
         eastl::vector<SEditorEntry>::iterator entry =
             eastl::find_if(m_Editors.begin(), m_Editors.end(), SEditorFinder(inEditor));
@@ -2356,7 +2356,7 @@ struct DatamodelImpl : public IDatamodel,
         TIdStateMapMap::iterator mapEntry = m_IdToStateMaps.find(entry->m_Id);
         if (mapEntry == m_IdToStateMaps.end())
             return;
-        IDOMWriter::Scope __modelScope(ioWriter, "datamodel_fragment", GetUICNamespace());
+        IDOMWriter::Scope __modelScope(ioWriter, "datamodel_fragment", GetNamespace());
         for (size_t idx = 0, end = ioCopiedRoots.size(); idx < end; ++idx) {
             CopyStateNode(*ioCopiedRoots[idx], mapEntry->second, ioWriter);
         }
@@ -2502,7 +2502,7 @@ struct DatamodelImpl : public IDatamodel,
 };
 }
 
-IDatamodel &IDatamodel::Create(uic::state::editor::TFoundationPtr inFoundation,
+IDatamodel &IDatamodel::Create(qt3ds::state::editor::TFoundationPtr inFoundation,
                                const TEditorStr &inPath, const TEditorStr &inAppDir,
                                IStateMachineEditorManager &inStateMachineEditorManager,
                                IInStream *inStream)
@@ -2512,7 +2512,7 @@ IDatamodel &IDatamodel::Create(uic::state::editor::TFoundationPtr inFoundation,
                               inStream);
 }
 
-IDatamodel &IDatamodel::Create(uic::state::editor::TFoundationPtr inFoundation,
+IDatamodel &IDatamodel::Create(qt3ds::state::editor::TFoundationPtr inFoundation,
                                const TEditorStr &inPath, const TEditorStr &inAppDir,
                                IStateMachineEditorManager &inStateMachineEditorManager,
                                IStringTable &inStringTable, IInStream *inStream)
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
index 628b481f..41e759fb 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
@@ -353,17 +353,17 @@ namespace state {
         SScript *m_Script;
         SSCXMLFlags m_Flags;
         SDataModel *m_DataModel;
-        QT3DSI32 m_UICVersion;
+        QT3DSI32 m_Version;
         const char8_t *m_Filename;
         const char8_t *m_InitialExpr;
 
-        static QT3DSI32 GetCurrentUICVersion() { return 1; }
+        static QT3DSI32 GetCurrentVersion() { return 1; }
         SSCXML()
             : SStateNode(StateNodeTypes::SCXML)
             , m_Initial(NULL)
             , m_Script(NULL)
             , m_DataModel(NULL)
-            , m_UICVersion(GetCurrentUICVersion())
+            , m_Version(GetCurrentVersion())
             , m_InitialExpr(NULL)
         {
         }
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
index 5a1d787e..44f3242f 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
@@ -165,7 +165,7 @@ struct SParseContext
     TExternalTransitionList m_ExternalTransitions;
     CRegisteredString m_SCXMLNamespace;
     CRegisteredString m_StudioNamespace;
-    QT3DSI32 m_UICVersion;
+    QT3DSI32 m_Version;
 
     SParseContext(NVAllocatorCallback &inGraphAlloc, NVFoundationBase &inFnd, IDOMReader &inReader,
                   IStateContext &inCtx, IStringTable &inStrTable, IEditor *inEditor)
@@ -181,7 +181,7 @@ struct SParseContext
         , m_SendReferences(inFnd.getAllocator(), "m_StrReferences")
         , m_GenerateIdList(inFnd.getAllocator(), "m_GenerateIdList")
         , m_ExternalTransitions(inFnd.getAllocator(), "m_ExternalTransitions")
-        , m_UICVersion(SSCXML::GetCurrentUICVersion())
+        , m_Version(SSCXML::GetCurrentVersion())
     {
 #define HANDLE_XML_ELEMENT_NAME(nm) m_Names[SXMLName::e##nm] = inStrTable.RegisterStr(#nm);
         ITERATE_XML_ELEMENT_NAMES
@@ -743,7 +743,7 @@ struct SParseContext
 
         retval->m_Condition = ParseStrAtt("cond");
         // Position and such is only valid for transitions after UIC version 0.
-        if (m_UICVersion > 0) {
+        if (m_Version > 0) {
             QT3DSVec2 endPos;
             if (ParseVec2Att("end_position", endPos))
                 retval->SetEndPosition(endPos);
@@ -1033,11 +1033,11 @@ struct SParseContext
         ParseStrAtt("name", retval->m_Name);
         const char8_t *uicVersion;
         if (!m_Reader.UnregisteredAtt("version", uicVersion, GetStudioStateNamespace()))
-            retval->m_UICVersion = 0;
+            retval->m_Version = 0;
         else {
-            StringConversion<QT3DSI32>().StrTo(uicVersion, retval->m_UICVersion);
+            StringConversion<QT3DSI32>().StrTo(uicVersion, retval->m_Version);
         }
-        m_UICVersion = retval->m_UICVersion;
+        m_Version = retval->m_Version;
         const char8_t *desc;
         if (m_Editor && m_Reader.UnregisteredAtt("description", desc))
             m_Editor->GetOrCreate(*retval)->SetPropertyValue("description", desc);
@@ -1239,12 +1239,12 @@ struct SWriteContext
         m_Writer.Att(inName, (const char8_t *)m_Buffer.begin(), GetStudioStateNamespace());
     }
 
-    void WriteEditorAttributes(void *inType, bool inUICId, bool inAdjustPos = false)
+    void WriteEditorAttributes(void *inType, bool idId, bool inAdjustPos = false)
     {
         if (m_Editor) {
             TObjPtr editorObj = m_Editor->GetEditor(inType);
             if (editorObj != NULL) {
-                if (inUICId) {
+                if (idId) {
                     eastl::string name = editorObj->GetId();
                     if (name.empty() == false)
                         m_Writer.Att("id", name.c_str(), GetStudioStateNamespace());
@@ -1664,7 +1664,7 @@ struct SWriteContext
         if (item.m_Flags.IsLateBinding())
             Att("binding", "late");
         Att("version", "1");
-        m_Writer.Att("version", SSCXML::GetCurrentUICVersion(), GetStudioStateNamespace());
+        m_Writer.Att("version", SSCXML::GetCurrentVersion(), GetStudioStateNamespace());
 
         if (!isTrivial(item.m_InitialExpr)) {
             m_Writer.Att("initialexpr", item.m_InitialExpr, GetStudioStateNamespace());
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
index 4843286f..ba1989f2 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
@@ -44,7 +44,7 @@
 #include "foundation/Qt3DSInvasiveSet.h"
 #include "Qt3DSMetadata.h"
 
-// The uic runtime element system contains the element graph and the data in the element
+// The qt3ds runtime element system contains the element graph and the data in the element
 // graph.
 
 namespace Q3DStudio {
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
index 3e635764..354b6a38 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef UICQMLELEMENTHELPER_H
-#define UICQMLELEMENTHELPER_H
+#ifndef QT3DS_QML_ELEMENT_HELPER_H
+#define QT3DS_QML_ELEMENT_HELPER_H
 
 #include "Qt3DSApplication.h"
 #include "Qt3DSPresentation.h"
@@ -62,4 +62,4 @@ public: // Lua Global Functions
 };
 }
 
-#endif // UICQMLELEMENTHELPER_H
+#endif // QT3DS_QML_ELEMENT_HELPER_H
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h b/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
index 0a017d22..94c1798b 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
@@ -38,8 +38,8 @@
 namespace qt3ds {
 namespace render {
     class IInputStreamFactory;
-    class IUICRenderContext;
-    class IUICRenderContextCore;
+    class IQt3DSRenderContext;
+    class IQt3DSRenderContextCore;
 }
 }
 
@@ -102,7 +102,7 @@ public:
     virtual ISceneBinaryLoader &GetSceneLoader() = 0;
     virtual IScriptBridge &GetScriptEngine() = 0;
     virtual IScriptBridge &GetScriptEngineQml() = 0;
-    virtual qt3ds::render::IUICRenderContextCore &GetUICRenderContextCore() = 0;
+    virtual qt3ds::render::IQt3DSRenderContextCore &GetRenderContextCore() = 0;
     virtual qt3ds::render::IInputStreamFactory &GetInputStreamFactory() = 0;
     virtual qt3ds::state::IVisualStateContext &GetVisualStateContext() = 0;
     virtual qt3ds::evt::IEventSystem &GetEventSystem() = 0;
@@ -129,7 +129,7 @@ protected:
     //==============================================================================
 public:
     virtual ISceneManager &GetSceneManager() = 0;
-    virtual qt3ds::render::IUICRenderContext &GetUICRenderContext() = 0;
+    virtual qt3ds::render::IQt3DSRenderContext &GetQt3DSRenderContext() = 0;
     virtual qt3ds::runtime::IApplication *GetApplication() = 0;
     virtual void SetApplication(qt3ds::runtime::IApplication *app) = 0;
 };
diff --git a/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
index 0e40db9e..079e67ed 100644
--- a/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
@@ -49,7 +49,7 @@ namespace foundation {
 
 namespace qt3ds {
 namespace render {
-    class IUICRenderContextCore;
+    class IQt3DSRenderContextCore;
     class ILoadedBuffer;
 }
 }
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
index 08e172e2..d1dfbd8e 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
@@ -995,7 +995,7 @@ struct SApp : public IApplication
                 * (1.0 / 100000);
         if (floor(m_FrameTimer.GetElapsedSeconds()) > 0.0f) {
             QPair<QT3DSF32, int> fps = m_FrameTimer.GetFPS(m_FrameCount);
-            m_RuntimeFactory->GetUICRenderContext().SetFPS(fps);
+            m_RuntimeFactory->GetQt3DSRenderContext().SetFPS(fps);
             if (m_ProfileLogging || !m_HideFPS) {
                 qCInfo(PERF_INFO, "Render Statistics: %3.2ffps, frame count %d",
                        fps.first, fps.second);
@@ -1049,7 +1049,7 @@ struct SApp : public IApplication
         // Check if the file event exists
         eastl::string fullPath;
         NVScopedRefCounted<qt3ds::render::IRefCountedInputStream> theStream
-                = m_CoreFactory->GetUICRenderContextCore().GetInputStreamFactory().GetStreamForFile(
+                = m_CoreFactory->GetRenderContextCore().GetInputStreamFactory().GetStreamForFile(
                     theFile.c_str());
         if (theStream) {
             theStream = NULL;
@@ -1285,12 +1285,12 @@ struct SApp : public IApplication
 
         NVFoundationBase &fnd(m_CoreFactory->GetFoundation());
 
-        if (m_CoreFactory->GetUICRenderContextCore().GetTextRendererCore()) {
-            m_CoreFactory->GetUICRenderContextCore().GetTextRendererCore()->AddProjectFontDirectory(
+        if (m_CoreFactory->GetRenderContextCore().GetTextRendererCore()) {
+            m_CoreFactory->GetRenderContextCore().GetTextRendererCore()->AddProjectFontDirectory(
                         projectDirectory.c_str());
-            m_CoreFactory->GetUICRenderContextCore().GetTextRendererCore()->BeginPreloadFonts(
-                        m_CoreFactory->GetUICRenderContextCore().GetThreadPool(),
-                        m_CoreFactory->GetUICRenderContextCore().GetPerfTimer());
+            m_CoreFactory->GetRenderContextCore().GetTextRendererCore()->BeginPreloadFonts(
+                        m_CoreFactory->GetRenderContextCore().GetThreadPool(),
+                        m_CoreFactory->GetRenderContextCore().GetPerfTimer());
         }
         m_Filename = filename;
         bool retval = false;
@@ -1404,8 +1404,8 @@ struct SApp : public IApplication
             {
                 SStackPerfTimer __loadTimer(m_CoreFactory->GetPerfTimer(),
                                             "Application: End Font Preload");
-                if (m_CoreFactory->GetUICRenderContextCore().GetTextRendererCore())
-                    m_CoreFactory->GetUICRenderContextCore()
+                if (m_CoreFactory->GetRenderContextCore().GetTextRendererCore())
+                    m_CoreFactory->GetRenderContextCore()
                             .GetTextRendererCore()
                             ->EndPreloadFonts();
             }
@@ -1439,11 +1439,11 @@ struct SApp : public IApplication
         }
         SApplicationSettings finalSettings(/*m_CommandLineSettings, */m_UIAFileSettings);
         if (finalSettings.m_LayerCacheEnabled.hasValue()) {
-            inFactory.GetUICRenderContext().GetRenderer().EnableLayerCaching(
+            inFactory.GetQt3DSRenderContext().GetRenderer().EnableLayerCaching(
                         *finalSettings.m_LayerCacheEnabled);
         }
         if (finalSettings.m_LayerGpuProfilingEnabled.hasValue()) {
-            inFactory.GetUICRenderContext().GetRenderer().EnableLayerGpuProfiling(
+            inFactory.GetQt3DSRenderContext().GetRenderer().EnableLayerGpuProfiling(
                         *finalSettings.m_LayerGpuProfilingEnabled);
         }
         if (finalSettings.m_ShaderCachePersistenceEnabled.hasValue()
@@ -1451,12 +1451,12 @@ struct SApp : public IApplication
             eastl::string binaryDir;
             CFileTools::CombineBaseAndRelative(this->GetProjectDirectory(), "binary", binaryDir);
             CFileTools::CreateDir(binaryDir.c_str());
-            inFactory.GetUICRenderContext().GetShaderCache().SetShaderCachePersistenceEnabled(
+            inFactory.GetQt3DSRenderContext().GetShaderCache().SetShaderCachePersistenceEnabled(
                         binaryDir.c_str());
         }
 
         m_CoreFactory->GetPerfTimer().OutputTimerData();
-        m_RuntimeFactory->GetUICRenderContext().SetWatermarkLocation(m_WatermarkCoordinates);
+        m_RuntimeFactory->GetQt3DSRenderContext().SetWatermarkLocation(m_WatermarkCoordinates);
 
         m_AudioPlayer.SetPlayer(inAudioPlayer);
 
@@ -1587,7 +1587,7 @@ struct SApp : public IApplication
             if (primaryIdSize)
                 theOutStream.Write(m_InitialPresentationId.c_str(), primaryIdSize);
             QT3DSU32 theScaleMode
-                    = static_cast<QT3DSU32>(m_RuntimeFactory->GetUICRenderContext().GetScaleMode());
+                    = static_cast<QT3DSU32>(m_RuntimeFactory->GetQt3DSRenderContext().GetScaleMode());
             theOutStream.Write(theScaleMode);
             theOutStream.Write(m_WatermarkCoordinates);
             m_UIAFileSettings.Save(theOutStream);
@@ -1673,7 +1673,7 @@ struct SApp : public IApplication
             m_CoreFactory->GetScriptEngine().EnableMultithreadedAccess();
             m_CoreFactory->GetStringTable().EnableMultithreadedAccess();
             m_CoreFactory->GetScriptEngine().BeginPreloadScripts(
-                        scripts, m_CoreFactory->GetUICRenderContextCore().GetThreadPool(),
+                        scripts, m_CoreFactory->GetRenderContextCore().GetThreadPool(),
                         m_ProjectDir.c_str());
             NVDataRef<QT3DSU8> stringTableData
                     = m_CoreFactory->GetSceneLoader().BinaryLoadManagerData(theInStream,
@@ -1999,11 +1999,11 @@ struct SXMLLoader : public IAppLoadContext
             const char8_t *initialScaleMode(m_ScaleMode.c_str());
             // Force loading to finish here, just like used to happen.
             if (AreEqual(initialScaleMode, "center")) {
-                inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ExactSize);
+                inFactory.GetQt3DSRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ExactSize);
             } else if (AreEqual(initialScaleMode, "fit")) {
-                inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFit);
+                inFactory.GetQt3DSRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFit);
             } else if (AreEqual(initialScaleMode, "fill")) {
-                inFactory.GetUICRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFill);
+                inFactory.GetQt3DSRenderContext().SetScaleMode(qt3ds::render::ScaleModes::ScaleToFill);
             } else {
                 qCCritical(INVALID_PARAMETER, "Unrecognized scale mode attribute value: ",
                            initialScaleMode);
@@ -2242,7 +2242,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable
         , mRefCount(0)
     {
         using qt3ds::render::IBufferLoader;
-        IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader());
+        IBufferLoader &theLoader(m_App.m_CoreFactory->GetRenderContextCore().GetBufferLoader());
         eastl::string fullpath, directory, filename, extension, sceneGraphPath, presentationPath;
         IStringTable &theStringTable(m_App.m_CoreFactory->GetStringTable());
         for (QT3DSU32 idx = 0, end = app.m_OrderedAssets.size(); idx < end; ++idx) {
@@ -2298,8 +2298,8 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable
     ~SBinaryLoader()
     {
         using qt3ds::render::IBufferLoader;
-        NVFoundationBase &theBase = m_App.m_CoreFactory->GetUICRenderContextCore().GetFoundation();
-        IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader());
+        NVFoundationBase &theBase = m_App.m_CoreFactory->GetRenderContextCore().GetFoundation();
+        IBufferLoader &theLoader(m_App.m_CoreFactory->GetRenderContextCore().GetBufferLoader());
         (void)theBase;
         // theBase.error( QT3DS_WARN, "Binary Loader -cancel load" );
         {
@@ -2342,7 +2342,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable
     void EndLoad() override
     {
         using qt3ds::render::IBufferLoader;
-        IBufferLoader &theLoader(m_App.m_CoreFactory->GetUICRenderContextCore().GetBufferLoader());
+        IBufferLoader &theLoader(m_App.m_CoreFactory->GetRenderContextCore().GetBufferLoader());
         while (theLoader.WillLoadedBuffersBeAvailable())
             theLoader.NextLoadedBuffer();
     }
@@ -2382,7 +2382,7 @@ struct SBinaryLoader : public IAppLoadContext, public IAppRunnable
             }
         }
 
-        inRuntimeFactory.GetUICRenderContext().SetScaleMode(m_ScaleMode);
+        inRuntimeFactory.GetQt3DSRenderContext().SetScaleMode(m_ScaleMode);
 
         for (QT3DSU32 idx = 0, end = m_App.m_OrderedAssets.size(); idx < end; ++idx) {
             if (m_App.m_OrderedAssets[idx].second->getType() == AssetValueTypes::Presentation) {
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
index 38f9631f..d3cbe423 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
@@ -73,7 +73,7 @@ public:
         EType m_Type;
 
         virtual SEvent *Clone() const = 0;
-        virtual SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) = 0;
+        virtual Qt3DSEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) = 0;
     };
     struct SKeyboardEvent : public SEvent
     {
@@ -93,21 +93,21 @@ public:
         {
             return new SKeyboardEvent(this->m_KeyCode, this->m_KeyEvent);
         }
-        SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override
+        Qt3DSEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override
         {
             if (m_KeyEvent == ON_KEYDOWN || m_KeyEvent == ON_KEYUP || m_KeyEvent == ON_KEYREPEAT) {
-                SUICEventSystemEvent &theEvent = inFactory.CreateEvent(3);
+                Qt3DSEventSystemEvent &theEvent = inFactory.CreateEvent(3);
                 int theIndex = 0;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("category");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesString;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesString;
                 theEvent.m_Data[theIndex].m_Value.m_String = inFactory.AllocateStr("kb");
                 ++theIndex;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("code");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesNumber;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesNumber;
                 theEvent.m_Data[theIndex].m_Value.m_Number = m_KeyCode;
                 ++theIndex;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("action");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesString;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesString;
                 if (m_KeyEvent == ON_KEYDOWN)
                     theEvent.m_Data[theIndex].m_Value.m_String = inFactory.AllocateStr("down");
                 else if (m_KeyEvent == ON_KEYUP)
@@ -141,22 +141,22 @@ public:
         {
             return new SKeyboardEvent(this->m_ButtonCode, this->m_ButtonEvent);
         }
-        SUICEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override
+        Qt3DSEventSystemEvent *GenEventSystemEvent(qt3ds::evt::IEventFactory &inFactory) override
         {
             if (m_ButtonEvent == ON_BUTTONDOWN || m_ButtonEvent == ON_BUTTONUP
                 || m_ButtonEvent == ON_BUTTONREPEAT) {
-                SUICEventSystemEvent &theEvent = inFactory.CreateEvent(3);
+                Qt3DSEventSystemEvent &theEvent = inFactory.CreateEvent(3);
                 int theIndex = 0;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("category");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesString;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesString;
                 theEvent.m_Data[theIndex].m_Value.m_String = inFactory.AllocateStr("button");
                 ++theIndex;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("code");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesNumber;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesNumber;
                 theEvent.m_Data[theIndex].m_Value.m_Number = m_ButtonCode;
                 ++theIndex;
                 theEvent.m_Data[theIndex].m_Name = inFactory.RegisterStr("action");
-                theEvent.m_Data[theIndex].m_Value.m_Type = EUICEventSystemEventTypesString;
+                theEvent.m_Data[theIndex].m_Value.m_Type = QT3DSEventSystemEventTypesString;
                 if (m_ButtonEvent == ON_BUTTONDOWN)
                     theEvent.m_Data[theIndex].m_Value.m_String = inFactory.AllocateStr("down");
                 else if (m_ButtonEvent == ON_BUTTONUP)
@@ -172,13 +172,13 @@ public:
         INT32 m_ButtonCode;
         UINT32 m_ButtonEvent;
     };
-    size_t GetNextEvents(qt3ds::evt::IEventFactory &inFactory, SUICEventSystemEvent **outBuffer,
+    size_t GetNextEvents(qt3ds::evt::IEventFactory &inFactory, Qt3DSEventSystemEvent **outBuffer,
                          size_t inBufLenInEvent) override
     {
         size_t theEventCount = 0;
         while (!m_Events.empty() && inBufLenInEvent--) {
             SEvent *theBufferedEvent = m_Events.front();
-            SUICEventSystemEvent *theEventSystemEvent =
+            Qt3DSEventSystemEvent *theEventSystemEvent =
                 theBufferedEvent->GenEventSystemEvent(inFactory);
             if (theEventSystemEvent)
                 outBuffer[theEventCount++] = theEventSystemEvent;
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp
index 5d0e1aca..6e2c8aa5 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp
@@ -1127,7 +1127,7 @@ void SLuaEngineImpl::SetApplicationCore(qt3ds::runtime::IApplicationCore &inAppl
     lua_pushlightuserdata(m_LuaState, m_Application);
     lua_setglobal(m_LuaState, "Qt3DSApplicationCore");
     g_InputStreamFactory = &m_ApplicationCore->GetRuntimeFactoryCore()
-                                .GetUICRenderContextCore()
+                                .GetRenderContextCore()
                                 .GetInputStreamFactory();
     // re-route lua through our file handling system.  This allows us to load data from an APK file
     // directly without needing
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
index d6709267..f952f6e1 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
@@ -196,7 +196,7 @@ void CPresentation::BeginUpdate()
     if (m_ActivityZone) {
         m_ActivityZone->BeginUpdate(
             m_LocalTime, m_Application->GetRuntimeFactory().GetPerfTimer(),
-            m_Application->GetRuntimeFactory().GetUICRenderContext().GetThreadPool());
+            m_Application->GetRuntimeFactory().GetQt3DSRenderContext().GetThreadPool());
     }
 }
 
diff --git a/src/Runtime/Source/System/Include/Qt3DSBezierEval.h b/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
index 252234b3..ecb6f52e 100644
--- a/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
+++ b/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #pragma message(                                                                                   \
-    "AKBezierEval.h -- Changes to this file necessitate rebuilding the studio UICDM project and running the unit tests")
+    "AKBezierEval.h -- Changes to this file necessitate rebuilding the studio DataModel project and running the unit tests")
 
 namespace Q3DStudio {
 
diff --git a/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h b/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
index f522aa93..5f9a1220 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
+++ b/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #pragma message(                                                                                   \
-    "AKCubicRoots.h -- Changes to this file necessitate rebuilding the studio UICDM project and running the unit tests")
+    "AKCubicRoots.h -- Changes to this file necessitate rebuilding the studio DataModel project and running the unit tests")
 //==============================================================================
 //	Namespace
 //==============================================================================
diff --git a/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h b/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
index 72a512b0..980a8c27 100644
--- a/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
+++ b/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #pragma message(                                                                                   \
-    "AKCubicRootsImpl.h -- Changes to this file necessitate rebuilding the studio UICDM project and running the unit tests")
+    "AKCubicRootsImpl.h -- Changes to this file necessitate rebuilding the studio DataModel project and running the unit tests")
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h b/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
index 7edae348..8241e2ed 100644
--- a/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
@@ -34,7 +34,7 @@
 #include "foundation/Qt3DSTime.h"
 
 namespace Q3DStudio {
-class SUICFNDTimer : public ITimeProvider
+class Qt3DSFNDTimer : public ITimeProvider
 {
     Q3DStudio::INT64 GetCurrentTimeMicroSeconds() override
     {
diff --git a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
index 10371c60..ea628534 100644
--- a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
+++ b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
@@ -235,11 +235,11 @@ void CUIPParserObjectRefHelper::CacheGraph(qt3dsdm::IDOMReader &inReader, qt3dsd
         /*
 #if defined _DEBUG && defined _WIN32
         {
-                UICDM::SDOMElement* theElem = inWriter.GetTopElement();
+                qt3dsdm::SDOMElement* theElem = inWriter.GetTopElement();
                 {
                         qt3ds::foundation::CFileSeekableIOStream theWriter( "c:\\temp.xml",
 FileWriteFlags() );
-                        UICDM::CDOMSerializer::Write( *theElem, theWriter );
+                        qt3dsdm::CDOMSerializer::Write( *theElem, theWriter );
                 }
         }
 #endif
diff --git a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
index 7e9932e2..b9fb9763 100644
--- a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
+++ b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
@@ -38,22 +38,22 @@
 
 namespace Q3DSViewer {
 
-CUICAudioPlayerImpl::CUICAudioPlayerImpl()
+Qt3DSAudioPlayerImpl::Qt3DSAudioPlayerImpl()
 {
 }
 
-CUICAudioPlayerImpl::~CUICAudioPlayerImpl()
+Qt3DSAudioPlayerImpl::~Qt3DSAudioPlayerImpl()
 {
 }
 
-bool CUICAudioPlayerImpl::PlaySoundFile(const char *inFilePath)
+bool Qt3DSAudioPlayerImpl::PlaySoundFile(const char *inFilePath)
 {
 #ifdef PLATFORM_HAS_QT_MULTIMEDIA_LIB
     QSound::play(QString(inFilePath));
     return true;
 #else
     Q_UNUSED(inFilePath)
-    qCWarning(qt3ds::WARNING, "CUICAudioPlayerImpl::PlaySoundFile: no QT multimedia lib on this platform");
+    qCWarning(qt3ds::WARNING, "Qt3DSAudioPlayerImpl::PlaySoundFile: no QT multimedia lib on this platform");
     return false;
 #endif // PLATFORM_HAS_QT_MULTIMEDIA_LIB
 }
diff --git a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
index 8cfbeeec..bba5bd6a 100644
--- a/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
+++ b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
@@ -36,11 +36,11 @@
 
 namespace Q3DSViewer {
 
-class QT3DS_RUNTIME_API CUICAudioPlayerImpl : public Q3DStudio::IAudioPlayer
+class QT3DS_RUNTIME_API Qt3DSAudioPlayerImpl : public Q3DStudio::IAudioPlayer
 {
 public:
-    CUICAudioPlayerImpl();
-    virtual ~CUICAudioPlayerImpl();
+    Qt3DSAudioPlayerImpl();
+    virtual ~Qt3DSAudioPlayerImpl();
     bool PlaySoundFile(const char *inFilePath) override;
 };
 }
diff --git a/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h
index ea98e768..834faa91 100644
--- a/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h
+++ b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h
@@ -34,20 +34,20 @@
 
 #include <stddef.h>
 
-namespace uic {
+namespace qt3ds {
 namespace viewer {
-    struct SUICEmbeddedFile
+    struct Qt3DSEmbeddedFile
     {
         const char *name;
         const unsigned char *data;
         size_t size;
-        SUICEmbeddedFile()
+        Qt3DSEmbeddedFile()
             : name(NULL)
             , data(NULL)
             , size(0)
         {
         }
-        SUICEmbeddedFile(const char *n, const unsigned char *d, size_t s)
+        Qt3DSEmbeddedFile(const char *n, const unsigned char *d, size_t s)
             : name(n)
             , data(d)
             , size(s)
@@ -57,8 +57,8 @@ namespace viewer {
 
     inline const char *GetWatermarkFileName() { return "AutoworksWatermark.dds"; }
 
-    SUICEmbeddedFile FindEmbeddedFile(const char *inName = GetWatermarkFileName());
+    Qt3DSEmbeddedFile FindEmbeddedFile(const char *inName = GetWatermarkFileName());
 }
 }
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp b/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
index e42e76d0..f4db45dd 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
@@ -115,7 +115,7 @@ void HandleController(Q3DStudio::CTegraApplication &inApplication)
     static const struct ButtonEntry
     {
         WORD XBoxButton;
-        Q3DStudio::INT32 UICButton;
+        Q3DStudio::INT32 button;
     } buttonMap[] = {
     { XINPUT_GAMEPAD_START, Q3DStudio::BUTTON_START },
     { XINPUT_GAMEPAD_BACK, Q3DStudio::BUTTON_SELECT },
@@ -152,7 +152,7 @@ void HandleController(Q3DStudio::CTegraApplication &inApplication)
                      buttonMapIndex < sizeof(buttonMap) / sizeof(buttonMap[0]); ++buttonMapIndex) {
                     const ButtonEntry &buttonEntry = buttonMap[buttonMapIndex];
                     if (buttonEntry.XBoxButton & buttonChanges) {
-                        input->HandleButton(buttonEntry.UICButton,
+                        input->HandleButton(buttonEntry.button,
                                             buttons & buttonEntry.XBoxButton);
                     }
                 }
@@ -216,7 +216,7 @@ void kdHandleAssertion(const KDchar *condition, const KDchar *filename, KDint li
                                   << " " << filename << " " << linenumber;
 }
 
-Q3DStudio::SUICFNDTimer g_GlobalTimeProvider;
+Q3DStudio::Qt3DSFNDTimer g_GlobalTimeProvider;
 
 KDust GetTimeUST()
 {
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerApp.h b/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
index dd70d4ea..f0d94802 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef UICVIEWER_H
-#define UICVIEWER_H
+#ifndef QT3DS_VIEWER_H
+#define QT3DS_VIEWER_H
 
 #include "qt3dsruntimeglobal.h"
 
@@ -391,4 +391,4 @@ Q_SIGNALS:
 
 } // end namespace
 
-#endif // UICVIEWER_H
+#endif // QT3DS_VIEWER_H
diff --git a/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h b/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
index 742451cf..de679ce9 100644
--- a/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
@@ -28,20 +28,20 @@
 **
 ****************************************************************************/
 
-#ifndef UICELAPSED_TIMER_H
-#define UICELAPSED_TIMER_H
+#ifndef QT3DS_ELAPSED_TIMER_H
+#define QT3DS_ELAPSED_TIMER_H
 #include <QElapsedTimer>
 
 namespace Q3DSViewer {
 
 ///< @brief this class implementes a elapsed timer using QElapsedTimer
-class UICElapsedTimer
+class Qt3DSElapsedTimer
 {
 public:
     QElapsedTimer m_elapsedTimer;
     QElapsedTimer::ClockType m_clockType;
 
-    UICElapsedTimer()
+    Qt3DSElapsedTimer()
     {
         m_clockType = QElapsedTimer::clockType();
         reset();
@@ -58,12 +58,12 @@ public:
 };
 
 ///< @brief this class implementes a timer using QElapsedTimer
-class UICTimer
+class Qt3DSTimer
 {
 public:
     QElapsedTimer m_timer;
 
-    UICTimer() { start(); }
+    Qt3DSTimer() { start(); }
 
     void start() { m_timer.start(); }
 
@@ -117,4 +117,4 @@ struct NumericCircularBuffer
 
 } // end namspace
 
-#endif // UICELAPSED_TIMER_H
+#endif // QT3DS_ELAPSED_TIMER_H
diff --git a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
index 631b5c56..c7449395 100644
--- a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
+++ b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
@@ -150,7 +150,7 @@ void Q3DSRenderer::draw()
 
 bool Q3DSRenderer::initializeRuntime(QOpenGLFramebufferObject *inFbo)
 {
-    m_runtime = &Q3DSViewerApp::Create(nullptr, new CUICAudioPlayerImpl());
+    m_runtime = &Q3DSViewerApp::Create(nullptr, new Qt3DSAudioPlayerImpl());
     Q_ASSERT(m_runtime);
 
     int theWidth = inFbo->width();
diff --git a/src/Viewer/studio3d/q3dssurfaceviewer.cpp b/src/Viewer/studio3d/q3dssurfaceviewer.cpp
index faaae8a4..3666eeb4 100644
--- a/src/Viewer/studio3d/q3dssurfaceviewer.cpp
+++ b/src/Viewer/studio3d/q3dssurfaceviewer.cpp
@@ -341,7 +341,7 @@ bool Q3DSSurfaceViewerPrivate::initializeRuntime()
 
     m_context->makeCurrent(m_surface);
 
-    m_viewerApp = &Q3DSViewerApp::Create(m_context, new CUICAudioPlayerImpl());
+    m_viewerApp = &Q3DSViewerApp::Create(m_context, new Qt3DSAudioPlayerImpl());
 
     Q_ASSERT(m_viewerApp);
 
diff --git a/src/Viewer/studio3d/q3dswidget.cpp b/src/Viewer/studio3d/q3dswidget.cpp
index 3101712f..4db1b7be 100644
--- a/src/Viewer/studio3d/q3dswidget.cpp
+++ b/src/Viewer/studio3d/q3dswidget.cpp
@@ -272,7 +272,7 @@ bool Q3DSWidgetPrivate::initializeRuntime()
 
     q_ptr->makeCurrent();
 
-    m_viewerApp = &Q3DSViewerApp::Create(q_ptr->context(), new CUICAudioPlayerImpl());
+    m_viewerApp = &Q3DSViewerApp::Create(q_ptr->context(), new Qt3DSAudioPlayerImpl());
 
     Q_ASSERT(m_viewerApp);
 
diff --git a/src/commonplatform.pri b/src/commonplatform.pri
index 2522dcf8..3c8192b7 100644
--- a/src/commonplatform.pri
+++ b/src/commonplatform.pri
@@ -50,7 +50,7 @@ CONFIG(debug, debug|release) {
 linux {
     CONFIG += egl
     DEFINES+=_LINUX QT3DS_OS_LINUX _LINUXPLATFORM QT3DS_NO_X11 \
-        UICVIEWER_EXPORTS WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T
+        QT3DS_VIEWER_EXPORTS WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T
 
     contains(QT_ARCH, x86_64) {
         BINDIR = $$PWD/../Bin/Linux64
author	Määttä Antti <antti.maatta@qt.io>	2017-10-23 10:47:49 +0300
committer	Antti Määttä <antti.maatta@qt.io>	2017-10-24 13:24:20 +0000
commit	e0307030ff18b911a91ff5e4fa7958cd77493c42 (patch)
tree	06154565d413773c445b8ea99bf42837c82f7237 /src
parent	9bd7da7fc5c25589c80869f9f554d120e978a69a (diff)