Rename UIC files to Qt3DS files

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

498 files changed, 1988 insertions, 1946 deletions

diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp
index 556c70d0..91c1fb00 100644
--- a/src/Authoring/Client/Code/Core/Core/Core.cpp
+++ b/src/Authoring/Client/Code/Core/Core/Core.cpp
@@ -41,7 +41,7 @@
 #include "UICFileTools.h"
 #include "Cmd.h"
 #include "StudioPreferences.h"
-#include "UICStateApplication.h"
+#include "Qt3DSStateApplication.h"
 
 //==============================================================================
 // Construction
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index e3289dfe..ecadc532 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -77,9 +77,9 @@
 #include "IDirectoryWatchingSystem.h"
 #include "StandardExtensions.h"
 #include "IDocSceneGraph.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 #include "SelectedValueImpl.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderPathManager.h"
 #include "EASTL/sort.h"
 #include "foundation/Qt3DSLogging.h"
 
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
index ac346dc0..1ad98b1b 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentBufferCache.cpp
@@ -36,9 +36,9 @@
 #include "foundation/Qt3DS.h"
 #include "UICDMStringTable.h"
 #include "EASTL/hash_map.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "foundation/StringTable.h"
-#include "UICRenderMesh.h"
+#include "Qt3DSRenderMesh.h"
 #include "Core.h"
 #include "Dispatch.h"
 #include "IDocSceneGraph.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index ad3a12a4..50283102 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -70,14 +70,14 @@
 #include "UICDMActionCore.h"
 #include "ActionSystem.h"
 #include "StandardExtensions.h"
-#include "UICRenderMesh.h"
-#include "UICRenderImage.h"
+#include "Qt3DSRenderMesh.h"
+#include "Qt3DSRenderImage.h"
 #include "IDocSceneGraph.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "Q3DStudioNVFoundation.h"
 #include "UICDMGuides.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderPathManager.h"
 #include "UICImportPath.h"
 #include "DynamicLua.h"
 #include "Dialogs.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index 939e259b..07ca2ed6 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -43,8 +43,8 @@
 #include "GUIDUtilities.h"
 #include "IDocumentEditor.h"
 #include "Q3DStudioNVFoundation.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderPathManager.h"
 #include "UICDMGuides.h"
 #include "foundation/Qt3DSLogging.h"
 #include <unordered_map>
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
index 75ac0d56..072350cc 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocSceneGraph.h
@@ -28,7 +28,7 @@
 ****************************************************************************/
 #ifndef IDOC_SCENE_GRAPH_H
 #define IDOC_SCENE_GRAPH_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "UICDMHandles.h"
 #include "foundation/Qt3DSVec3.h"
 #include "Pt.h"
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h b/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h
index e098531e..8dc9e249 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentBufferCache.h
@@ -34,8 +34,8 @@
 #define INCLUDED_IDOCUMENTBUFFERCACHE_H
 #include "UICFileTools.h"
 #include "StudioObjectTypes.h"
-#include "UICRender.h"
-#include "UICRenderImageTextureData.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderImageTextureData.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Authoring/Client/Code/Core/StdAfx.h b/src/Authoring/Client/Code/Core/StdAfx.h
index 9171f434..a2a166ee 100644
--- a/src/Authoring/Client/Code/Core/StdAfx.h
+++ b/src/Authoring/Client/Code/Core/StdAfx.h
@@ -132,7 +132,7 @@ extern CComModule _Module;
 #include "Conditional.h"
 #include "STLHelpers.h"
 #include "GenericFunctor.h"
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 
 #include <QtGlobal>
 
diff --git a/src/Authoring/CoreLib.pro b/src/Authoring/CoreLib.pro
index 24ffb845..5861496f 100644
--- a/src/Authoring/CoreLib.pro
+++ b/src/Authoring/CoreLib.pro
@@ -44,13 +44,13 @@ INCLUDEPATH += \
     Common/Code/Graph \
     Common/Code/EulerAngles \
     Common/Code/Serialize \
-    $$PWD/../Runtime/Source/RuntimeUICDM/Include \
+    $$PWD/../Runtime/Source/DataModel/Include \
     $$PWD/../Runtime/Source/Qt3DSRender/Include \
     $$PWD/../Runtime/Source/Qt3DSFoundation/Include \
-    $$PWD/../Runtime/Source/UICRender/Include \
-    $$PWD/../Runtime/Source/UICRender/GraphObjects \
-    $$PWD/../Runtime/Source/UICRender/ResourceManager \
-    $$PWD/../Runtime/Source/UICState/Application \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/Include \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/GraphObjects \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/ResourceManager \
+    $$PWD/../Runtime/Source/Qt3DSStateApplication/Application \
     ../3rdparty/Lua/UnknownVersion/src \
     ../3rdparty/EASTL/UnknownVersion/include \
     $$QMAKE_INCDIR_FBX \
diff --git a/src/Authoring/PresentationCompiler.pro b/src/Authoring/PresentationCompiler.pro
index f80afbdc..9049ae4d 100644
--- a/src/Authoring/PresentationCompiler.pro
+++ b/src/Authoring/PresentationCompiler.pro
@@ -4,7 +4,7 @@ include($$PWD/../Runtime/commoninclude.pri)
 CONFIG += console
 
 SOURCES += \
-    $$PWD/../Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp
+    $$PWD/../Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
 
 linux {
     BEGIN_ARCHIVE = -Wl,--whole-archive
diff --git a/src/Authoring/Q3DStudio.pro b/src/Authoring/Q3DStudio.pro
index 0a6887e1..76701e14 100644
--- a/src/Authoring/Q3DStudio.pro
+++ b/src/Authoring/Q3DStudio.pro
@@ -65,10 +65,11 @@ INCLUDEPATH += \
     Client/Code/Shared/Log \
     $$PWD/../Runtime/Source/Qt3DSRender/Include \
     $$PWD/../Runtime/Source/Qt3DSFoundation/Include \
-    $$PWD/../Runtime/Source/UICRender/Include \
-    $$PWD/../Runtime/Source/UICRender/GraphObjects \
-    $$PWD/../Runtime/Source/UICRender/ResourceManager \
-    $$PWD/../Runtime/Source/UICState/Application \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/Include \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/GraphObjects \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/ResourceManager \
+    $$PWD/../Runtime/Source/Qt3DSStateApplication/Application \
+    $$PWD/../Runtime/Source/Qt3DSEvent/InternalInclude \
     ../3rdparty/EASTL/UnknownVersion/include \
     ../3rdparty/color
 
diff --git a/src/Authoring/Qt3DSState.pro b/src/Authoring/Qt3DSState.pro
index 60abe959..04122563 100644
--- a/src/Authoring/Qt3DSState.pro
+++ b/src/Authoring/Qt3DSState.pro
@@ -8,13 +8,13 @@ INCLUDEPATH += \
     $$PWD/../Runtime/Source/Runtime/Include \
     $$PWD/../Runtime/Source/System/Include \
     $$PWD/../Runtime/Source/Qt3DSRender/Include \
-    $$PWD/../Runtime/Source/UICState/Include \
-    $$PWD/../Runtime/Source/UICState/Editor \
-    $$PWD/../Runtime/Source/UICState/Debugger \
+    $$PWD/../Runtime/Source/Qt3DSStateApplication/Include \
+    $$PWD/../Runtime/Source/Qt3DSStateApplication/Editor \
+    $$PWD/../Runtime/Source/Qt3DSStateApplication/Debugger \
     $$PWD/../Runtime/Source/Qt3DSState/Include \
     $$PWD/../Runtime/Source/Qt3DSState/InternalInclude \
-    $$PWD/../Runtime/Source/UICEvent/Include \
-    $$PWD/../Runtime/Source/UICEvent/InternalInclude \
+    $$PWD/../Runtime/Source/Qt3DSEvent/Include \
+    $$PWD/../Runtime/Source/Qt3DSEvent/InternalInclude \
     ../3rdparty/EASTL/UnknownVersion/include \
     ../3rdparty/Lua/UnknownVersion/src
 
diff --git a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
index dbb0a82d..c49e9514 100644
--- a/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
+++ b/src/Authoring/Studio/DragAndDrop/BasicObjectDropSource.cpp
@@ -51,7 +51,7 @@
 #include "BasicObjectsModel.h"
 #include "IDragable.h"
 #include "IDocSceneGraph.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 #include "HotKeys.h"
 #include "StudioUtils.h"
 
diff --git a/src/Authoring/Studio/Render/PathWidget.cpp b/src/Authoring/Studio/Render/PathWidget.cpp
index 8d2728cc..b54da2e3 100644
--- a/src/Authoring/Studio/Render/PathWidget.cpp
+++ b/src/Authoring/Studio/Render/PathWidget.cpp
@@ -28,16 +28,16 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include "PathWidget.h"
-#include "UICRenderWidgets.h"
+#include "Qt3DSRenderWidgets.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "render/Qt3DSRenderInputAssembler.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
-#include "UICRenderPathManager.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
+#include "Qt3DSRenderPathManager.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 
 using namespace qt3ds::widgets;
 
diff --git a/src/Authoring/Studio/Render/StudioRendererImpl.h b/src/Authoring/Studio/Render/StudioRendererImpl.h
index 3d2e73e2..a9753334 100644
--- a/src/Authoring/Studio/Render/StudioRendererImpl.h
+++ b/src/Authoring/Studio/Render/StudioRendererImpl.h
@@ -33,7 +33,7 @@
 #include "WGLRenderContext.h"
 #include "UICDMDataTypes.h"
 #include "UICDMSignals.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "StudioApp.h"
 #include "Doc.h"
 #include "UICDMStudioSystem.h"
@@ -46,31 +46,31 @@
 #include "Dispatch.h"
 #include "Core.h"
 #include "foundation/Qt3DSInvasiveSet.h"
-#include "UICRenderer.h"
-#include "UICRenderScene.h"
-#include "UICRenderNode.h"
-#include "UICRenderLayer.h"
-#include "UICRenderModel.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderImage.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderPresentation.h"
 #include "StudioProjectSettings.h"
-#include "UICRenderUIPSharedTranslation.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRenderUIPSharedTranslation.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "StudioFullSystem.h"
 #include "UICDMSignals.h"
 #include "CoreConst.h"
 #include "IDocumentEditor.h"
 #include "foundation/Qt3DSPlane.h"
 #include "foundation/Qt3DSQuat.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 #include "foundation/Qt3DSOption.h"
 #include "foundation/Qt3DSMathUtils.h"
-#include "UICRenderEffect.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
 
 namespace qt3ds {
 namespace studio {
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
index 4297efa5..bb2f231a 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.cpp
@@ -29,33 +29,33 @@
 #include "stdafx.h"
 #include "StudioRendererImpl.h"
 #include "StudioRendererTranslation.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "foundation/StrConvertUTF.h"
 #include "UICFileTools.h"
-#include "UICRenderUIPLoader.h"
-#include "UICRenderWidgets.h"
+#include "Qt3DSRenderUIPLoader.h"
+#include "Qt3DSRenderWidgets.h"
 #include "foundation/Qt3DSBounds3.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
-#include "UICRenderCamera.h"
+#include "Qt3DSRenderCamera.h"
 #include "foundation/Qt3DSPlane.h"
-#include "UICRenderRotationHelper.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderPlugin.h"
+#include "Qt3DSRenderRotationHelper.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderPlugin.h"
 #include "StudioCoreSystem.h"
 #include "UICDMDataCore.h"
-#include "UICRenderPluginPropertyValue.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderPluginPropertyValue.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderReferencedMaterial.h"
-#include "UICRenderPixelGraphicsTypes.h"
-#include "UICRenderPixelGraphicsRenderer.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderReferencedMaterial.h"
+#include "Qt3DSRenderPixelGraphicsTypes.h"
+#include "Qt3DSRenderPixelGraphicsRenderer.h"
+#include "Qt3DSRenderPathManager.h"
 #include "PathWidget.h"
-#include "UICRenderLightmaps.h"
+#include "Qt3DSRenderLightmaps.h"
 #include "StudioPreferences.h"
 #include "HotKeys.h"
 #include <boost/bind.hpp>
diff --git a/src/Authoring/Studio/Render/StudioRendererTranslation.h b/src/Authoring/Studio/Render/StudioRendererTranslation.h
index 163cd27e..4997d2d0 100644
--- a/src/Authoring/Studio/Render/StudioRendererTranslation.h
+++ b/src/Authoring/Studio/Render/StudioRendererTranslation.h
@@ -30,8 +30,8 @@
 #define UIC_STUDIO_RENDERER_TRANSLATION_H
 #pragma once
 #include "StudioRendererImpl.h"
-#include "UICRenderLayer.h"
-#include "UICRenderer.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderer.h"
 #include "StudioWidget.h"
 #include "render/Qt3DSRenderTexture2D.h"
 #include "foundation/AutoDeallocatorAllocator.h"
diff --git a/src/Authoring/Studio/Render/StudioRotationWidget.cpp b/src/Authoring/Studio/Render/StudioRotationWidget.cpp
index e68ce7ee..283e7c8a 100644
--- a/src/Authoring/Studio/Render/StudioRotationWidget.cpp
+++ b/src/Authoring/Studio/Render/StudioRotationWidget.cpp
@@ -31,10 +31,10 @@
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRenderNode.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderCamera.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderCamera.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "StudioUtils.h"
 
diff --git a/src/Authoring/Studio/Render/StudioScaleWidget.cpp b/src/Authoring/Studio/Render/StudioScaleWidget.cpp
index 7ae9ade4..1bd5cbb4 100644
--- a/src/Authoring/Studio/Render/StudioScaleWidget.cpp
+++ b/src/Authoring/Studio/Render/StudioScaleWidget.cpp
@@ -31,9 +31,9 @@
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRenderNode.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "StudioUtils.h"
 
diff --git a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp
index 59d1b6d2..f78e6525 100644
--- a/src/Authoring/Studio/Render/StudioTranslationWidget.cpp
+++ b/src/Authoring/Studio/Render/StudioTranslationWidget.cpp
@@ -30,8 +30,8 @@
 #include "StudioWidgetImpl.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderShaderCodeGenerator.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderNode.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "StudioUtils.h"
 
diff --git a/src/Authoring/Studio/Render/StudioWidget.cpp b/src/Authoring/Studio/Render/StudioWidget.cpp
index 01331b3e..e1dd4b89 100644
--- a/src/Authoring/Studio/Render/StudioWidget.cpp
+++ b/src/Authoring/Studio/Render/StudioWidget.cpp
@@ -28,11 +28,11 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include "StudioWidget.h"
-#include "UICRenderWidgets.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderWidgets.h"
+#include "Qt3DSRenderContextCore.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 
 using namespace qt3ds::widgets;
 
diff --git a/src/Authoring/Studio/Render/StudioWidget.h b/src/Authoring/Studio/Render/StudioWidget.h
index fb477d84..d3c8eadc 100644
--- a/src/Authoring/Studio/Render/StudioWidget.h
+++ b/src/Authoring/Studio/Render/StudioWidget.h
@@ -29,8 +29,8 @@
 #ifndef UIC_STUDIO_RENDERER_WIDGET_H
 #define UIC_STUDIO_RENDERER_WIDGET_H
 #pragma once
-#include "UICRenderWindowDimensions.h"
-#include "UICRenderWidgets.h"
+#include "Qt3DSRenderWindowDimensions.h"
+#include "Qt3DSRenderWidgets.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "StudioPickValues.h"
 
diff --git a/src/Authoring/Studio/Render/StudioWidgetImpl.h b/src/Authoring/Studio/Render/StudioWidgetImpl.h
index 15b8ae14..3520ace1 100644
--- a/src/Authoring/Studio/Render/StudioWidgetImpl.h
+++ b/src/Authoring/Studio/Render/StudioWidgetImpl.h
@@ -34,8 +34,8 @@
 #include "foundation/Qt3DSContainers.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
-#include "UICRenderNode.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 
 namespace qt3ds {
 namespace widgets {
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
index e6964cd5..9071aab1 100644
--- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp
+++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp
@@ -37,7 +37,7 @@
 #endif
 #include "StudioApp.h"
 #include "SubPresentationsDlg.h"
-#include "UICStateApplication.h"
+#include "Qt3DSStateApplication.h"
 
 #include <QtGui/qsurfaceformat.h>
 #include <QtCore/qfileinfo.h>
diff --git a/src/Authoring/UICDM.pro b/src/Authoring/UICDM.pro
index 360b74ec..fc36f6c5 100644
--- a/src/Authoring/UICDM.pro
+++ b/src/Authoring/UICDM.pro
@@ -16,8 +16,8 @@ INCLUDEPATH += \
     UICDM/Systems/Cores \
     $$PWD/../Runtime/Source/System/Include \
     $$PWD/../Runtime/Source/Qt3DSFoundation/Include \
-    $$PWD/../Runtime/Source/UICRender/Include \
-    $$PWD/../Runtime/Source/RuntimeUICDM/Include \
+    $$PWD/../Runtime/Source/Qt3DSRuntimeRender/Include \
+    $$PWD/../Runtime/Source/DataModel/Include \
     $$PWD/../Runtime/Source/Qt3DSRender/Include \
     ../3rdparty/EASTL/UnknownVersion/include \
     ../3rdparty/utf8cpp/2.3.2/source \
diff --git a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
index 700eac38..43e504e8 100644
--- a/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Authoring/UICDM/Systems/Cores/SimpleAnimationCore.cpp
@@ -40,9 +40,9 @@ struct SPerfLogEvent
 
 typedef SPerfLogEvent TPerfLogMathEvent1;
 
-#include "UICCubicRoots.h"
-#include "UICCubicRootsImpl.h"
-#include "UICBezierEval.h"
+#include "Qt3DSCubicRoots.h"
+#include "Qt3DSCubicRootsImpl.h"
+#include "Qt3DSBezierEval.h"
 #include <boost/unordered_map.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 using namespace std;
diff --git a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
index b020b69a..f15d7b27 100644
--- a/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
+++ b/src/Authoring/UICDM/Systems/UICDMMetaData.cpp
@@ -45,8 +45,8 @@
 #include "UICDMDataCore.h"
 #include "DataCoreProducer.h"
 #include "UICDMWindowsCompatibility.h"
-#include "UICRenderEffectSystem.h"
-#include "UICRenderDynamicObjectSystemCommands.h"
+#include "Qt3DSRenderEffectSystem.h"
+#include "Qt3DSRenderDynamicObjectSystemCommands.h"
 #include "foundation/StringConversionImpl.h"
 #include <QtCore/qdir.h>
 
diff --git a/src/Runtime/Qt3DSRuntime.pro b/src/Runtime/Qt3DSRuntime.pro
index be27e77d..3015509d 100644
--- a/src/Runtime/Qt3DSRuntime.pro
+++ b/src/Runtime/Qt3DSRuntime.pro
@@ -17,14 +17,14 @@ RESOURCES += res.qrc
 }
 
 SOURCES += \
-    Source/Viewer/UICViewerApp.cpp \
-    Source/Viewer/UICAudioPlayerImpl.cpp
+    Source/Viewer/Qt3DSAudioPlayerImpl.cpp \
+    Source/Viewer/Qt3DSViewerApp.cpp
 
 HEADERS += \
     Source/Viewer/qt3dsruntimeglobal.h \
-    Source/Viewer/UICViewerApp.h \
-    Source/Viewer/UICAudioPlayerImpl.h \
-    Source/Viewer/UICViewerTimer.h
+    Source/Viewer/Qt3DSAudioPlayerImpl.h \
+    Source/Viewer/Qt3DSViewerApp.h \
+    Source/Viewer/Qt3DSViewerTimer.h
 
 linux {
     BEGIN_ARCHIVE = -Wl,--whole-archive
diff --git a/src/Runtime/Qt3DSRuntimeStatic.pro b/src/Runtime/Qt3DSRuntimeStatic.pro
index 92fead0c..bf3f2640 100644
--- a/src/Runtime/Qt3DSRuntimeStatic.pro
+++ b/src/Runtime/Qt3DSRuntimeStatic.pro
@@ -27,7 +27,155 @@ SOURCES += \
     Source/Qt3DSFoundation/Source/foundation/Socket.cpp \
     Source/Qt3DSFoundation/Source/foundation/StringTable.cpp \
     Source/Qt3DSFoundation/Source/foundation/XML.cpp \
-    Source/UICRender/Source/q3dsqmlrender.cpp
+    Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp \
+    Source/Engine/Source/Qt3DSOSSpecificFunctions.cpp \
+    Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp \
+    Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp \
+    Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp \
+    Source/Engine/Source/Qt3DSTegraApplication.cpp \
+    Source/Engine/Source/Qt3DSTegraInputEngine.cpp \
+    Source/Runtime/Source/Qt3DSActivationManager.cpp \
+    Source/Runtime/Source/Qt3DSAnimationSystem.cpp \
+    Source/Runtime/Source/Qt3DSApplication.cpp \
+    Source/Runtime/Source/Qt3DSAttributeHashes.cpp \
+    Source/Runtime/Source/Qt3DSBinarySerializerImpl.cpp \
+    Source/Runtime/Source/Qt3DSComponentManager.cpp \
+    Source/Runtime/Source/Qt3DSElementSystem.cpp \
+    Source/Runtime/Source/Qt3DSEventCallbacks.cpp \
+    Source/Runtime/Source/Qt3DSInputEngine.cpp \
+    Source/Runtime/Source/Qt3DSLogicSystem.cpp \
+    Source/Runtime/Source/Qt3DSLuaAxis.cpp \
+    Source/Runtime/Source/Qt3DSLuaButton.cpp \
+    Source/Runtime/Source/Qt3DSLuaColor.cpp \
+    Source/Runtime/Source/Qt3DSLuaCommandHelper.cpp \
+    Source/Runtime/Source/Qt3DSLuaElementHelper.cpp \
+    Source/Runtime/Source/Qt3DSLuaEngine.cpp \
+    Source/Runtime/Source/Qt3DSLuaEventHelper.cpp \
+    Source/Runtime/Source/Qt3DSLuaHelper.cpp \
+    Source/Runtime/Source/Qt3DSLuaKeyboard.cpp \
+    Source/Runtime/Source/Qt3DSLuaMatrix.cpp \
+    Source/Runtime/Source/Qt3DSLuaRotation.cpp \
+    Source/Runtime/Source/Qt3DSLuaSceneHelper.cpp \
+    Source/Runtime/Source/Qt3DSLuaVector.cpp \
+    Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp \
+    Source/Runtime/Source/Qt3DSParametersSystem.cpp \
+    Source/Runtime/Source/Qt3DSPresentation.cpp \
+    Source/Runtime/Source/Qt3DSPresentationFrameData.cpp \
+    Source/Runtime/Source/Qt3DSQmlElementHelper.cpp \
+    Source/Runtime/Source/Qt3DSQmlEngine.cpp \
+    Source/Runtime/Source/Qt3DSSlideSystem.cpp \
+    Source/Runtime/Source/Qt3DSTimePolicy.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp \
+    Source/System/Source/Qt3DSAssert.cpp \
+    Source/System/Source/Qt3DSBoundingBox.cpp \
+    Source/System/Source/Qt3DSColor.cpp \
+    Source/System/Source/Qt3DSCubicRoots.cpp \
+    Source/System/Source/Qt3DSDataLogger.cpp \
+    Source/System/Source/Qt3DSDLLManager.cpp \
+    Source/System/Source/Qt3DSEulerAngles.cpp \
+    Source/System/Source/Qt3DSFile.cpp \
+    Source/System/Source/Qt3DSFileStream.cpp \
+    Source/System/Source/Qt3DSFunctionWrappers.cpp \
+    Source/System/Source/Qt3DSMatrix.cpp \
+    Source/System/Source/Qt3DSMemory.cpp \
+    Source/System/Source/Qt3DSMemoryFilter.cpp \
+    Source/System/Source/Qt3DSMemoryHeap.cpp \
+    Source/System/Source/Qt3DSMemoryManager.cpp \
+    Source/System/Source/Qt3DSMemoryPool.cpp \
+    Source/System/Source/Qt3DSMemoryProbe.cpp \
+    Source/System/Source/Qt3DSMemoryStatistics.cpp \
+    Source/System/Source/Qt3DSMemoryTracker.cpp \
+    Source/System/Source/Qt3DSSyncPrimitive.cpp \
+    Source/System/Source/Qt3DSThreadManager.cpp \
+    Source/System/Source/Qt3DSTimer.cpp \
+    Source/System/Source/Qt3DSTypes.cpp \
+    Source/System/Source/Qt3DSVector3.cpp \
+    Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateLuaTest.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateLuaScriptContext.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp \
+    Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp \
+    Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp \
+    Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp \
+    Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp \
+    Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
 
 HEADERS += \
     Source/Qt3DSFoundation/Include/foundation/ConvertUTF.h \
@@ -97,7 +245,247 @@ HEADERS += \
     Source/Qt3DSFoundation/Include/foundation/ThreadSafeQueue.h \
     Source/Qt3DSFoundation/Include/foundation/TrackingAllocator.h \
     Source/Qt3DSFoundation/Include/foundation/Utils.h \
-    Source/UICRender/Include/q3dsqmlrender.h
+    Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h \
+    Source/Engine/Include/Qt3DSRenderRuntimeBinding.h \
+    Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h \
+    Source/Engine/Include/Qt3DSTegraApplication.h \
+    Source/Engine/Include/Qt3DSTegraInputEngine.h \
+    Source/Runtime/Include/Qt3DSActivationManager.h \
+    Source/Runtime/Include/Qt3DSAnimationSystem.h \
+    Source/Runtime/Include/Qt3DSApplication.h \
+    Source/Runtime/Include/Qt3DSAttributeHashes.h \
+    Source/Runtime/Include/Qt3DSBinarySerializerImpl.h \
+    Source/Runtime/Include/Qt3DSComponentManager.h \
+    Source/Runtime/Include/Qt3DSElementSystem.h \
+    Source/Runtime/Include/Qt3DSEventCallbacks.h \
+    Source/Runtime/Include/Qt3DSInputEngine.h \
+    Source/Runtime/Include/Qt3DSLogicSystem.h \
+    Source/Runtime/Include/Qt3DSLuaAxis.h \
+    Source/Runtime/Include/Qt3DSLuaButton.h \
+    Source/Runtime/Include/Qt3DSLuaColor.h \
+    Source/Runtime/Include/Qt3DSLuaCommandHelper.h \
+    Source/Runtime/Include/Qt3DSLuaElementHelper.h \
+    Source/Runtime/Include/Qt3DSLuaEngine.h \
+    Source/Runtime/Include/Qt3DSLuaEventHelper.h \
+    Source/Runtime/Include/Qt3DSLuaHelper.h \
+    Source/Runtime/Include/Qt3DSLuaKeyboard.h \
+    Source/Runtime/Include/Qt3DSLuaMatrix.h \
+    Source/Runtime/Include/Qt3DSLuaRotation.h \
+    Source/Runtime/Include/Qt3DSLuaSceneHelper.h \
+    Source/Runtime/Include/Qt3DSLuaVector.h \
+    Source/Runtime/Include/Qt3DSOutputMemoryStream.h \
+    Source/Runtime/Include/Qt3DSParametersSystem.h \
+    Source/Runtime/Include/Qt3DSPresentation.h \
+    Source/Runtime/Include/Qt3DSPresentationFrameData.h \
+    Source/Runtime/Include/Qt3DSQmlElementHelper.h \
+    Source/Runtime/Include/Qt3DSQmlEngine.h \
+    Source/Runtime/Include/Qt3DSSlideSystem.h \
+    Source/Runtime/Include/Qt3DSTimePolicy.h \
+    Source/Runtime/Include/Qt3DSApplicationValues.h \
+    Source/Runtime/Include/Qt3DSBinarySerializationHelper.h \
+    Source/Runtime/Include/Qt3DSBinarySerializer.h \
+    Source/Runtime/Include/Qt3DSIComponentManager.h \
+    Source/Runtime/Include/Qt3DSIInputSystem.h \
+    Source/Runtime/Include/Qt3DSInputDefs.h \
+    Source/Runtime/Include/Qt3DSInputEventTypes.h \
+    Source/Runtime/Include/Qt3DSIStateful.h \
+    Source/Runtime/Include/Qt3DSIText.h \
+    Source/Runtime/Include/Qt3DSKernelTypes.h \
+    Source/Runtime/Include/Qt3DSLuaIncludes.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h \
+    Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h \
+    Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h \
+    Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h \
+    Source/System/Include/Qt3DSArray.h \
+    Source/System/Include/Qt3DSAssert.h \
+    Source/System/Include/Qt3DSAudioPlayer.h \
+    Source/System/Include/Qt3DSBasicPluginDLL.h \
+    Source/System/Include/Qt3DSBezierEval.h \
+    Source/System/Include/Qt3DSBoundingBox.h \
+    Source/System/Include/Qt3DSCircularArray.h \
+    Source/System/Include/Qt3DSColor.h \
+    Source/System/Include/Qt3DSConfig.h \
+    Source/System/Include/Qt3DSCubicRoots.h \
+    Source/System/Include/Qt3DSCubicRootsImpl.h \
+    Source/System/Include/Qt3DSDataLogger.h \
+    Source/System/Include/Qt3DSDataLogger.hpp \
+    Source/System/Include/Qt3DSDataLoggerEnums.h \
+    Source/System/Include/Qt3DSDataLoggerViewer.h \
+    Source/System/Include/Qt3DSDLLManager.h \
+    Source/System/Include/Qt3DSEGLTimer.h \
+    Source/System/Include/Qt3DSEndian.h \
+    Source/System/Include/Qt3DSEulerAngles.h \
+    Source/System/Include/Qt3DSFile.h \
+    Source/System/Include/Qt3DSFileStream.h \
+    Source/System/Include/Qt3DSFixedArray.h \
+    Source/System/Include/Qt3DSFNDTimer.h \
+    Source/System/Include/Qt3DSFunctionWrappers.h \
+    Source/System/Include/Qt3DSHash.h \
+    Source/System/Include/Qt3DSIFileStream.h \
+    Source/System/Include/Qt3DSIStream.h \
+    Source/System/Include/Qt3DSITimer.h \
+    Source/System/Include/Qt3DSMacros.h \
+    Source/System/Include/Qt3DSMatrix.h \
+    Source/System/Include/Qt3DSMemory.h \
+    Source/System/Include/Qt3DSMemoryFilter.h \
+    Source/System/Include/Qt3DSMemoryHeap.h \
+    Source/System/Include/Qt3DSMemoryManager.h \
+    Source/System/Include/Qt3DSMemoryPool.h \
+    Source/System/Include/Qt3DSMemoryProbe.h \
+    Source/System/Include/Qt3DSMemorySettings.h \
+    Source/System/Include/Qt3DSMemoryStatistics.h \
+    Source/System/Include/Qt3DSMemoryTracker.h \
+    Source/System/Include/Qt3DSPlatformSpecific.h \
+    Source/System/Include/Qt3DSSyncPrimitive.h \
+    Source/System/Include/Qt3DSThreadManager.h \
+    Source/System/Include/Qt3DSThreadSafeQueue.h \
+    Source/System/Include/Qt3DSThreadSafeScratchpad.h \
+    Source/System/Include/Qt3DSTimer.h \
+    Source/System/Include/Qt3DSTypes.h \
+    Source/System/Include/Qt3DSVector3.h \
+    Source/System/Include/Qt3DSArray.inl \
+    Source/System/Include/Qt3DSCircularArray.inl \
+    Source/System/Include/Qt3DSFixedArray.inl \
+    Source/System/Include/Qt3DSThreadSafeQueue.inl \
+    Source/System/Include/Qt3DSThreadSafeScratchpad.inl \
+    Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h \
+    Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSState.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h \
+    Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h \
+    Source/UIPParser/Include/Qt3DSIPresentation.h \
+    Source/UIPParser/Include/Qt3DSUIPParser.h \
+    Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h \
+    Source/UIPParser/Include/Qt3DSUIPParserImpl.h \
+    Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h \
+    Source/Runtime/Include/Qt3DSCommandEventTypes.h \
+    Source/Runtime/Include/Qt3DSEvent.h \
+    Source/Runtime/Include/Qt3DSFrameworkTypes.h \
+    Source/Runtime/Include/Qt3DSInputFrame.h \
+    Source/Runtime/Include/Qt3DSIScene.h \
+    Source/Runtime/Include/Qt3DSIScriptBridge.h \
+    Source/Runtime/Include/Qt3DSPickFrame.h \
+    Source/Runtime/Include/Qt3DSRuntimeFactory.h \
+    Source/Runtime/Include/Qt3DSSceneManager.h \
+    Source/Engine/Include/Qt3DSEGLInfo.h \
+    Source/Engine/Include/Qt3DSEGLWindowSystem.h \
+    Source/Engine/Include/Qt3DSPluginDLL.h \
+    Source/Engine/Include/Qt3DSWindowSystem.h \
+    Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
 
 win32 {
 SOURCES += \
@@ -258,9 +646,9 @@ HEADERS += \
     Source/Qt3DSRender/Include/render/backends/software/Qt3DSRenderBackendNULL.h \
     Source/Qt3DSRender/Include/render/backends/gl/Q3DSRenderBackendGLES2.h
 
-# UICDM
+# DataModel
 SOURCES += \
-    Source/RuntimeUICDM/Source/UICMetadata.cpp \
+    Source/DataModel/Source/Qt3DSMetadata.cpp \
     $$PWD/../Authoring/UICIMP/UICImportLib/UICImportMesh.cpp \
     $$PWD/../Authoring/UICIMP/UICImportLib/UICImportPath.cpp \
     $$PWD/../Authoring/UICDM/Systems/UICDMMetaData.cpp \
@@ -272,8 +660,8 @@ SOURCES += \
     $$PWD/../Authoring/UICDM/Systems/Cores/SimpleDataCore.cpp
 
 HEADERS += \
-    Source/RuntimeUICDM/Include/UICMetadata.h \
-    Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h \
+    Source/DataModel/Include/Qt3DSMetadata.h \
+    Source/DataModel/Include/DocumentResourceManagerScriptParser.h \
     $$PWD/../Authoring/UICIMP/UICImportLib/UICImportMesh.h \
     $$PWD/../Authoring/UICIMP/UICImportLib/UICImportPath.h \
     $$PWD/../Authoring/UICDM/Systems/UICDMMetaData.h \
@@ -286,415 +674,60 @@ HEADERS += \
 
 # Engine
 HEADERS += \
-    Source/Engine/Include/EnginePrefix.h \
-    Source/Engine/Include/UICTegraApplication.h \
-    Source/Engine/Include/UICTegraInputEngine.h \
-    Source/Engine/Include/UICRenderRuntimeBinding.h \
-    Source/Engine/Include/UICRenderRuntimeBindingImpl.h
+    Source/Engine/Include/EnginePrefix.h
 
 SOURCES += \
-    Source/Engine/Source/EnginePrefix.cpp \
-    Source/Engine/Source/UICOSSpecificFunctions.cpp \
-    Source/Engine/Source/UICRenderRuntimeBinding.cpp \
-    Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp \
-    Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp \
-    Source/Engine/Source/UICTegraApplication.cpp \
-    Source/Engine/Source/UICTegraInputEngine.cpp
+    Source/Engine/Source/EnginePrefix.cpp
 
 # Event
 SOURCES += \
-    Source/UICEvent/Source/EventFactory.cpp \
-    Source/UICEvent/Source/EventPoller.cpp \
-    Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp \
-    Source/UICEvent/Source/EventSystemC.cpp
+    Source/Qt3DSEvent/Source/EventFactory.cpp \
+    Source/Qt3DSEvent/Source/EventPoller.cpp \
+    Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp \
+    Source/Qt3DSEvent/Source/EventSystemC.cpp
 
 HEADERS += \
-    Source/UICEvent/InternalInclude/EventPollingSystem.h \
-    Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h \
-    Source/UICEvent/Include/EventSystem.h \
-    Source/UICEvent/Include/EventSystemC.h
+    Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h \
+    Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h \
+    Source/Qt3DSEvent/Include/EventSystem.h \
+    Source/Qt3DSEvent/Include/EventSystemC.h
 
 # Render
-SOURCES += \
-    Source/UICRender/Source/UICOffscreenRenderManager.cpp \
-    Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp \
-    Source/UICRender/Source/UICOnscreenTextRenderer.cpp \
-    Source/UICRender/Source/UICRenderClippingFrustum.cpp \
-    Source/UICRender/Source/UICRenderContext.cpp \
-    Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp \
-    Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp \
-    Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp \
-    Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp \
-    Source/UICRender/Source/UICRenderEffectSystem.cpp \
-    Source/UICRender/Source/UICRendererUtil.cpp \
-    Source/UICRender/Source/UICRenderEulerAngles.cpp \
-    Source/UICRender/Source/UICRenderGpuProfiler.cpp \
-    Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp \
-    Source/UICRender/Source/UICRenderImageScaler.cpp \
-    Source/UICRender/Source/UICRenderInputStreamFactory.cpp \
-    Source/UICRender/Source/UICRenderPathManager.cpp \
-    Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp \
-    Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp \
-    Source/UICRender/Source/UICRenderPlugin.cpp \
-    Source/UICRender/Source/UICRenderRay.cpp \
-    Source/UICRender/Source/UICRenderRenderList.cpp \
-    Source/UICRender/Source/UICRenderShaderCache.cpp \
-    Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp \
-    Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp \
-    Source/UICRender/Source/UICRenderShadowMap.cpp \
-    Source/UICRender/Source/UICRenderSubpresentation.cpp \
-    Source/UICRender/Source/UICRenderTextTextureAtlas.cpp \
-    Source/UICRender/Source/UICRenderTextTextureCache.cpp \
-    Source/UICRender/Source/UICRenderTextureAtlas.cpp \
-    Source/UICRender/Source/UICRenderThreadPool.cpp \
-    Source/UICRender/Source/UICRenderUIPLoader.cpp \
-    Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp \
-    Source/UICRender/Source/UICRenderWidgets.cpp \
-    Source/UICRender/Source/UICTextRenderer.cpp \
-    Source/UICRender/Source/UICQtTextRenderer.cpp \
-    Source/UICRender/GraphObjects/UICRenderCamera.cpp \
-    Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp \
-    Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp \
-    Source/UICRender/GraphObjects/UICRenderEffect.cpp \
-    Source/UICRender/GraphObjects/UICRenderImage.cpp \
-    Source/UICRender/GraphObjects/UICRenderLayer.cpp \
-    Source/UICRender/GraphObjects/UICRenderLight.cpp \
-    Source/UICRender/GraphObjects/UICRenderLightmaps.cpp \
-    Source/UICRender/GraphObjects/UICRenderModel.cpp \
-    Source/UICRender/GraphObjects/UICRenderNode.cpp \
-    Source/UICRender/GraphObjects/UICRenderPath.cpp \
-    Source/UICRender/GraphObjects/UICRenderPresentation.cpp \
-    Source/UICRender/GraphObjects/UICRenderScene.cpp \
-    Source/UICRender/GraphObjects/UICRenderText.cpp \
-    Source/UICRender/RendererImpl/UICRenderableObjects.cpp \
-    Source/UICRender/RendererImpl/UICRendererImpl.cpp \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp \
-    Source/UICRender/RendererImpl/UICRendererImplShaders.cpp \
-    Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp \
-    Source/UICRender/ResourceManager/UICRenderBufferManager.cpp \
-    Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp \
-    Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureBMP.cpp \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureGIF.cpp \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureHDR.cpp \
-    Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp \
-    Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp \
-    Source/UICRender/ResourceManager/UICRenderResourceManager.cpp \
-    Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp
+SOURCES +=
 
 HEADERS += \
-    Source/UICRender/Include/UICOffscreenRenderKey.h \
-    Source/UICRender/Include/UICOffscreenRenderManager.h \
-    Source/UICRender/Include/UICOldNBustedRenderPlugin.h \
-    Source/UICRender/Include/UICRender.h \
-    Source/UICRender/Include/UICRenderableImage.h \
-    Source/UICRender/Include/UICRenderClippingFrustum.h \
-    Source/UICRender/Include/UICRenderContext.h \
-    Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h \
-    Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h \
-    Source/UICRender/Include/UICRenderCustomMaterialSystem.h \
-    Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h \
-    Source/UICRender/Include/UICRenderDynamicObjectSystem.h \
-    Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h \
-    Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h \
-    Source/UICRender/Include/UICRenderEffectSystem.h \
-    Source/UICRender/Include/UICRenderer.h \
-    Source/UICRender/Include/UICRendererUtil.h \
-    Source/UICRender/Include/UICRenderEulerAngles.h \
-    Source/UICRender/Include/UICRenderGraphObjectPickQuery.h \
-    Source/UICRender/Include/UICRenderGraphObjectSerializer.h \
-    Source/UICRender/Include/UICRenderGraphObjectTypes.h \
-    Source/UICRender/Include/UICRenderImageScaler.h \
-    Source/UICRender/Include/UICRenderImageTextureData.h \
-    Source/UICRender/Include/UICRenderInputStreamFactory.h \
-    Source/UICRender/Include/UICRenderMaterialHelpers.h \
-    Source/UICRender/Include/UICRenderMaterialShaderGenerator.h \
-    Source/UICRender/Include/UICRenderMesh.h \
-    Source/UICRender/Include/UICRenderPathManager.h \
-    Source/UICRender/Include/UICRenderPathMath.h \
-    Source/UICRender/Include/UICRenderPathRenderContext.h \
-    Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h \
-    Source/UICRender/Include/UICRenderPixelGraphicsTypes.h \
-    Source/UICRender/Include/UICRenderPlugin.h \
-    Source/UICRender/Include/UICRenderPluginCInterface.h \
-    Source/UICRender/Include/UICRenderPluginGraphObject.h \
-    Source/UICRender/Include/UICRenderPluginPropertyValue.h \
-    Source/UICRender/Include/UICRenderProfiler.h \
-    Source/UICRender/Include/UICRenderRay.h \
-    Source/UICRender/Include/UICRenderRenderList.h \
-    Source/UICRender/Include/UICRenderRotationHelper.h \
-    Source/UICRender/Include/UICRenderShaderCache.h \
-    Source/UICRender/Include/UICRenderShaderCodeGenerator.h \
-    Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h \
-    Source/UICRender/Include/UICRenderShaderKeys.h \
-    Source/UICRender/Include/UICRenderShadowMap.h \
-    Source/UICRender/Include/UICRenderString.h \
-    Source/UICRender/Include/UICRenderSubpresentation.h \
-    Source/UICRender/Include/UICRenderSubPresentationHelper.h \
-    Source/UICRender/Include/UICRenderTaggedPointer.h \
-    Source/UICRender/Include/UICRenderTessModeValues.h \
-    Source/UICRender/Include/UICRenderTextTextureAtlas.h \
-    Source/UICRender/Include/UICRenderTextTextureCache.h \
-    Source/UICRender/Include/UICRenderTextTypes.h \
-    Source/UICRender/Include/UICRenderTextureAtlas.h \
-    Source/UICRender/Include/UICRenderThreadPool.h \
-    Source/UICRender/Include/UICRenderUIPLoader.h \
-    Source/UICRender/Include/UICRenderUIPSharedTranslation.h \
-    Source/UICRender/Include/UICRenderWidgets.h \
-    Source/UICRender/Include/UICRenderWindowDimensions.h \
-    Source/UICRender/Include/UICTextRenderer.h \
-    Source/UICRender/GraphObjects/UICRenderCamera.h \
-    Source/UICRender/GraphObjects/UICRenderCustomMaterial.h \
-    Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h \
-    Source/UICRender/GraphObjects/UICRenderDynamicObject.h \
-    Source/UICRender/GraphObjects/UICRenderEffect.h \
-    Source/UICRender/GraphObjects/UICRenderGraphObject.h \
-    Source/UICRender/GraphObjects/UICRenderImage.h \
-    Source/UICRender/GraphObjects/UICRenderLayer.h \
-    Source/UICRender/GraphObjects/UICRenderLight.h \
-    Source/UICRender/GraphObjects/UICRenderLightmaps.h \
-    Source/UICRender/GraphObjects/UICRenderMaterialDirty.h \
-    Source/UICRender/GraphObjects/UICRenderModel.h \
-    Source/UICRender/GraphObjects/UICRenderNode.h \
-    Source/UICRender/GraphObjects/UICRenderPath.h \
-    Source/UICRender/GraphObjects/UICRenderPathSubPath.h \
-    Source/UICRender/GraphObjects/UICRenderPresentation.h \
-    Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h \
-    Source/UICRender/GraphObjects/UICRenderScene.h \
-    Source/UICRender/GraphObjects/UICRenderText.h \
-    Source/UICRender/RendererImpl/UICRenderableObjects.h \
-    Source/UICRender/RendererImpl/UICRendererImpl.h \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h \
-    Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h \
-    Source/UICRender/RendererImpl/UICRendererImplShaders.h \
-    Source/UICRender/RendererImpl/UICVertexPipelineImpl.h \
-    Source/UICRender/ResourceManager/UICRenderBufferLoader.h \
-    Source/UICRender/ResourceManager/UICRenderBufferManager.h \
-    Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h \
-    Source/UICRender/ResourceManager/UICRenderLoadedTexture.h \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h \
-    Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h \
-    Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h \
-    Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h \
-    Source/UICRender/ResourceManager/UICRenderResourceManager.h \
-    Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h \
-    Source/UICRender/Include/ANDROID/DynamicLibLoader.h \
-    Source/UICRender/Include/LINUX/DynamicLibLoader.h \
-    Source/UICRender/Include/OSX/DynamicLibLoader.h \
-    Source/UICRender/Include/QNX/DynamicLibLoader.h \
-    Source/UICRender/Include/WINDOWS/DynamicLibLoader.h
+    Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h \
+    Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h \
+    Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h \
+    Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h \
+    Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h
 
 # Runtime
 HEADERS += \
     Source/Runtime/Include/RuntimePrefix.h \
-    Source/Runtime/Include/UICActivationManager.h \
-    Source/Runtime/Include/UICAnimationSystem.h \
-    Source/Runtime/Include/UICApplication.h \
-    Source/Runtime/Include/UICAttributeHashes.h \
-    Source/Runtime/Include/UICBinarySerializerImpl.h \
-    Source/Runtime/Include/UICComponentManager.h \
-    Source/Runtime/Include/UICElementSystem.h \
-    Source/Runtime/Include/UICEventCallbacks.h \
-    Source/Runtime/Include/UICInputEngine.h \
-    Source/Runtime/Include/UICLogicSystem.h \
-    Source/Runtime/Include/UICLuaAxis.h \
-    Source/Runtime/Include/UICLuaButton.h \
-    Source/Runtime/Include/UICLuaColor.h \
-    Source/Runtime/Include/UICLuaCommandHelper.h \
-    Source/Runtime/Include/UICLuaElementHelper.h \
-    Source/Runtime/Include/UICLuaEngine.h \
-    Source/Runtime/Include/UICLuaEventHelper.h \
-    Source/Runtime/Include/UICLuaHelper.h \
-    Source/Runtime/Include/UICLuaKeyboard.h \
-    Source/Runtime/Include/UICLuaMatrix.h \
-    Source/Runtime/Include/UICLuaRotation.h \
-    Source/Runtime/Include/UICLuaSceneHelper.h \
-    Source/Runtime/Include/UICLuaVector.h \
-    Source/Runtime/Include/UICOutputMemoryStream.h \
-    Source/Runtime/Include/UICParametersSystem.h \
-    Source/Runtime/Include/UICPresentation.h \
-    Source/Runtime/Include/UICPresentationFrameData.h \
-    Source/Runtime/Include/UICQmlEngine.h \
-    Source/Runtime/Include/UICSlideSystem.h \
-    Source/Runtime/Include/UICTimePolicy.h \
-    Source/Runtime/Include/UICQmlElementHelper.h \
     Source/Runtime/Include/q3dsqmlscript.h
 
 SOURCES += \
     Source/Runtime/Source/RuntimePrefix.cpp \
-    Source/Runtime/Source/UICActivationManager.cpp \
-    Source/Runtime/Source/UICAnimationSystem.cpp \
-    Source/Runtime/Source/UICApplication.cpp \
-    Source/Runtime/Source/UICAttributeHashes.cpp \
-    Source/Runtime/Source/UICBinarySerializerImpl.cpp \
-    Source/Runtime/Source/UICComponentManager.cpp \
-    Source/Runtime/Source/UICElementSystem.cpp \
-    Source/Runtime/Source/UICEventCallbacks.cpp \
-    Source/Runtime/Source/UICInputEngine.cpp \
-    Source/Runtime/Source/UICLogicSystem.cpp \
-    Source/Runtime/Source/UICLuaAxis.cpp \
-    Source/Runtime/Source/UICLuaButton.cpp \
-    Source/Runtime/Source/UICLuaColor.cpp \
-    Source/Runtime/Source/UICLuaCommandHelper.cpp \
-    Source/Runtime/Source/UICLuaElementHelper.cpp \
-    Source/Runtime/Source/UICLuaEngine.cpp \
-    Source/Runtime/Source/UICLuaEventHelper.cpp \
-    Source/Runtime/Source/UICLuaHelper.cpp \
-    Source/Runtime/Source/UICLuaKeyboard.cpp \
-    Source/Runtime/Source/UICLuaMatrix.cpp \
-    Source/Runtime/Source/UICLuaRotation.cpp \
-    Source/Runtime/Source/UICLuaSceneHelper.cpp \
-    Source/Runtime/Source/UICLuaVector.cpp \
-    Source/Runtime/Source/UICOutputMemoryStream.cpp \
-    Source/Runtime/Source/UICParametersSystem.cpp \
-    Source/Runtime/Source/UICPresentation.cpp \
-    Source/Runtime/Source/UICPresentationFrameData.cpp \
-    Source/Runtime/Source/UICQmlEngine.cpp \
-    Source/Runtime/Source/UICSlideSystem.cpp \
-    Source/Runtime/Source/UICTimePolicy.cpp \
-    Source/Runtime/Source/UICQmlElementHelper.cpp \
     Source/Runtime/Source/q3dsqmlscript.cpp
 
 # State
-SOURCES += \
-    Source/UICState/Source/UICStateContext.cpp \
-    Source/UICState/Source/UICStateExecutionContext.cpp \
-    Source/UICState/Source/UICStateInterpreter.cpp \
-    Source/UICState/Source/UICStateLuaScriptContext.cpp \
-    Source/UICState/Source/UICStateVisualBindingContext.cpp \
-    Source/UICState/Source/UICStateXMLIO.cpp \
-    Source/UICState/Debugger/UICLuaDatamodelCache.cpp \
-    Source/UICState/Debugger/UICLuaSideDebugger.cpp \
-    Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp \
-    Source/UICState/Debugger/UICStateDataTest.cpp \
-    Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp \
-    Source/UICState/Debugger/UICStateDebugger.cpp \
-    Source/UICState/Debugger/UICStateDebuggerListener.cpp \
-    Source/UICState/Debugger/UICStateDebugStreams.cpp \
-    Source/UICState/Debugger/UICStateLuaTest.cpp \
-    Source/UICState/Application/UICStateApplication.cpp
+SOURCES +=
+
+HEADERS +=
 
-HEADERS += \
-    Source/UICState/Include/UICState.h \
-    Source/UICState/Include/UICStateContext.h \
-    Source/UICState/Include/UICStateExecutionContext.h \
-    Source/UICState/Include/UICStateExecutionTypes.h \
-    Source/UICState/Include/UICStateIdValue.h \
-    Source/UICState/Include/UICStateInterpreter.h \
-    Source/UICState/Include/UICStateLuaScriptContext.h \
-    Source/UICState/Include/UICStateScriptContext.h \
-    Source/UICState/Include/UICStateSharedImpl.h \
-    Source/UICState/Include/UICStateSignalConnection.h \
-    Source/UICState/Include/UICStateTypes.h \
-    Source/UICState/Include/UICStateVisualBindingContext.h \
-    Source/UICState/Include/UICStateVisualBindingContextCommands.h \
-    Source/UICState/Include/UICStateVisualBindingContextValues.h \
-    Source/UICState/Include/UICStateXMLIO.h \
-    Source/UICState/Application/UICStateApplication.h \
-    Source/UICState/Debugger/UICLuaDebugger.h \
-    Source/UICState/Debugger/UICLuaDebuggerImpl.h \
-    Source/UICState/Debugger/UICLuaDebuggerProtocol.h \
-    Source/UICState/Debugger/UICSceneGraphDebugger.h \
-    Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h \
-    Source/UICState/Debugger/UICSceneGraphDebuggerValue.h \
-    Source/UICState/Debugger/UICStateDebugger.h \
-    Source/UICState/Debugger/UICStateDebuggerProtocol.h \
-    Source/UICState/Debugger/UICStateDebuggerValues.h \
-    Source/UICState/Debugger/UICStateDebugStreams.h \
-    Source/UICState/Debugger/UICStateTest.h \
-    Source/UICState/Debugger/UICStateTestCommon.h
 
 # System
 SOURCES += \
-    Source/System/Source/SystemPrefix.cpp \
-    Source/System/Source/UICAssert.cpp \
-    Source/System/Source/UICBoundingBox.cpp \
-    Source/System/Source/UICColor.cpp \
-    Source/System/Source/UICCubicRoots.cpp \
-    Source/System/Source/UICDataLogger.cpp \
-    Source/System/Source/UICDLLManager.cpp \
-    Source/System/Source/UICEulerAngles.cpp \
-    Source/System/Source/UICFile.cpp \
-    Source/System/Source/UICFileStream.cpp \
-    Source/System/Source/UICFunctionWrappers.cpp \
-    Source/System/Source/UICMatrix.cpp \
-    Source/System/Source/UICMemory.cpp \
-    Source/System/Source/UICMemoryFilter.cpp \
-    Source/System/Source/UICMemoryHeap.cpp \
-    Source/System/Source/UICMemoryManager.cpp \
-    Source/System/Source/UICMemoryPool.cpp \
-    Source/System/Source/UICMemoryProbe.cpp \
-    Source/System/Source/UICMemoryStatistics.cpp \
-    Source/System/Source/UICMemoryTracker.cpp \
-    Source/System/Source/UICSyncPrimitive.cpp \
-    Source/System/Source/UICThreadManager.cpp \
-    Source/System/Source/UICTimer.cpp \
-    Source/System/Source/UICTypes.cpp \
-    Source/System/Source/UICVector3.cpp
+    Source/System/Source/SystemPrefix.cpp
 
 HEADERS += \
-    Source/System/Include/SystemPrefix.h \
-    Source/System/Include/UICArray.h \
-    Source/System/Include/UICAssert.h \
-    Source/System/Include/UICAudioPlayer.h \
-    Source/System/Include/UICBasicPluginDLL.h \
-    Source/System/Include/UICBezierEval.h \
-    Source/System/Include/UICBoundingBox.h \
-    Source/System/Include/UICCircularArray.h \
-    Source/System/Include/UICColor.h \
-    Source/System/Include/UICConfig.h \
-    Source/System/Include/UICCubicRoots.h \
-    Source/System/Include/UICCubicRootsImpl.h \
-    Source/System/Include/UICDataLogger.h \
-    Source/System/Include/UICDataLogger.hpp \
-    Source/System/Include/UICDataLoggerEnums.h \
-    Source/System/Include/UICDataLoggerViewer.h \
-    Source/System/Include/UICDLLManager.h \
-    Source/System/Include/UICEGLTimer.h \
-    Source/System/Include/UICEndian.h \
-    Source/System/Include/UICEulerAngles.h \
-    Source/System/Include/UICFile.h \
-    Source/System/Include/UICFileStream.h \
-    Source/System/Include/UICFixedArray.h \
-    Source/System/Include/UICFNDTimer.h \
-    Source/System/Include/UICFunctionWrappers.h \
-    Source/System/Include/UICHash.h \
-    Source/System/Include/UICIFileStream.h \
-    Source/System/Include/UICIStream.h \
-    Source/System/Include/UICITimer.h \
-    Source/System/Include/UICMacros.h \
-    Source/System/Include/UICMatrix.h \
-    Source/System/Include/UICMemory.h \
-    Source/System/Include/UICMemoryFilter.h \
-    Source/System/Include/UICMemoryHeap.h \
-    Source/System/Include/UICMemoryManager.h \
-    Source/System/Include/UICMemoryPool.h \
-    Source/System/Include/UICMemoryProbe.h \
-    Source/System/Include/UICMemorySettings.h \
-    Source/System/Include/UICMemoryStatistics.h \
-    Source/System/Include/UICMemoryTracker.h \
-    Source/System/Include/UICPlatformSpecific.h \
-    Source/System/Include/UICSyncPrimitive.h \
-    Source/System/Include/UICThreadManager.h \
-    Source/System/Include/UICThreadSafeQueue.h \
-    Source/System/Include/UICThreadSafeScratchpad.h \
-    Source/System/Include/UICTimer.h \
-    Source/System/Include/UICTypes.h \
-    Source/System/Include/UICVector3.h
+    Source/System/Include/SystemPrefix.h
 
 # Parser
-SOURCES += \
-    Source/UIPParser/Source/UICUIPParserActionHelper.cpp \
-    Source/UIPParser/Source/UICUIPParserImpl.cpp \
-    Source/UIPParser/Source/UICUIPParserObjectRefHelper.cpp
+SOURCES +=
 
-HEADERS += \
-    Source/UIPParser/Include/UICIPresentation.h \
-    Source/UIPParser/Include/UICUIPParser.h \
-    Source/UIPParser/Include/UICUIPParserActionHelper.h \
-    Source/UIPParser/Include/UICUIPParserImpl.h \
-    Source/UIPParser/Include/UICUIPParserObjectRefHelper.h
+HEADERS +=
+
+DISTFILES += \
+    Source/Runtime/Include/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/SDKsAndTools/AttributeHashes/AttributeHashes.cpp b/src/Runtime/SDKsAndTools/AttributeHashes/AttributeHashes.cpp
index a3b70602..31205aeb 100644
--- a/src/Runtime/SDKsAndTools/AttributeHashes/AttributeHashes.cpp
+++ b/src/Runtime/SDKsAndTools/AttributeHashes/AttributeHashes.cpp
@@ -49,10 +49,10 @@
 #include <fstream>
 #include <string>
 
-#include "UICConfig.h"
-#include "UICTypes.h"
-#include "UICKernelTypes.h"
-#include "UICHash.h"
+#include "Qt3DSConfig.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSHash.h"
 
 //==============================================================================
 //    Types
diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerCustomMaterialParser.h
index 9803b00d..29d096f6 100644
--- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerCustomMaterialParser.h
+++ b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerCustomMaterialParser.h
@@ -39,7 +39,7 @@
 #include "UICDMWStrOpsImpl.h"
 #include "foundation/StrConvertUTF.h"
 #include <EASTL/string.h>
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 namespace Q3DStudio {
 struct CCustomMaterialParser
diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerLuaParser.h
index facc6506..b286d004 100644
--- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerLuaParser.h
+++ b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerLuaParser.h
@@ -39,7 +39,7 @@
 #include "UICDMWStrOpsImpl.h"
 #include "foundation/StrConvertUTF.h"
 #include <EASTL/string.h>
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 namespace Q3DStudio {
 namespace LuaParser {
diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerRenderPluginParser.h
index c3726c20..f3fa547f 100644
--- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerRenderPluginParser.h
+++ b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerRenderPluginParser.h
@@ -39,7 +39,7 @@
 #include "UICDMWStrOpsImpl.h"
 #include "foundation/StrConvertUTF.h"
 #include <EASTL/string.h>
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 namespace Q3DStudio {
 struct CRenderPluginParser
diff --git a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerScriptParser.h
index 41a2735e..1efde29a 100644
--- a/src/Runtime/Source/RuntimeUICDM/Include/DocumentResourceManagerScriptParser.h
+++ b/src/Runtime/Source/DataModel/Include/DocumentResourceManagerScriptParser.h
@@ -35,7 +35,7 @@
 #include "UICDMXML.h"
 #include "UICDMDataTypes.h"
 #include "UICDMMetaData.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 namespace Q3DStudio {
 namespace ScriptParser {
diff --git a/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h b/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
index b1631d23..b1631d23 100644
--- a/src/Runtime/Source/RuntimeUICDM/Include/UICMetadata.h
+++ b/src/Runtime/Source/DataModel/Include/Qt3DSMetadata.h
diff --git a/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
index 24093c8d..71da3576 100644
--- a/src/Runtime/Source/RuntimeUICDM/Source/UICMetadata.cpp
+++ b/src/Runtime/Source/DataModel/Source/Qt3DSMetadata.cpp
@@ -32,17 +32,17 @@
 // Includes
 //==============================================================================
 #include "UICDMPrefix.h"
-#include "UICMetadata.h"
+#include "Qt3DSMetadata.h"
 #include "SimpleDataCore.h"
 #include "UICDMXML.h"
 #include "foundation/IOStreams.h"
-#include "UICEulerAngles.h"
+#include "Qt3DSEulerAngles.h"
 #include "UICDMWindowsCompatibility.h"
 #include "UICDMComposerTypeDefinitions.h"
 #include "DocumentResourceManagerScriptParser.h"
 #include "DocumentResourceManagerLuaParser.h"
 #include "foundation/StrConvertUTF.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/FileTools.h"
 #include "foundation/TrackingAllocator.h"
 #include "EASTL/hash_map.h"
diff --git a/src/Runtime/Source/Engine/Include/EnginePrefix.h b/src/Runtime/Source/Engine/Include/EnginePrefix.h
index 475b513b..32858ae0 100644
--- a/src/Runtime/Source/Engine/Include/EnginePrefix.h
+++ b/src/Runtime/Source/Engine/Include/EnginePrefix.h
@@ -97,12 +97,12 @@
 //==============================================================================
 //	Runtime
 //==============================================================================
-#include "UICAssert.h"
-#include "UICMacros.h"
-#include "UICElementSystem.h"
-#include "UICLuaEngine.h"
-#include "UICQmlEngine.h"
-#include "UICAttributeHashes.h"
+#include "Qt3DSAssert.h"
+#include "Qt3DSMacros.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSQmlEngine.h"
+#include "Qt3DSAttributeHashes.h"
 
 //==============================================================================
 //	Additional Linux only dependencies
diff --git a/src/Runtime/Source/Engine/Include/UICEGLInfo.h b/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h
index c8ffcf2f..c8ffcf2f 100644
--- a/src/Runtime/Source/Engine/Include/UICEGLInfo.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSEGLInfo.h
diff --git a/src/Runtime/Source/Engine/Include/UICEGLWindowSystem.h b/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h
index a28cf341..8b5a7577 100644
--- a/src/Runtime/Source/Engine/Include/UICEGLWindowSystem.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSEGLWindowSystem.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_EGL_WINDOW_SYSTEM_H
 #define UIC_EGL_WINDOW_SYSTEM_H
-#include "UICEGLInfo.h"
+#include "Qt3DSEGLInfo.h"
 #include "UICWindowSystem.h"
 #include "nv_main/nv_main.h"
 
diff --git a/src/Runtime/Source/Engine/Include/UICPluginDLL.h b/src/Runtime/Source/Engine/Include/Qt3DSPluginDLL.h
index 3d9e0b40..9727a148 100644
--- a/src/Runtime/Source/Engine/Include/UICPluginDLL.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSPluginDLL.h
@@ -31,7 +31,7 @@
 //	Includes
 //==============================================================================
 #pragma once
-#include "UICBasicPluginDLL.h"
+#include "Qt3DSBasicPluginDLL.h"
 
 #include <QtGlobal>
 
diff --git a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
index 4b004ed4..3046a332 100644
--- a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBinding.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBinding.h
@@ -28,10 +28,10 @@
 **
 ****************************************************************************/
 
-#pragma once
-#ifndef UIC_RENDER_RUNTIME_BINDING_H
-#define UIC_RENDER_RUNTIME_BINDING_H
-#include "UICRuntimeFactory.h"
+#ifndef QT3DS_RENDER_RUNTIME_BINDING_H
+#define QT3DS_RENDER_RUNTIME_BINDING_H
+
+#include "Qt3DSRuntimeFactory.h"
 #include "EABase/eabase.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "render/Qt3DSRenderContext.h"
diff --git a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
index ea4e5078..dbd03523 100644
--- a/src/Runtime/Source/Engine/Include/UICRenderRuntimeBindingImpl.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSRenderRuntimeBindingImpl.h
@@ -27,45 +27,45 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#pragma once
-#ifndef UIC_RENDER_RUNTIME_BINDING_IMPL_H
-#define UIC_RENDER_RUNTIME_BINDING_IMPL_H
 
-#include "UICRenderRuntimeBinding.h"
+#ifndef QT3DS_RENDER_RUNTIME_BINDING_IMPL_H
+#define QT3DS_RENDER_RUNTIME_BINDING_IMPL_H
+
+#include "Qt3DSRenderRuntimeBinding.h"
 #include "foundation/TrackingAllocator.h"
 #include "foundation/Utils.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICRender.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderContextCore.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICIPresentation.h"
+#include "Qt3DSIPresentation.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICRenderPresentation.h"
-#include "UICRenderScene.h"
-#include "UICRenderLayer.h"
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderModel.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderImage.h"
-#include "UICUIPParser.h"
-#include "UICRenderEffect.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderPresentation.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSUIPParser.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "foundation/Qt3DSInvasiveSet.h"
-#include "UICIPresentation.h"
-#include "UICTextRenderer.h"
-#include "UICRenderText.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderText.h"
 #include "foundation/StrConvertUTF.h"
-#include "UICMetadata.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderContext.h"
-#include "UICWindowSystem.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderReferencedMaterial.h"
-#include "UICRenderText.h"
+#include "Qt3DSMetadata.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSWindowSystem.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderReferencedMaterial.h"
+#include "Qt3DSRenderText.h"
 #include "foundation/Qt3DSMutex.h"
 
 #ifdef EA_PLATFORM_WINDOWS
diff --git a/src/Runtime/Source/Engine/Include/UICTegraApplication.h b/src/Runtime/Source/Engine/Include/Qt3DSTegraApplication.h
index 45676ce1..aebf717a 100644
--- a/src/Runtime/Source/Engine/Include/UICTegraApplication.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSTegraApplication.h
@@ -28,18 +28,20 @@
 **
 ****************************************************************************/
 
-#pragma once
+#ifndef QT3DS_TEGRA_APPLICATION_H
+#define QT3DS_TEGRA_APPLICATION_H
+
 #include "EnginePrefix.h"
-#include "UICIStateful.h"
+#include "Qt3DSIStateful.h"
 #include "foundation/Qt3DSVec4.h"
 #include "foundation/Qt3DSOption.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICWindowSystem.h"
-#include "UICTimer.h"
-#include "UICPresentation.h"
-#include "UICRenderRuntimeBinding.h"
+#include "Qt3DSWindowSystem.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSRenderRuntimeBinding.h"
 #include <QtCore/qobject.h>
 #include <QtGui/qsurfaceformat.h>
 #include <KD/kd.h>
@@ -323,3 +325,5 @@ public:
     }
 };
 } // namespace Q3DStudio
+
+#endif // QT3DS_TEGRA_APPLICATION_H
diff --git a/src/Runtime/Source/Engine/Include/UICTegraInputEngine.h b/src/Runtime/Source/Engine/Include/Qt3DSTegraInputEngine.h
index 17b9a1dd..57b4de12 100644
--- a/src/Runtime/Source/Engine/Include/UICTegraInputEngine.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSTegraInputEngine.h
@@ -28,15 +28,16 @@
 **
 ****************************************************************************/
 
-#pragma once
+#ifndef QT3DS_TEGRA_INPUT_ENGINE_H
+#define QT3DS_TEGRA_INPUT_ENGINE_H
 
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICInputEngine.h"
-#include "UICTegraApplication.h"
-#include "UICInputEventTypes.h"
-#include "UICPresentation.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSTegraApplication.h"
+#include "Qt3DSInputEventTypes.h"
+#include "Qt3DSPresentation.h"
 #include "KD/kd.h"
 
 //==============================================================================
@@ -77,3 +78,5 @@ public: // Access
 };
 
 } // namespace Q3DStudio
+
+#endif // QT3DS_TEGRA_INPUT_ENGINE_H
diff --git a/src/Runtime/Source/Engine/Include/UICWindowSystem.h b/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h
index 25f5bf71..25f5bf71 100644
--- a/src/Runtime/Source/Engine/Include/UICWindowSystem.h
+++ b/src/Runtime/Source/Engine/Include/Qt3DSWindowSystem.h
diff --git a/src/Runtime/Source/Engine/Source/UICOSSpecificFunctions.cpp b/src/Runtime/Source/Engine/Source/Qt3DSOSSpecificFunctions.cpp
index c2224b5d..f85edd47 100644
--- a/src/Runtime/Source/Engine/Source/UICOSSpecificFunctions.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSOSSpecificFunctions.cpp
@@ -30,8 +30,8 @@
 
 #include "EnginePrefix.h"
 
-#include "UICSyncPrimitive.h"
-#include "UICThreadManager.h"
+#include "Qt3DSSyncPrimitive.h"
+#include "Qt3DSThreadManager.h"
 #include "NVImageScaler.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
index 971577ea..44159257 100644
--- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBinding.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBinding.cpp
@@ -29,53 +29,53 @@
 ****************************************************************************/
 
 #include "EnginePrefix.h"
-#include "UICRenderRuntimeBindingImpl.h"
-#include "UICSceneManager.h"
-#include "UICIScene.h"
-#include "UICTegraApplication.h"
-#include "UICLuaEngine.h"
-#include "UICQmlEngine.h"
-#include "UICRenderUIPLoader.h"
-#include "UICPresentationFrameData.h"
+#include "Qt3DSRenderRuntimeBindingImpl.h"
+#include "Qt3DSSceneManager.h"
+#include "Qt3DSIScene.h"
+#include "Qt3DSTegraApplication.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSQmlEngine.h"
+#include "Qt3DSRenderUIPLoader.h"
+#include "Qt3DSPresentationFrameData.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICRenderSubpresentation.h"
-#include "UICIScriptBridge.h"
-#include "UICFileStream.h"
+#include "Qt3DSRenderSubpresentation.h"
+#include "Qt3DSIScriptBridge.h"
+#include "Qt3DSFileStream.h"
 #include "UICDMPrefix.h"
 #include "foundation/IOStreams.h"
 #include "UICDMStringTable.h"
 #include "UICDMXML.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "foundation/SerializationTypes.h"
-#include "UICRenderGraphObjectSerializer.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderImageBatchLoader.h"
-#include "UICPresentation.h"
-
-#include "UICDLLManager.h"
-#include "UICBasicPluginDLL.h"
-#include "UICPluginDLL.h"
-#include "UICRenderPlugin.h"
+#include "Qt3DSRenderGraphObjectSerializer.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderImageBatchLoader.h"
+#include "Qt3DSPresentation.h"
+
+#include "Qt3DSDLLManager.h"
+#include "Qt3DSBasicPluginDLL.h"
+#include "Qt3DSPluginDLL.h"
+#include "Qt3DSRenderPlugin.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSTime.h"
-#include "UICStateVisualBindingContext.h"
-#include "UICStateVisualBindingContextValues.h"
-#include "UICStateScriptContext.h"
+#include "Qt3DSStateVisualBindingContext.h"
+#include "Qt3DSStateVisualBindingContextValues.h"
+#include "Qt3DSStateScriptContext.h"
 #include "EventPollingSystem.h"
 #include "EventSystem.h"
-#include "UICApplication.h"
-#include "UICMatrix.h"
-#include "UICWindowSystem.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSWindowSystem.h"
 #if !defined (Q_OS_MACOS)
-#include "UICEGLInfo.h"
+#include "Qt3DSEGLInfo.h"
 #endif
-#include "UICOffscreenRenderKey.h"
-#include "UICOldNBustedRenderPlugin.h"
-#include "UICRenderCustomMaterialSystem.h"
+#include "Qt3DSOffscreenRenderKey.h"
+#include "Qt3DSOldNBustedRenderPlugin.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
 #include "foundation/Qt3DSPerfTimer.h"
-#include "UICRenderBufferLoader.h"
-#include "UICRenderRenderList.h"
-#include "UICRenderPrefilterTexture.h"
+#include "Qt3DSRenderBufferLoader.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRenderPrefilterTexture.h"
 #include "foundation/PoolingAllocator.h"
 #include "q3dsqmlrender.h"
 
@@ -172,7 +172,7 @@ struct SUICRenderScene : public Q3DStudio::IScene
         , m_OffscreenRenderer(NULL)
         , m_SubPresentationType(
               inContext.GetStringTable().RegisterStr(CSubPresentationRenderer::GetRendererName()))
-        , m_GraphObjectList(inContext.GetAllocator(), "SUICRenderScene::m_GraphObjectList")
+        , m_GraphObjectList(inContext.GetAllocator(), "SUICDSRenderScene::m_GraphObjectList")
         , m_LoggedPickLastFrame(false)
     {
         for (QT3DSU32 idx = 0, end = inLoadData.m_Translators.size(); idx < end; ++idx) {
@@ -850,7 +850,7 @@ struct SUICRenderSceneManager : public Q3DStudio::ISceneManager,
 
     static QT3DSU32 GetFileTag()
     {
-        const char *fileTag = "UICS";
+        const char *fileTag = "Qt3DSS";
         const QT3DSU32 *theTagPtr = reinterpret_cast<const QT3DSU32 *>(fileTag);
         return *theTagPtr;
     }
@@ -1841,7 +1841,7 @@ struct SRenderFactory : public IUICRenderFactoryCore, public IUICRenderFactory
         qt3ds::render::NVRenderContext *CreateRenderContext(qt3ds::NVFoundationBase &foundat,
                                                                  IStringTable &strt) override
         {
-#ifndef UIC_NO_RENDER_SYMBOLS
+#ifndef Qt3DS_NO_RENDER_SYMBOLS
             qt3ds::render::NVRenderContext &retval = NVRenderContext::CreateGL(foundat, strt, format);
             return &retval;
 #else
diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
index ed6c1b2b..60a673f1 100644
--- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplRenderer.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplRenderer.cpp
@@ -28,10 +28,10 @@
 **
 ****************************************************************************/
 #include "EnginePrefix.h"
-#include "UICRenderRuntimeBindingImpl.h"
-#include "UICTegraApplication.h"
-#include "UICWindowSystem.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderRuntimeBindingImpl.h"
+#include "Qt3DSTegraApplication.h"
+#include "Qt3DSWindowSystem.h"
+#include "Qt3DSRenderLoadedTexture.h"
 
 using qt3ds::render::SWindowDimensions;
 
diff --git a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
index 8900c505..540664c8 100644
--- a/src/Runtime/Source/Engine/Source/UICRenderRuntimeBindingImplTranslation.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSRenderRuntimeBindingImplTranslation.cpp
@@ -28,22 +28,22 @@
 **
 ****************************************************************************/
 #include "EnginePrefix.h"
-#include "UICRenderRuntimeBindingImpl.h"
-#include "UICRenderUIPSharedTranslation.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRenderRuntimeBindingImpl.h"
+#include "Qt3DSRenderUIPSharedTranslation.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "foundation/SerializationTypes.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/FileTools.h"
-#include "UICHash.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderPluginPropertyValue.h"
-#include "UICLuaElementHelper.h"
-#include "UICPresentation.h"
-#include "UICApplication.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSHash.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderPluginPropertyValue.h"
+#include "Qt3DSLuaElementHelper.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
+#include "Qt3DSRenderPathManager.h"
 
 namespace Q3DStudio {
 enum ExtendedAttributes {
diff --git a/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
index aa398995..8e0bfd44 100644
--- a/src/Runtime/Source/Engine/Source/UICTegraApplication.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSTegraApplication.cpp
@@ -31,28 +31,28 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTegraApplication.h"
-#include "UICTegraInputEngine.h"
-#include "UICDataLogger.h"
-#include "UICFileStream.h"
-#include "UICThreadManager.h"
-#include "UICArray.h"
-#include "UICApplication.h"
+#include "Qt3DSTegraApplication.h"
+#include "Qt3DSTegraInputEngine.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSFileStream.h"
+#include "Qt3DSThreadManager.h"
+#include "Qt3DSArray.h"
+#include "Qt3DSApplication.h"
 #include "foundation/FileTools.h"
-#include "UICIPresentation.h"
-#include "UICPresentation.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSPresentation.h"
 #include "EASTL/string.h"
-#include "UICMemory.h"
-#include "UICKernelTypes.h"
-#include "UICRenderContext.h"
-#include "UICRenderer.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderer.h"
 
-#include "UICDLLManager.h"
+#include "Qt3DSDLLManager.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/TrackingAllocator.h"
 // For perf log timestamp
 #include <time.h>
-#include "UICArray.h"
+#include "Qt3DSArray.h"
 // For perf log timestamp
 #include <time.h>
 
@@ -106,13 +106,13 @@ const eastl::string &GetAppDir(const eastl::string &inAppExe)
         theAppDir = new eastl::string;
 #ifndef __ANDROID__
     theAppDir->assign(inAppExe.empty() == false ? inAppExe : "");
-#ifdef UIC_OS_LINUX
+#ifdef Qt3DS_OS_LINUX
     char theBuf[1024] = { 0 };
     int rc = readlink("/proc/self/exe", theBuf, sizeof(theBuf));
     if (rc > 0)
         theAppDir->assign(theBuf);
 #endif
-#ifdef UIC_OS_QNX
+#ifdef Qt3DS_OS_QNX
     char theBuf[1024] = { 0 };
     FILE *exefile = fopen("/proc/self/exefile", "r");
     if (exefile != NULL) {
diff --git a/src/Runtime/Source/Engine/Source/UICTegraInputEngine.cpp b/src/Runtime/Source/Engine/Source/Qt3DSTegraInputEngine.cpp
index 3bb15604..798c2699 100644
--- a/src/Runtime/Source/Engine/Source/UICTegraInputEngine.cpp
+++ b/src/Runtime/Source/Engine/Source/Qt3DSTegraInputEngine.cpp
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #include "EnginePrefix.h"
-#include "UICTegraInputEngine.h"
+#include "Qt3DSTegraInputEngine.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/PlatformSpecific/Windows/UICViewer/Resource.h b/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSViewer/Resource.h
index 58c9336e..58c9336e 100644
--- a/src/Runtime/Source/PlatformSpecific/Windows/UICViewer/Resource.h
+++ b/src/Runtime/Source/PlatformSpecific/Windows/Qt3DSViewer/Resource.h
diff --git a/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp b/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
index 874dac20..4e197715 100644
--- a/src/Runtime/Source/UICCompiler/Source/UICCompilerMain.cpp
+++ b/src/Runtime/Source/Qt3DSCompiler/Source/Qt3DSCompilerMain.cpp
@@ -32,17 +32,17 @@
 #pragma warning(push)
 #pragma warning(disable : 4201)
 #endif
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 #ifdef _WIN32
 #pragma warning(pop)
 #endif
-#include "UICRenderRuntimeBinding.h"
-#include "UICApplication.h"
-#include "UICInputEngine.h"
+#include "Qt3DSRenderRuntimeBinding.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSInputEngine.h"
 #include "foundation/FileTools.h"
-#include "UICWindowSystem.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSWindowSystem.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCache.h"
 
 #include <QSurfaceFormat>
 
diff --git a/src/Runtime/Source/UICEvent/Include/EventSystem.h b/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
index 5197ca4b..5197ca4b 100644
--- a/src/Runtime/Source/UICEvent/Include/EventSystem.h
+++ b/src/Runtime/Source/Qt3DSEvent/Include/EventSystem.h
diff --git a/src/Runtime/Source/UICEvent/Include/EventSystemC.h b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
index fed6b8d9..fed6b8d9 100644
--- a/src/Runtime/Source/UICEvent/Include/EventSystemC.h
+++ b/src/Runtime/Source/Qt3DSEvent/Include/EventSystemC.h
diff --git a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
index 46442b78..46442b78 100644
--- a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystem.h
+++ b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystem.h
diff --git a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h
index df970186..df970186 100644
--- a/src/Runtime/Source/UICEvent/InternalInclude/EventPollingSystemLuaBinding.h
+++ b/src/Runtime/Source/Qt3DSEvent/InternalInclude/EventPollingSystemLuaBinding.h
diff --git a/src/Runtime/Source/UICEvent/Source/EventFactory.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
index 27e38736..27e38736 100644
--- a/src/Runtime/Source/UICEvent/Source/EventFactory.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.cpp
diff --git a/src/Runtime/Source/UICEvent/Source/EventFactory.h b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
index fa82c710..fa82c710 100644
--- a/src/Runtime/Source/UICEvent/Source/EventFactory.h
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventFactory.h
diff --git a/src/Runtime/Source/UICEvent/Source/EventPoller.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
index 118ab0fb..118ab0fb 100644
--- a/src/Runtime/Source/UICEvent/Source/EventPoller.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.cpp
diff --git a/src/Runtime/Source/UICEvent/Source/EventPoller.h b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
index c247b2ea..c247b2ea 100644
--- a/src/Runtime/Source/UICEvent/Source/EventPoller.h
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPoller.h
diff --git a/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp
index 8de1e03d..8da8c809 100644
--- a/src/Runtime/Source/UICEvent/Source/EventPollingSystemLuaBinding.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventPollingSystemLuaBinding.cpp
@@ -31,7 +31,7 @@
 #include <EASTL/hash_map.h>
 #include <EASTL/vector.h>
 
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 #include "foundation/Qt3DSMath.h"
 
 #include "EventSystem.h"
diff --git a/src/Runtime/Source/UICEvent/Source/EventSystemC.cpp b/src/Runtime/Source/Qt3DSEvent/Source/EventSystemC.cpp
index 8bfdb81c..8bfdb81c 100644
--- a/src/Runtime/Source/UICEvent/Source/EventSystemC.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Source/EventSystemC.cpp
diff --git a/src/Runtime/Source/UICEvent/Test/CanProviderDemo.cpp b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
index 8929bafc..8929bafc 100644
--- a/src/Runtime/Source/UICEvent/Test/CanProviderDemo.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.cpp
diff --git a/src/Runtime/Source/UICEvent/Test/CanProviderDemo.h b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
index a1ddc175..a1ddc175 100644
--- a/src/Runtime/Source/UICEvent/Test/CanProviderDemo.h
+++ b/src/Runtime/Source/Qt3DSEvent/Test/CanProviderDemo.h
diff --git a/src/Runtime/Source/UICEvent/Test/EventSystemCppTester.cpp b/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp
index febbe322..febbe322 100644
--- a/src/Runtime/Source/UICEvent/Test/EventSystemCppTester.cpp
+++ b/src/Runtime/Source/Qt3DSEvent/Test/EventSystemCppTester.cpp
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp
index 5a68825a..218dfd16 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.cpp
@@ -27,12 +27,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderCamera.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderPresentation.h"
 #include "foundation/Qt3DSVec2.h"
 #include "render/Qt3DSRenderTexture2D.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 /*
 #include <Windows.h>
 */
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h
index 0a77e153..8942f56f 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCamera.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCamera.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_CAMERA_H
 #define UIC_RENDER_CAMERA_H
-#include "UICRenderNode.h"
-#include "UICRenderRay.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderRay.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h
index d113af70..f6eabf5e 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderCustomMaterial.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderCustomMaterial.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_CUSTOM_MATERIAL_H
 #define UIC_RENDER_CUSTOM_MATERIAL_H
-#include "UICRender.h"
-#include "UICRenderDynamicObject.h"
-#include "UICRenderImage.h"
-#include "UICRenderLightmaps.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderDynamicObject.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderLightmaps.h"
 #include "foundation/Qt3DSFlags.h"
 
 namespace qt3ds {
@@ -144,4 +144,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp
index ef0a9759..df4ea045 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderDefaultMaterial.h"
+#include "Qt3DSRenderDefaultMaterial.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h
index 6aa253de..88600b9a 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDefaultMaterial.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDefaultMaterial.h
@@ -30,13 +30,13 @@
 #pragma once
 #ifndef UIC_RENDER_DEFAULT_MATERIAL_H
 #define UIC_RENDER_DEFAULT_MATERIAL_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSVec3.h"
-#include "UICRenderMaterialDirty.h"
-#include "UICRenderLightmaps.h"
+#include "Qt3DSRenderMaterialDirty.h"
+#include "Qt3DSRenderLightmaps.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp
index 3d42583e..3d7c6ff5 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.cpp
@@ -27,11 +27,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRender.h"
-#include "UICRenderDynamicObject.h"
-#include "UICRenderDynamicObjectSystem.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderDynamicObject.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
 #include "foundation/FileTools.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 
 #include <QtCore/qdir.h>
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h
index daa5568d..cdaa7615 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderDynamicObject.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderDynamicObject.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_DYNAMIC_OBJECT_H
 #define UIC_RENDER_DYNAMIC_OBJECT_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
+#include "Qt3DSRenderNode.h"
 #include "EASTL/string.h"
 
 namespace qt3ds {
@@ -109,4 +109,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp
index 08766cf8..6858fdf5 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.cpp
@@ -27,11 +27,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderEffect.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSVec3.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/FileTools.h"
 
 using namespace qt3ds::render;
@@ -51,4 +51,4 @@ void SEffect::SetActive(bool inActive, IEffectSystem &inManager)
             inManager.ResetEffectFrameData(*m_Context);
         m_Flags.SetDirty(true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h
index ef771da4..0989a506 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderEffect.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderEffect.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_RENDER_EFFECT_H
 #define UIC_RENDER_EFFECT_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
+#include "Qt3DSRenderNode.h"
 #include "EASTL/string.h"
-#include "UICRenderDynamicObject.h"
+#include "Qt3DSRenderDynamicObject.h"
 
 namespace qt3ds {
 namespace render {
@@ -81,4 +81,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h
index 4ff8f9ed..3df286e9 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderGraphObject.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderGraphObject.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_GRAPH_OBJECT_H
 #define UIC_RENDER_GRAPH_OBJECT_H
-#include "UICRender.h"
-#include "UICRenderTaggedPointer.h"
-#include "UICRenderGraphObjectTypes.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderTaggedPointer.h"
+#include "Qt3DSRenderGraphObjectTypes.h"
 
 namespace qt3ds {
 namespace render {
@@ -74,4 +74,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp
index 6583e56e..eaa98c77 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.cpp
@@ -27,12 +27,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderImage.h"
-#include "UICRenderBufferManager.h"
-#include "UICOffscreenRenderManager.h"
-#include "UICOffscreenRenderKey.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderPluginGraphObject.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSOffscreenRenderKey.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderPluginGraphObject.h"
 
 using namespace qt3ds::render;
 
@@ -132,4 +132,4 @@ void SImage::CalculateTextureTransform()
     m_TextureTransform = m_TextureTransform * rotation;
     m_TextureTransform = m_TextureTransform * scale;
     m_TextureTransform = m_TextureTransform * translation;
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
index 9804933a..d8f665c1 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderImage.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderImage.h
@@ -30,13 +30,13 @@
 #pragma once
 #ifndef UIC_RENDER_IMAGE_H
 #define UIC_RENDER_IMAGE_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderTexture2D.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRenderNode.h"
 #include "foundation/Qt3DSVec2.h"
-#include "UICRenderImageTextureData.h"
+#include "Qt3DSRenderImageTextureData.h"
 #include "EASTL/utility.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp
index 77589f9b..ee146624 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#include "UICRenderLayer.h"
-#include "UICRenderEffect.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderEffect.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
index 238f4874..a836cbf6 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLayer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLayer.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_LAYER_H
 #define UIC_RENDER_LAYER_H
-#include "UICRender.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderNode.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderer.h"
+#include "Qt3DSRenderer.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp
index 8877f9b4..3b45e8c9 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderLight.h"
+#include "Qt3DSRenderLight.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h
index 19393e3e..6e48ef1a 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLight.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLight.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_LIGHT_H
 #define UIC_RENDER_LIGHT_H
-#include "UICRenderNode.h"
+#include "Qt3DSRenderNode.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp
index d8ae00aa..0e5e6c60 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/
 
-#include "UICRenderLightmaps.h"
+#include "Qt3DSRenderLightmaps.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h
index 8cfe7d1f..e0d01f4b 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderLightmaps.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderLightmaps.h
@@ -32,11 +32,11 @@
 #ifndef UIC_RENDER_LIGHTMAPS_H
 #define UIC_RENDER_LIGHTMAPS_H
 
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 #include "foundation/StringTable.h"
-#include "UICRenderer.h"
-#include "UICRenderMaterialDirty.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderMaterialDirty.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h
index def29fa8..def29fa8 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderMaterialDirty.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderMaterialDirty.h
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp
index c52dedf3..35f9a128 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.cpp
@@ -27,10 +27,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderModel.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderMesh.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderMesh.h"
 
 using namespace qt3ds::render;
 
@@ -71,4 +71,4 @@ NVBounds3 SModel::GetModelBounds(IBufferManager &inManager) const
             retval.include(theMesh->m_Subsets[idx].m_Bounds);
     }
     return retval;
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h
index dd371270..4a545850 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderModel.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderModel.h
@@ -31,9 +31,9 @@
 #ifndef UIC_RENDER_MODEL_H
 #define UIC_RENDER_MODEL_H
 
-#include "UICRenderNode.h"
+#include "Qt3DSRenderNode.h"
 #include "foundation/StringTable.h"
-#include "UICRenderTessModeValues.h"
+#include "Qt3DSRenderTessModeValues.h"
 
 namespace qt3ds {
 namespace render {
@@ -72,4 +72,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
index 20b28f04..9f226562 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.cpp
@@ -28,12 +28,12 @@
 **
 ****************************************************************************/
 
-#include "UICRenderModel.h"
-#include "UICRenderNode.h"
-#include "UICRenderText.h"
-#include "UICRenderer.h"
-#include "UICRenderPathManager.h"
-#include "UICRenderPath.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderText.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderPathManager.h"
+#include "Qt3DSRenderPath.h"
 
 using namespace qt3ds::render;
 
@@ -494,4 +494,4 @@ void SNode::CalculateNormalMatrix(QT3DSMat33 &outNormalMatrix) const
 {
     GetMatrixUpper3x3(outNormalMatrix, m_GlobalTransform);
     outNormalMatrix = outNormalMatrix.getInverse().getTranspose();
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
index d55e10de..fff1fa4b 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderNode.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderNode.h
@@ -30,14 +30,14 @@
 #pragma once
 #ifndef UIC_RENDER_NODE_H
 #define UIC_RENDER_NODE_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 #include "foundation/Qt3DSMat44.h"
 #include "foundation/Qt3DSVec3.h"
 #include "foundation/Qt3DSBounds3.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/Qt3DSNoCopy.h"
-#include "UICRenderEulerAngles.h"
+#include "Qt3DSRenderEulerAngles.h"
 #include "foundation/StringTable.h"
 
 namespace qt3ds {
@@ -304,4 +304,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp
index 0986a752..bc637680 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h
index ea214e96..30c68b20 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPath.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPath.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_PATH_H
 #define UIC_RENDER_PATH_H
-#include "UICRender.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderNode.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h
index 09073e47..3a083a2c 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPathSubPath.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPathSubPath.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_PATH_SEGMENT_H
 #define UIC_RENDER_PATH_SEGMENT_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 
 namespace qt3ds {
 namespace render {
@@ -62,4 +62,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
index 1d2c7285..bc9c3eaa 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderPresentation.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 
 using namespace qt3ds::render;
 
@@ -40,4 +40,4 @@ void SPresentation::Render(IUICRenderContext &inContext)
         m_Scene->Render(QT3DSVec2((QT3DSF32)theViewportSize.m_Width, (QT3DSF32)theViewportSize.m_Height),
                         inContext);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
index 7891de61..b963b5d9 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderPresentation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderPresentation.h
@@ -32,8 +32,8 @@
 #define UIC_RENDER_PRESENTATION_H
 
 #include "foundation/StringTable.h"
-#include "UICRenderGraphObject.h"
-#include "UICRenderScene.h"
+#include "Qt3DSRenderGraphObject.h"
+#include "Qt3DSRenderScene.h"
 #include "foundation/Qt3DSVec2.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h
index e9215877..29cca9d5 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderReferencedMaterial.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderReferencedMaterial.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_REFERENCED_MATERIAL_H
 #define UIC_RENDER_REFERENCED_MATERIAL_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
-#include "UICRenderMaterialDirty.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
+#include "Qt3DSRenderMaterialDirty.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
index 821ffe23..aa19c091 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.cpp
@@ -27,10 +27,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRender.h"
-#include "UICRenderScene.h"
-#include "UICRenderLayer.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderContextCore.h"
 #include "render/Qt3DSRenderContext.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
index 4d17abe8..cac87888 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderScene.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderScene.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_SCENE_H
 #define UIC_RENDER_SCENE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec3.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRenderGraphObject.h"
 
 namespace qt3ds {
 namespace render {
@@ -75,4 +75,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp
index 3b6f23b2..89abe50a 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderText.h"
+#include "Qt3DSRenderText.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h
index a7d25e35..db6f3107 100644
--- a/src/Runtime/Source/UICRender/GraphObjects/UICRenderText.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/GraphObjects/Qt3DSRenderText.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_TEXT_H
 #define UIC_RENDER_TEXT_H
-#include "UICRender.h"
-#include "UICRenderNode.h"
-#include "UICRenderTextTypes.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderTextTypes.h"
 
 namespace qt3ds {
 namespace render {
@@ -74,4 +74,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/ANDROID/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h
index ad47c506..ad47c506 100644
--- a/src/Runtime/Source/UICRender/Include/ANDROID/DynamicLibLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/ANDROID/DynamicLibLoader.h
diff --git a/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h
index fd12f850..fd12f850 100644
--- a/src/Runtime/Source/UICRender/Include/LINUX/DynamicLibLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/LINUX/DynamicLibLoader.h
diff --git a/src/Runtime/Source/UICRender/Include/OSX/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h
index df486c14..df486c14 100644
--- a/src/Runtime/Source/UICRender/Include/OSX/DynamicLibLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/OSX/DynamicLibLoader.h
diff --git a/src/Runtime/Source/UICRender/Include/QNX/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h
index df486c14..df486c14 100644
--- a/src/Runtime/Source/UICRender/Include/QNX/DynamicLibLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/QNX/DynamicLibLoader.h
diff --git a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h
index 33172a57..7a2cb486 100644
--- a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderKey.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderKey.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_OFFSCREEN_RENDER_KEY_H
 #define UIC_OFFSCREEN_RENDER_KEY_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
 
@@ -150,4 +150,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
index 772550ac..00cf1f11 100644
--- a/src/Runtime/Source/UICRender/Include/UICOffscreenRenderManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOffscreenRenderManager.h
@@ -30,14 +30,14 @@
 #pragma once
 #ifndef UIC_OFFSCREEN_RENDER_MANAGER_H
 #define UIC_OFFSCREEN_RENDER_MANAGER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/Qt3DSOption.h"
-#include "UICRenderScene.h"
-#include "UICRenderLayer.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderLayer.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
index 3e101548..abf365a8 100644
--- a/src/Runtime/Source/UICRender/Include/UICOldNBustedRenderPlugin.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSOldNBustedRenderPlugin.h
@@ -31,15 +31,15 @@
 #ifndef UIC_OLD_N_BUSTED_RENDER_PLUGIN_H
 #define UIC_OLD_N_BUSTED_RENDER_PLUGIN_H
 
-#include "UICOffscreenRenderManager.h"
-#include "UICRenderContext.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/Qt3DSVec4.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderBaseTypes.h"
-#include "UICPluginDLL.h"
+#include "Qt3DSPluginDLL.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRender.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
index fde46c0b..fde46c0b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRender.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRender.h
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h
index 9c02b7c0..31c77174 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderClippingFrustum.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderClippingFrustum.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_CLIPPING_PLANE_H
 #define UIC_RENDER_CLIPPING_PLANE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSPlane.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/Qt3DSBounds3.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderContext.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
index ea619d5f..9963e3b2 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderContext.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderContextCore.h
@@ -30,12 +30,12 @@
 #pragma once
 #ifndef UIC_RENDER_CONTEXT_H
 #define UIC_RENDER_CONTEXT_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
-#include "UICRenderPresentation.h"
-#include "UICRenderWindowDimensions.h"
+#include "Qt3DSRenderPresentation.h"
+#include "Qt3DSRenderWindowDimensions.h"
 
 #include <QPair>
 
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h
index 161b66cc..bedecd23 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialRenderContext.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialRenderContext.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H
 #define UIC_RENDER_CUSTOM_MATERIAL_RENDER_CONTEXT_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSMat44.h"
 #include "foundation/Qt3DSMat33.h"
-#include "UICRenderShaderKeys.h"
+#include "Qt3DSRenderShaderKeys.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
index 1463c91a..329e29d2 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialShaderGenerator.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H
 #define UIC_RENDER_CUSTOM_MATERIAL_SHADER_GENERATOR_H
-#include "UICRenderMaterialShaderGenerator.h"
+#include "Qt3DSRenderMaterialShaderGenerator.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
index d3382eaa..eb9d94ca 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderCustomMaterialSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderCustomMaterialSystem.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_CUSTOM_MATERIAL_SYSTEM_H
 #define UIC_RENDER_CUSTOM_MATERIAL_SYSTEM_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "../RendererImpl/UICVertexPipelineImpl.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
index 025fdec3..a45b3d82 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderDefaultMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDefaultMaterialShaderGenerator.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H
 #define UIC_RENDER_DEFAULT_MATERIAL_SHADER_GENERATOR_H
-#include "UICRenderMaterialShaderGenerator.h"
+#include "Qt3DSRenderMaterialShaderGenerator.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
index 98fc1362..217bff97 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystem.h
@@ -30,16 +30,16 @@
 #pragma once
 #ifndef UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_H
 #define UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSVec2.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderTessModeValues.h"
-#include "UICRenderGraphObjectTypes.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderTessModeValues.h"
+#include "Qt3DSRenderGraphObjectTypes.h"
 #include "EASTL/utility.h"
 
 #include <QtCore/qstring.h>
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h
index 2a84d3f6..e344b58b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemCommands.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemCommands.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_EFFECT_SYSTEM_COMMANDS_H
 #define UIC_RENDER_EFFECT_SYSTEM_COMMANDS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/Qt3DSIntrinsics.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h
index bb086a31..3df26b24 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderDynamicObjectSystemUtil.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderDynamicObjectSystemUtil.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H
 #define UIC_RENDER_DYNAMIC_OBJECT_SYSTEM_UTIL_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
index a6a60b66..9c0c7e89 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderEffectSystem.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEffectSystem.h
@@ -30,12 +30,12 @@
 #pragma once
 #ifndef UIC_RENDER_EFFECT_SYSTEM_H
 #define UIC_RENDER_EFFECT_SYSTEM_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSVec2.h"
-#include "UICRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h
index f63d84ff..f63d84ff 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderEulerAngles.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderEulerAngles.h
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
index 1580972f..51c24090 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectPickQuery.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectPickQuery.h
@@ -31,11 +31,11 @@
 #ifndef UIC_RENDER_GRAPH_OBJECT_PICK_QUERY_H
 #define UIC_RENDER_GRAPH_OBJECT_PICK_QUERY_H
 
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSMat44.h"
-#include "UICRenderImage.h"
+#include "Qt3DSRenderImage.h"
 
 namespace qt3ds {
 namespace render {
@@ -121,4 +121,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h
index 3a3f784e..7a63ce22 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectSerializer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectSerializer.h
@@ -31,7 +31,7 @@
 #ifndef UIC_RENDER_GRAPH_OBJECT_SERIALZER_H
 #define UIC_RENDER_GRAPH_OBJECT_SERIALZER_H
 
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSDataRef.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h
index ab347aa7..8cbe8c46 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderGraphObjectTypes.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderGraphObjectTypes.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_GRAPH_OBJECT_TYPES_H
 #define UIC_RENDER_GRAPH_OBJECT_TYPES_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSAssert.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h
index 29841d54..27b51770 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderImageScaler.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageScaler.h
@@ -33,7 +33,7 @@
 //==============================================================================
 #ifndef __IMAGESCALER_H_
 #define __IMAGESCALER_H_
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
index 3ffbbed2..5e69c9ec 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderImageTextureData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderImageTextureData.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_IMAGE_TEXTURE_DATA_H
 #define UIC_RENDER_IMAGE_TEXTURE_DATA_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSFlags.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h
index 9473d05e..cd88d398 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderInputStreamFactory.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderInputStreamFactory.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_INPUT_STREAM_FACTORY_H
 #define UIC_RENDER_INPUT_STREAM_FACTORY_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "EASTL/string.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h
index 6ddaf030..62e8ba37 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderMaterialHelpers.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialHelpers.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_MATERIAL_HELPERS_H
 #define UIC_RENDER_MATERIAL_HELPERS_H
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderReferencedMaterial.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderReferencedMaterial.h"
 
 namespace qt3ds {
 namespace render {
@@ -91,4 +91,4 @@ namespace render {
     }
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
index 0eede4c0..cd796bfe 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderMaterialShaderGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMaterialShaderGenerator.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_RENDER_MATERIAL_SHADER_GENERATOR_H
 #define UIC_RENDER_MATERIAL_SHADER_GENERATOR_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICRenderShaderKeys.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderShaderKeys.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderMesh.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h
index 259cbe53..f4b180d6 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderMesh.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderMesh.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_MESH_H
 #define UIC_RENDER_MESH_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
 #include "render/Qt3DSRenderIndexBuffer.h"
 #include "render/Qt3DSRenderInputAssembler.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
index 2e14d791..3dbc924b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPathManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathManager.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_PATH_MANAGER_H
 #define UIC_RENDER_PATH_MANAGER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
-#include "UICRenderShaderCache.h" //TShaderFeatureSet
+#include "Qt3DSRenderShaderCache.h" //TShaderFeatureSet
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSBounds3.h"
 //#include "UICRenderDefaultMaterialShaderGenerator.h" //SLayerGlobalRenderProperties
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h
index afa0dad0..cbbb28f3 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPathMath.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathMath.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_RENDER_PATH_MATH_H
 #define UIC_RENDER_PATH_MATH_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSVec3.h"
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h
index e9d610fb..0234fbe4 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPathRenderContext.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPathRenderContext.h
@@ -30,14 +30,14 @@
 #pragma once
 #ifndef UIC_RENDER_PATH_RENDER_CONTEXT_H
 #define UIC_RENDER_PATH_RENDER_CONTEXT_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
-#include "UICRenderShaderCache.h" //TShaderFeatureSet
+#include "Qt3DSRenderShaderCache.h" //TShaderFeatureSet
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSBounds3.h"
-#include "UICRenderShaderKeys.h"
-#include "UICRenderableImage.h"
+#include "Qt3DSRenderShaderKeys.h"
+#include "Qt3DSRenderableImage.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
index 66a4b773..4b50b0b6 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsRenderer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsRenderer.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_PIXEL_GRAPHICS_RENDERER_H
 #define UIC_RENDER_PIXEL_GRAPHICS_RENDERER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSDataRef.h"
 
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h
index 44e5db57..f9f3cea3 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPixelGraphicsTypes.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPixelGraphicsTypes.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_PIXEL_GRAPHICS_TYPES_H
 #define UIC_RENDER_PIXEL_GRAPHICS_TYPES_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSVec4.h"
 #include "foundation/Qt3DSMat33.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h
index f4676111..bc45fba1 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPlugin.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPlugin.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_PLUGIN_H
 #define UIC_RENDER_PLUGIN_H
-#include "UICRender.h"
-#include "UICRenderPluginCInterface.h"
-#include "UICOffscreenRenderManager.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderPluginCInterface.h"
+#include "Qt3DSOffscreenRenderManager.h"
 #include "EASTL/utility.h"
 
 namespace qt3ds {
@@ -146,4 +146,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPluginCInterface.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
index 61a6710c..61a6710c 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPluginCInterface.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginCInterface.h
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h
index de426e61..7552e311 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPluginGraphObject.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginGraphObject.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_PLUGIN_GRAPH_OBJECT_H
 #define UIC_RENDER_PLUGIN_GRAPH_OBJECT_H
-#include "UICRender.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderGraphObject.h"
 namespace qt3ds {
 namespace render {
 
@@ -57,4 +57,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h
index 48d6cba7..0f3e901b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderPluginPropertyValue.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderPluginPropertyValue.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_PLUGIN_PROPERTY_VALUE_H
 #define UIC_RENDER_PLUGIN_PROPERTY_VALUE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
-#include "UICRenderPlugin.h"
+#include "Qt3DSRenderPlugin.h"
 
 namespace qt3ds {
 namespace foundation {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
index c6034e85..4cce67d0 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderProfiler.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderProfiler.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_PROFILER_H
 #define UIC_RENDER_PROFILER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "EASTL/string.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSRefCounted.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRay.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h
index 34c14378..52cb66f5 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderRay.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRay.h
@@ -31,7 +31,7 @@
 #ifndef UIC_RENDER_RAY_H
 #define UIC_RENDER_RAY_H
 
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSVec3.h"
 #include "foundation/Qt3DSOption.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h
index a48702cb..cb69e08d 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderRenderList.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRenderList.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_RENDER_LIST_H
 #define UIC_RENDER_RENDER_LIST_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h
index afd2f20c..d4d0641d 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderRotationHelper.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderRotationHelper.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_ROTATION_HELPER_H
 #define UIC_RENDER_ROTATION_HELPER_H
-#include "UICRender.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderNode.h"
 #include "EASTL/utility.h"
 
 namespace qt3ds {
@@ -190,4 +190,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h
index 092508bc..6fbf7981 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCache.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCache.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_SHADER_CACHE_H
 #define UIC_RENDER_SHADER_CACHE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/StringTable.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h
index e6844ea5..f7c7829f 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGenerator.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGenerator.h
@@ -30,12 +30,12 @@
 #pragma once
 #ifndef UIC_RENDER_SHADER_CODE_GENERATOR_H
 #define UIC_RENDER_SHADER_CODE_GENERATOR_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSContainers.h"
 #include "EASTL/string.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderBaseTypes.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
index 15134b08..f6f7471d 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderShaderCodeGeneratorV2.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderCodeGeneratorV2.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_SHADER_CODE_GENERATOR_V2_H
 #define UIC_RENDER_SHADER_CODE_GENERATOR_V2_H
-#include "UICRenderShaderCodeGenerator.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderShaderCache.h"
 #include "foundation/Qt3DSFlags.h"
 
 #include <QtCore/qstring.h>
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h
index 5b69c856..8d9af357 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderShaderKeys.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShaderKeys.h
@@ -30,13 +30,13 @@
 #pragma once
 #ifndef UIC_RENDER_SHADER_KEY_H
 #define UIC_RENDER_SHADER_KEY_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "EASTL/string.h"
 #include "foundation/StringConversionImpl.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderTessModeValues.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderTessModeValues.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
index 07e1c295..08a1ae8f 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderShadowMap.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderShadowMap.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_SHADOW_MAP_H
 #define UIC_RENDER_SHADOW_MAP_H
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSMat44.h"
 #include "foundation/Qt3DSVec3.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderString.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h
index a33194ac..3dcd1987 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderString.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderString.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_STRING_H
 #define UIC_RENDER_STRING_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include <string>
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
index 876e10cb..b509e67c 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderSubPresentationHelper.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubPresentationHelper.h
@@ -30,8 +30,8 @@
 #pragma once
 #ifndef UIC_RENDER_SUB_PRESENTATION_HELPER_H
 #define UIC_RENDER_SUB_PRESENTATION_HELPER_H
-#include "UICRenderContext.h"
-#include "UICRenderer.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderer.h"
 #include "render/Qt3DSRenderContext.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
index 48c79262..00d98c47 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderSubpresentation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderSubpresentation.h
@@ -31,9 +31,9 @@
 #ifndef UIC_RENDER_SUBPRESENTATION_H
 #define UIC_RENDER_SUBPRESENTATION_H
 
-#include "UICOffscreenRenderManager.h"
-#include "UICRenderSubPresentationHelper.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSRenderSubPresentationHelper.h"
+#include "Qt3DSRenderPresentation.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSAtomic.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h
index b94b3a44..74e59c99 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTaggedPointer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTaggedPointer.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_TAGGED_POINTER_H
 #define UIC_RENDER_TAGGED_POINTER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h
index 4b089d04..e01a9247 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTessModeValues.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTessModeValues.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_TESS_MODE_VALUES_H
 #define UIC_RENDER_TESS_MODE_VALUES_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h
index 460d19e6..fcd6862a 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureAtlas.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureAtlas.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_TEXT_TEXTURE_ATLAS_H
 #define UIC_RENDER_TEXT_TEXTURE_ATLAS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICRenderText.h"
+#include "Qt3DSRenderText.h"
 #include "EASTL/algorithm.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h
index 73a9a1fa..67662966 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTextTextureCache.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTextureCache.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_TEXT_TEXTURE_CACHE_H
 #define UIC_RENDER_TEXT_TEXTURE_CACHE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICRenderText.h"
+#include "Qt3DSRenderText.h"
 #include "EASTL/algorithm.h"
 
 namespace qt3ds {
@@ -71,4 +71,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h
index 651f02b1..c7a65070 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTextTypes.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextTypes.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_TEXT_TYPES_H
 #define UIC_RENDER_TEXT_TYPES_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/StringTable.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h
index 80e3c9f4..026f90bc 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderTextureAtlas.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderTextureAtlas.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_TEXTURE_ATLAS_H
 #define UIC_RENDER_TEXTURE_ATLAS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "EASTL/algorithm.h"
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h
index 0265c080..014f9e0b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderThreadPool.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderThreadPool.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_THREAD_POOL_H
 #define UIC_RENDER_THREAD_POOL_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h
index 9d86e40c..9e435234 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderUIPLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPLoader.h
@@ -33,11 +33,11 @@
 
 #ifdef UIC_RENDER_ENABLE_LOAD_UIP
 
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/StringTable.h"
 #include <EASTL/utility.h>
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderGraphObject.h"
+#include "Qt3DSRenderGraphObject.h"
 
 namespace Q3DStudio {
 class IRuntimeMetaData;
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
index 16aeb650..d952b46b 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderUIPSharedTranslation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
@@ -30,16 +30,16 @@
 #pragma once
 #ifndef UIC_RENDER_UIP_SHARED_TRANSLATION_H
 #define UIC_RENDER_UIP_SHARED_TRANSLATION_H
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderImage.h"
-#include "UICRenderText.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderText.h"
 #include "UICDMWindowsCompatibility.h"
-#include "UICRenderLayer.h"
-#include "UICRenderModel.h"
-#include "UICRenderPath.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPresentation.h"
 
 // map from UICDM to UIC::RENDER
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h
index a8beed42..e3344ba8 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderWidgets.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWidgets.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_WIDGETS_H
 #define UIC_RENDER_WIDGETS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSOption.h"
 #include "foundation/Qt3DSMat44.h"
 #include "foundation/Qt3DSMat33.h"
@@ -40,7 +40,7 @@
 #include "foundation/Qt3DSDataRef.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
 #include "render/Qt3DSRenderIndexBuffer.h"
-#include "UICRenderText.h"
+#include "Qt3DSRenderText.h"
 
 namespace qt3ds {
 namespace render {
@@ -178,4 +178,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h
index b8ad4458..1d7beb2a 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderWindowDimensions.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderWindowDimensions.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_WINDOW_DIMENSIONS_H
 #define UIC_RENDER_WINDOW_DIMENSIONS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderableImage.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h
index 15819549..bf897699 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderableImage.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderableImage.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDERABLE_IMAGE_H
 #define UIC_RENDERABLE_IMAGE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
index fe71cfc4..4a8a42f3 100644
--- a/src/Runtime/Source/UICRender/Include/UICRenderer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderer.h
@@ -30,17 +30,17 @@
 #pragma once
 #ifndef UIC_RENDERER_H
 #define UIC_RENDERER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSFlags.h"
 #include "EASTL/algorithm.h" //pair
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSVec2.h"
-#include "UICRenderGraphObjectPickQuery.h"
-#include "UICRenderWindowDimensions.h"
-#include "UICRenderCamera.h"
+#include "Qt3DSRenderGraphObjectPickQuery.h"
+#include "Qt3DSRenderWindowDimensions.h"
+#include "Qt3DSRenderCamera.h"
 #include "render/Qt3DSRenderBaseTypes.h"
-#include "UICRenderRay.h"
+#include "Qt3DSRenderRay.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICRendererUtil.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h
index d9d5c3b8..1810d7ac 100644
--- a/src/Runtime/Source/UICRender/Include/UICRendererUtil.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRendererUtil.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDERER_UTIL_H
 #define UIC_RENDERER_UTIL_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/UICTextRenderer.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h
index 11ff167d..a2710cac 100644
--- a/src/Runtime/Source/UICRender/Include/UICTextRenderer.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSTextRenderer.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_TEXT_RENDERER_H
 #define UIC_TEXT_RENDERER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/StringTable.h"
-#include "UICRenderTextTypes.h"
+#include "Qt3DSRenderTextTypes.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h
index c8f0dbc8..c8f0dbc8 100644
--- a/src/Runtime/Source/UICRender/Include/WINDOWS/DynamicLibLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/WINDOWS/DynamicLibLoader.h
diff --git a/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
index 1c9ee287..5ebd116b 100644
--- a/src/Runtime/Source/UICRender/Include/q3dsqmlrender.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/q3dsqmlrender.h
@@ -30,8 +30,8 @@
 #ifndef QT3DS_QML_RENDER_H
 #define QT3DS_QML_RENDER_H
 
-#include "UICOffscreenRenderManager.h"
-#include "UICRenderContext.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSRenderContextCore.h"
 
 class IQt3DS;
 
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
index effdcbb6..6eff8eb5 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.cpp
@@ -27,14 +27,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderableObjects.h"
-#include "UICRendererImpl.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderCustomMaterialRenderContext.h"
-#include "UICRenderLight.h"
-#include "UICRenderPathManager.h"
-#include "UICRenderPathRenderContext.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderableObjects.h"
+#include "Qt3DSRendererImpl.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderCustomMaterialRenderContext.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderPathManager.h"
+#include "Qt3DSRenderPathRenderContext.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 
 using qt3ds::foundation::CRegisteredString;
 
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
index 8a287afb..52b06614 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRenderableObjects.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRenderableObjects.h
@@ -30,18 +30,18 @@
 #pragma once
 #ifndef UIC_RENDER_IMPL_RENDERABLE_OBJECTS_H
 #define UIC_RENDER_IMPL_RENDERABLE_OBJECTS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSFlags.h"
-#include "UICRenderModel.h"
+#include "Qt3DSRenderModel.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderText.h"
-#include "UICRenderMesh.h"
-#include "UICRenderShaderKeys.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderText.h"
+#include "Qt3DSRenderMesh.h"
+#include "Qt3DSRenderShaderKeys.h"
+#include "Qt3DSRenderShaderCache.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
-#include "UICRenderableImage.h"
+#include "Qt3DSRenderableImage.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
index 085701f1..d1e141e9 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.cpp
@@ -28,35 +28,35 @@
 **
 ****************************************************************************/
 
-#include "UICRender.h"
-#include "UICRenderer.h"
-#include "UICRendererImpl.h"
-#include "UICRenderContext.h"
-#include "UICRenderCamera.h"
-#include "UICRenderLight.h"
-#include "UICRenderImage.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRendererImpl.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
-#include "UICOffscreenRenderManager.h"
+#include "Qt3DSOffscreenRenderManager.h"
 #include "EASTL/sort.h"
-#include "UICRenderContext.h"
-#include "UICTextRenderer.h"
-#include "UICRenderScene.h"
-#include "UICRenderPresentation.h"
-#include "UICRenderEffect.h"
-#include "UICRenderEffectSystem.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderPresentation.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderEffectSystem.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
-#include "UICRenderTextTextureCache.h"
-#include "UICRenderTextTextureAtlas.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderRenderList.h"
-#include "UICRenderPath.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderTextTextureCache.h"
+#include "Qt3DSRenderTextTextureAtlas.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 #include <stdlib.h>
 
 #ifdef _WIN32
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
index 8d88a83b..964f46ca 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImpl.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImpl.h
@@ -30,42 +30,42 @@
 #pragma once
 #ifndef UIC_RENDER_SHADER_GENERATOR_IMPL_H
 #define UIC_RENDER_SHADER_GENERATOR_IMPL_H
-#include "UICRender.h"
-#include "UICRenderer.h"
-#include "UICRenderableObjects.h"
-#include "UICRendererImplShaders.h"
-#include "UICRendererImplLayerRenderData.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderableObjects.h"
+#include "Qt3DSRendererImplShaders.h"
+#include "Qt3DSRendererImplLayerRenderData.h"
 #include "foundation/Qt3DSFlags.h"
-#include "UICRenderMesh.h"
-#include "UICRenderModel.h"
+#include "Qt3DSRenderMesh.h"
+#include "Qt3DSRenderModel.h"
 #include "foundation/Qt3DSBounds3.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderDefaultMaterial.h"
+#include "Qt3DSRenderDefaultMaterial.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSInvasiveSet.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSDataRef.h"
-#include "UICRenderLayer.h"
-#include "UICRenderRay.h"
-#include "UICRenderText.h"
-#include "UICOffscreenRenderManager.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderRay.h"
+#include "Qt3DSRenderText.h"
+#include "Qt3DSOffscreenRenderManager.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICRenderCamera.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderContext.h"
-#include "UICOffscreenRenderManager.h"
-#include "UICRendererImplLayerRenderHelper.h"
-#include "UICRenderWidgets.h"
-#include "UICRenderShaderCodeGenerator.h"
-#include "UICRenderClippingFrustum.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSRendererImplLayerRenderHelper.h"
+#include "Qt3DSRenderWidgets.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderClippingFrustum.h"
 #include "foundation/Qt3DSUnionCast.h"
 #include "foundation/FastAllocator.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICRenderShaderKeys.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderProfiler.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderShaderKeys.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderProfiler.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
index 9b2d2cec..c063a543 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.cpp
@@ -28,36 +28,36 @@
 **
 ****************************************************************************/
 
-#include "UICRender.h"
-#include "UICRenderer.h"
-#include "UICRendererImpl.h"
-#include "UICRenderLayer.h"
-#include "UICRenderEffect.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRendererImpl.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderEffect.h"
 #include "EASTL/sort.h"
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderScene.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderPresentation.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICRenderContext.h"
-#include "UICRenderResourceManager.h"
-#include "UICTextRenderer.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderResourceManager.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderRenderBuffer.h"
-#include "UICOffscreenRenderKey.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderResourceBufferObjects.h"
+#include "Qt3DSOffscreenRenderKey.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderTextTextureCache.h"
-#include "UICRenderTextTextureAtlas.h"
-#include "UICRenderRenderList.h"
-#include "UICRendererUtil.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderTextTextureCache.h"
+#include "Qt3DSRenderTextTextureAtlas.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRendererUtil.h"
 
 #ifdef WIN32
 #pragma warning(disable : 4355)
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
index f9917353..7c4cfcd2 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderData.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDERER_IMPL_LAYER_RENDER_DATA_H
 #define UIC_RENDERER_IMPL_LAYER_RENDER_DATA_H
-#include "UICRender.h"
-#include "UICRendererImplLayerRenderPreparationData.h"
-#include "UICRenderResourceBufferObjects.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRendererImplLayerRenderPreparationData.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp
index 523a929d..38254c40 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRendererImplLayerRenderHelper.h"
-#include "UICRenderLayer.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSRendererImplLayerRenderHelper.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSTextRenderer.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h
index e93173c7..33ba6923 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderHelper.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderHelper.h
@@ -28,12 +28,12 @@
 **
 ****************************************************************************/
 #pragma once
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSVec2.h"
 #include "render/Qt3DSRenderBaseTypes.h"
-#include "UICRenderWindowDimensions.h"
-#include "UICRenderCamera.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderWindowDimensions.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderContextCore.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index fd214c9a..b3177d42 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
@@ -28,37 +28,37 @@
 **
 ****************************************************************************/
 
-#include "UICRender.h"
-#include "UICRenderer.h"
-#include "UICRendererImpl.h"
-#include "UICRenderLayer.h"
-#include "UICRenderEffect.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRendererImpl.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderEffect.h"
 #include "EASTL/sort.h"
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderScene.h"
-#include "UICRenderPresentation.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderPresentation.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICRenderContext.h"
-#include "UICRenderResourceManager.h"
-#include "UICTextRenderer.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderResourceManager.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderRenderBuffer.h"
-#include "UICOffscreenRenderKey.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderResourceBufferObjects.h"
+#include "Qt3DSOffscreenRenderKey.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderTextTextureCache.h"
-#include "UICRenderTextTextureAtlas.h"
-#include "UICRenderRenderList.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderTextTextureCache.h"
+#include "Qt3DSRenderTextTextureAtlas.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathManager.h"
 
 #ifdef _WIN32
 #pragma warning(disable : 4355)
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
index f51dbb25..2f679c87 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplLayerRenderPreparationData.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.h
@@ -30,18 +30,18 @@
 #pragma once
 #ifndef UIC_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H
 #define UIC_RENDERER_IMPL_LAYER_RENDER_PREPARATION_DATA_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSFlags.h"
-#include "UICRendererImplLayerRenderHelper.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderableObjects.h"
-#include "UICRenderClippingFrustum.h"
-#include "UICRenderResourceTexture2D.h"
-#include "UICOffscreenRenderManager.h"
-#include "UICRenderProfiler.h"
-#include "UICRenderShadowMap.h"
+#include "Qt3DSRendererImplLayerRenderHelper.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderableObjects.h"
+#include "Qt3DSRenderClippingFrustum.h"
+#include "Qt3DSRenderResourceTexture2D.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSRenderProfiler.h"
+#include "Qt3DSRenderShadowMap.h"
 #include "foundation/Qt3DSPool.h"
-#include "UICRenderableObjects.h"
+#include "Qt3DSRenderableObjects.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
index 26c031ba..7d45ea69 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.cpp
@@ -28,15 +28,15 @@
 **
 ****************************************************************************/
 
-#include "UICRendererImpl.h"
+#include "Qt3DSRendererImpl.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICRenderLight.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
-#include "../RendererImpl/UICVertexPipelineImpl.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
+#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
 
 // This adds support for the depth buffers in the shader so we can do depth
 // texture-based effects.
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h
index fda7813b..045a8751 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICRendererImplShaders.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplShaders.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDERER_IMPL_SHADERS_H
 #define UIC_RENDERER_IMPL_SHADERS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "render/Qt3DSRenderProgramPipeline.h"
 
diff --git a/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h
index 56b5da7f..a63d3323 100644
--- a/src/Runtime/Source/UICRender/RendererImpl/UICVertexPipelineImpl.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSVertexPipelineImpl.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_VERTEX_PIPELINE_IMPL_H
 #define UIC_VERTEX_PIPELINE_IMPL_H
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp
index 79c0722e..963186ff 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.cpp
@@ -27,15 +27,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderBufferLoader.h"
+#include "Qt3DSRenderBufferLoader.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSMutex.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSSync.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderThreadPool.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderThreadPool.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h
index 60c2b4f2..0595dbf1 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferLoader.h
@@ -31,7 +31,7 @@
 #ifndef UIC_RENDER_BUFFER_LOADED_H
 #define UIC_RENDER_BUFFER_LOADED_H
 
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
 
@@ -82,4 +82,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
index 9a076145..5047e7e9 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.cpp
@@ -30,8 +30,8 @@
 #ifdef _WIN32
 #pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union
 #endif
-#include "UICRender.h"
-#include "UICRenderBufferManager.h"
+#include "Qt3DSRender.h"
+#include "Qt3DSRenderBufferManager.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSAllocator.h"
 #include "render/Qt3DSRenderContext.h"
@@ -39,16 +39,16 @@
 #include "EASTL/hash_map.h"
 #include "foundation/FileTools.h"
 #include "UICImportMesh.h"
-#include "UICRenderMesh.h"
+#include "Qt3DSRenderMesh.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderLoadedTexture.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderImageScaler.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderImageScaler.h"
+#include "Qt3DSTextRenderer.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/Qt3DSMutex.h"
-#include "UICRenderPrefilterTexture.h"
+#include "Qt3DSRenderPrefilterTexture.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h
index 2a591a4f..8ef4f638 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderBufferManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderBufferManager.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_RENDER_BUFFER_MANAGER_H
 #define UIC_RENDER_BUFFER_MANAGER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "EASTL/utility.h" //pair
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
-#include "UICRenderImageTextureData.h"
+#include "Qt3DSRenderImageTextureData.h"
 #include "foundation/Qt3DSBounds3.h"
 
 namespace qt3ds {
@@ -101,4 +101,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp
index f3a44aa0..63ecf05b 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderImageBatchLoader.h"
+#include "Qt3DSRenderImageBatchLoader.h"
 #include "foundation/Qt3DSMutex.h"
 #include "foundation/Qt3DSSync.h"
 #include "foundation/Qt3DSContainers.h"
@@ -35,11 +35,11 @@
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/StringTable.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderThreadPool.h"
-#include "UICRenderImageScaler.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderThreadPool.h"
+#include "Qt3DSRenderImageScaler.h"
+#include "Qt3DSRenderLoadedTexture.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSPool.h"
 #include "foundation/Qt3DSPerfTimer.h"
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h
index 24cf5791..9c2c8ab5 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderImageBatchLoader.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderImageBatchLoader.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_THREADED_IMAGE_LOADER_H
 #define UIC_RENDER_THREADED_IMAGE_LOADER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSDataRef.h"
 
@@ -90,4 +90,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
index 0aff7e4b..5b71c006 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.cpp
@@ -27,16 +27,16 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderLoadedTexture.h"
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "UICDMWindowsCompatibility.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICRenderImageScaler.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSRenderImageScaler.h"
+#include "Qt3DSTextRenderer.h"
 #include <QImage>
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
index 6052288d..979e0873 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTexture.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTexture.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_RENDER_LOADED_TEXTURE_H
 #define UIC_RENDER_LOADED_TEXTURE_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSSimpleTypes.h"
 #include "render/Qt3DSRenderBaseTypes.h"
-#include "UICRenderLoadedTextureDDS.h"
+#include "Qt3DSRenderLoadedTextureDDS.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include <QImage>
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureBMP.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp
index e74b42f3..f1835304 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureBMP.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureBMP.cpp
@@ -52,7 +52,7 @@
 // Use at your own risk!
 // ==========================================================
 
-#include "UICRenderLoadedTextureFreeImageCompat.h"
+#include "Qt3DSRenderLoadedTextureFreeImageCompat.h"
 
 // ----------------------------------------------------------
 //   Constants + headers
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
index 4075a984..8000854e 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#include "UICRenderLoadedTextureDDS.h"
-#include "UICRenderLoadedTextureFreeImageCompat.h"
+#include "Qt3DSRenderLoadedTextureDDS.h"
+#include "Qt3DSRenderLoadedTextureFreeImageCompat.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
index 8eb00c68..8eb00c68 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureDDS.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureDDS.h
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h
index 026a3150..c5a740b4 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureFreeImageCompat.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureFreeImageCompat.h
@@ -33,7 +33,7 @@
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderLoadedTexture.h"
 #include "EASTL/algorithm.h"
 #include <stdlib.h>
 #ifndef _MACOSX
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureGIF.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp
index f9840c62..540d0a84 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureGIF.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureGIF.cpp
@@ -52,7 +52,7 @@
 #pragma warning(disable : 4786) // identifier was truncated to 'number' characters
 #endif
 
-#include "UICRenderLoadedTextureFreeImageCompat.h"
+#include "Qt3DSRenderLoadedTextureFreeImageCompat.h"
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
 // ==========================================================
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureHDR.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp
index 5f9b3558..083ecd60 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderLoadedTextureHDR.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderLoadedTextureHDR.cpp
@@ -47,7 +47,7 @@
 // Use at your own risk!
 // ==========================================================
 
-#include "UICRenderLoadedTextureFreeImageCompat.h"
+#include "Qt3DSRenderLoadedTextureFreeImageCompat.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 
 typedef unsigned char RGBE[4];
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
index 0c414160..304bddbc 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/
 
-#include "UICRenderPrefilterTexture.h"
+#include "Qt3DSRenderPrefilterTexture.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
index 989a01f8..296a13d4 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderPrefilterTexture.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderPrefilterTexture.h
@@ -32,10 +32,10 @@
 #define UIC_RENDER_PREFILTER_TEXTURE_H
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderTexture2D.h"
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 
-#include "UICTypes.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSRenderLoadedTexture.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp
index 059b38f5..25fbb414 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderResourceBufferObjects.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h
index 378ef9b9..cf76763b 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceBufferObjects.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceBufferObjects.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_RENDER_RESOURCE_BUFFER_OBJECTS_H
 #define UIC_RENDER_RESOURCE_BUFFER_OBJECTS_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderRenderBuffer.h"
 
@@ -93,4 +93,4 @@ namespace render {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp
index a95daca5..35936885 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderRenderBuffer.h"
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h
index 1f54c683..8df635c4 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceManager.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceManager.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_RENDER_RESOURCE_MANAGER_H
 #define UIC_RENDER_RESOURCE_MANAGER_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp
index 1dc53a44..e877cbc9 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderResourceTexture2D.h"
+#include "Qt3DSRenderResourceTexture2D.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h
index 1f0065f0..816dbe1b 100644
--- a/src/Runtime/Source/UICRender/ResourceManager/UICRenderResourceTexture2D.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/ResourceManager/Qt3DSRenderResourceTexture2D.h
@@ -30,11 +30,11 @@
 #pragma once
 #ifndef UIC_RENDER_RESOURCE_TEXTURE_2D_H
 #define UIC_RENDER_RESOURCE_TEXTURE_2D_H
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderTexture2D.h"
 #include "render/Qt3DSRenderTexture2DArray.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderResourceManager.h"
 
 namespace qt3ds {
 namespace render {
@@ -123,4 +123,4 @@ namespace render {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
index bfcdc56e..0f6841d0 100644
--- a/src/Runtime/Source/UICRender/Source/UICOffscreenRenderManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOffscreenRenderManager.cpp
@@ -27,24 +27,24 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICOffscreenRenderManager.h"
+#include "Qt3DSOffscreenRenderManager.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/StringTable.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderTexture2D.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICTextRenderer.h"
-#include "UICRenderContext.h"
-#include "UICOffscreenRenderKey.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSOffscreenRenderKey.h"
 #include "foundation/FastAllocator.h"
-#include "UICRenderRenderList.h"
-#include "UICRenderResourceTexture2D.h"
-#include "UICRenderResourceBufferObjects.h"
-#include "UICRendererUtil.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRenderResourceTexture2D.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
+#include "Qt3DSRendererUtil.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
index bb665a98..3c7d262b 100644
--- a/src/Runtime/Source/UICRender/Source/UICOldNBustedRenderPlugin.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOldNBustedRenderPlugin.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICOldNBustedRenderPlugin.h"
+#include "Qt3DSOldNBustedRenderPlugin.h"
 #include "SystemPrefix.h"
-#include "UICDLLManager.h"
+#include "Qt3DSDLLManager.h"
 #include "render/Qt3DSRenderContext.h"
 
 #ifdef WIN32
diff --git a/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
index a188903a..64c01565 100644
--- a/src/Runtime/Source/UICRender/Source/UICOnscreenTextRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSOnscreenTextRenderer.cpp
@@ -30,8 +30,8 @@
 #define UIC_RENDER_ONSCREEN_TEXT
 #ifdef UIC_RENDER_ONSCREEN_TEXT
 
-#include "UICTextRenderer.h"
-#include "UICRenderTextureAtlas.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderTextureAtlas.h"
 
 #include "EASTL/string.h"
 #include "EASTL/hash_set.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
index 0515ab4c..b8e47efb 100644
--- a/src/Runtime/Source/UICRender/Source/UICQtTextRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSQtTextRenderer.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#include "UICTextRenderer.h"
-#include "UICRenderText.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderText.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
@@ -38,7 +38,7 @@
 #include "foundation/FileTools.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderThreadPool.h"
+#include "Qt3DSRenderThreadPool.h"
 #include "foundation/Qt3DSSync.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "EASTL/set.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp
index b022b5ee..86375566 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderClippingFrustum.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderClippingFrustum.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderClippingFrustum.h"
+#include "Qt3DSRenderClippingFrustum.h"
 
 using namespace qt3ds::render;
 
@@ -82,4 +82,4 @@ SClippingFrustum::SClippingFrustum(const QT3DSMat44 &modelviewprojection, SClipP
     for (QT3DSU32 idx = 0; idx < 6; ++idx) {
         _cullingPlanes[idx].calculateBBoxEdges();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
index 87b4edd0..ac455ce8 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderContext.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderContextCore.cpp
@@ -27,44 +27,44 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "EABase/eabase.h" //char16_t definition
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/StringTable.h"
-#include "UICRenderNode.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderer.h"
-#include "UICRenderResourceManager.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderResourceManager.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICOffscreenRenderManager.h"
-#include "UICTextRenderer.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderEffectSystem.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSOffscreenRenderManager.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderEffectSystem.h"
+#include "Qt3DSRenderShaderCache.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderRenderBuffer.h"
 #include "render/Qt3DSRenderTexture2D.h"
-#include "UICRenderCamera.h"
+#include "Qt3DSRenderCamera.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderThreadPool.h"
-#include "UICRenderImageBatchLoader.h"
-#include "UICRenderTextTextureCache.h"
-#include "UICRenderTextTextureAtlas.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderPixelGraphicsRenderer.h"
+#include "Qt3DSRenderThreadPool.h"
+#include "Qt3DSRenderImageBatchLoader.h"
+#include "Qt3DSRenderTextTextureCache.h"
+#include "Qt3DSRenderTextTextureAtlas.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderPixelGraphicsRenderer.h"
 #include "foundation/Qt3DSPerfTimer.h"
-#include "UICRenderBufferLoader.h"
+#include "Qt3DSRenderBufferLoader.h"
 #include "foundation/FastAllocator.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICRenderRenderList.h"
-#include "UICRenderPathManager.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
-#include "UICRenderCustomMaterialShaderGenerator.h"
+#include "Qt3DSRenderRenderList.h"
+#include "Qt3DSRenderPathManager.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderCustomMaterialShaderGenerator.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
index 8daa8e61..97d7fc7b 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialShaderGenerator.cpp
@@ -27,20 +27,20 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderCustomMaterialShaderGenerator.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderCustomMaterialShaderGenerator.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderableImage.h"
-#include "UICRenderImage.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderableImage.h"
+#include "Qt3DSRenderImage.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderLight.h"
+#include "Qt3DSRenderLight.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderCamera.h"
-#include "UICRenderShadowMap.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderShadowMap.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
 
 using namespace qt3ds::render;
 using qt3ds::render::NVRenderCachedShaderProperty;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
index d854a7d3..40e26915 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderCustomMaterialSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
@@ -27,20 +27,20 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderCustomMaterialRenderContext.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderCustomMaterialRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderDynamicObjectSystemCommands.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderResourceManager.h"
-#include "UICRenderMesh.h"
-#include "UICRenderCamera.h"
-#include "UICRenderLight.h"
-#include "UICRenderLayer.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderDynamicObjectSystemCommands.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderResourceManager.h"
+#include "Qt3DSRenderMesh.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderLayer.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "render/Qt3DSRenderComputeShader.h"
@@ -48,12 +48,12 @@
 #include "foundation/SerializationTypes.h"
 #include "foundation/Qt3DSTime.h"
 #include "foundation/StringConversionImpl.h" //snprintf
-#include "UICRenderDynamicObjectSystemUtil.h"
-#include "UICRenderableImage.h"
-#include "../RendererImpl/UICVertexPipelineImpl.h"
-#include "../RendererImpl/UICRendererImplLayerRenderData.h"
-#include "UICRenderCustomMaterialShaderGenerator.h"
-#include "UICRenderModel.h"
+#include "Qt3DSRenderDynamicObjectSystemUtil.h"
+#include "Qt3DSRenderableImage.h"
+#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
+#include "../RendererImpl/Qt3DSRendererImplLayerRenderData.h"
+#include "Qt3DSRenderCustomMaterialShaderGenerator.h"
+#include "Qt3DSRenderModel.h"
 
 extern "C" {
 #include "lua.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
index a4244c9f..c2d29610 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderDefaultMaterialShaderGenerator.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDefaultMaterialShaderGenerator.cpp
@@ -27,19 +27,19 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderableImage.h"
-#include "UICRenderImage.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderableImage.h"
+#include "Qt3DSRenderImage.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderLight.h"
+#include "Qt3DSRenderLight.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderCamera.h"
-#include "UICRenderShadowMap.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderShadowMap.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
index bdc75b05..acc931b4 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderDynamicObjectSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderDynamicObjectSystem.cpp
@@ -27,25 +27,25 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "render/Qt3DSRenderShaderConstant.h"
-#include "UICRenderDynamicObject.h"
+#include "Qt3DSRenderDynamicObject.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/FileTools.h"
 #include "foundation/PreAllocatedAllocator.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderString.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICRenderer.h"
-#include "UICRenderDynamicObjectSystemCommands.h"
-#include "UICRenderDynamicObjectSystemUtil.h"
-#include "UICRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderString.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderDynamicObjectSystemCommands.h"
+#include "Qt3DSRenderDynamicObjectSystemUtil.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
 #include "foundation/Qt3DSMutex.h"
 
 using namespace qt3ds;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
index a17a5a19..3f150c17 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderEffectSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEffectSystem.cpp
@@ -27,33 +27,33 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICRenderEffect.h"
-#include "UICRenderResourceManager.h"
-#include "UICRenderDynamicObjectSystemCommands.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderResourceManager.h"
+#include "Qt3DSRenderDynamicObjectSystemCommands.h"
 #include "render/Qt3DSRenderFrameBuffer.h"
 #include "render/Qt3DSRenderShaderConstant.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderContext.h"
-#include "UICRenderer.h"
-#include "UICTextRenderer.h"
-#include "UICRenderCamera.h"
-#include "UICRenderBufferManager.h"
-#include "UICOffscreenRenderManager.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSOffscreenRenderManager.h"
 #include "foundation/PreAllocatedAllocator.h"
 #include "foundation/SerializationTypes.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSRenderShaderCache.h"
 #include "foundation/FileTools.h"
-#include "UICOffscreenRenderKey.h"
-#include "UICRenderDynamicObjectSystemUtil.h"
+#include "Qt3DSOffscreenRenderKey.h"
+#include "Qt3DSRenderDynamicObjectSystemUtil.h"
 
 using namespace qt3ds::render;
 using namespace qt3ds::render::dynamic;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp
index 259d10dd..2732f031 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderEulerAngles.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderEulerAngles.cpp
@@ -34,7 +34,7 @@
 #include <float.h>
 #include <string.h>
 #include <stdio.h>
-#include "UICRenderEulerAngles.h"
+#include "Qt3DSRenderEulerAngles.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4365) // warnings on conversion from unsigned int to int
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
index f21d5969..105348e7 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderGpuProfiler.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGpuProfiler.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/
 
-#include "UICRenderProfiler.h"
+#include "Qt3DSRenderProfiler.h"
 
 #include "EASTL/string.h"
 #include "EASTL/hash_map.h"
@@ -36,7 +36,7 @@
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSFoundation.h"
 
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderTimerQuery.h"
 #include "render/Qt3DSRenderSync.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
index 68691dc7..f1118341 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderGraphObjectSerializer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderGraphObjectSerializer.cpp
@@ -28,31 +28,31 @@
 **
 ****************************************************************************/
 
-#include "UICRenderGraphObjectSerializer.h"
-#include "UICRenderPresentation.h"
-#include "UICRenderNode.h"
-#include "UICRenderScene.h"
-#include "UICRenderLayer.h"
-#include "UICRenderModel.h"
-#include "UICRenderText.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderImage.h"
-#include "UICRenderEffect.h"
-#include "UICRenderCamera.h"
-#include "UICRenderLight.h"
-#include "UICRenderCustomMaterial.h"
+#include "Qt3DSRenderGraphObjectSerializer.h"
+#include "Qt3DSRenderPresentation.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderScene.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderText.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderEffect.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCustomMaterial.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICRenderEffectSystem.h"
+#include "Qt3DSRenderEffectSystem.h"
 #include "foundation/SerializationTypes.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/FileTools.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderReferencedMaterial.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderReferencedMaterial.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
+#include "Qt3DSRenderPathManager.h"
 
 using namespace qt3ds::render;
 using namespace qt3ds::render::dynamic;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp
index fc8bd8e1..c7c50142 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderImageScaler.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderImageScaler.cpp
@@ -31,10 +31,10 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICRender.h"
+#include "Qt3DSRender.h"
 #include "foundation/Qt3DSMath.h"
 #include "foundation/Qt3DSAllocatorCallback.h"
-#include "UICRenderImageScaler.h"
+#include "Qt3DSRenderImageScaler.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp
index 936ce715..a305d1d9 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderInputStreamFactory.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderInputStreamFactory.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 #include "stdio.h"
 
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
index 80d4b0ae..8398afc5 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderPathManager.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPathManager.cpp
@@ -27,41 +27,41 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPathManager.h"
+#include "Qt3DSRenderPathManager.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSIntrinsics.h"
 #include "foundation/Qt3DSContainers.h"
 #include "EASTL/string.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/Utils.h"
 #include "foundation/StringConversionImpl.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
 #include "render/Qt3DSRenderInputAssembler.h"
-#include "UICRenderPath.h"
+#include "Qt3DSRenderPath.h"
 #include "EASTL/sort.h"
 #include "render/Qt3DSRenderContext.h"
 #include "render/Qt3DSRenderVertexBuffer.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderShaderCodeGenerator.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "UICRenderCamera.h"
-#include "UICRenderPathRenderContext.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
-#include "UICRenderDefaultMaterialShaderGenerator.h"
-#include "UICRenderCustomMaterialShaderGenerator.h"
-#include "UICRenderCustomMaterial.h"
-#include "UICRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderPathRenderContext.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderDefaultMaterialShaderGenerator.h"
+#include "Qt3DSRenderCustomMaterialShaderGenerator.h"
+#include "Qt3DSRenderCustomMaterial.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "../RendererImpl/UICVertexPipelineImpl.h"
+#include "../RendererImpl/Qt3DSVertexPipelineImpl.h"
 #include "foundation/Qt3DSMathUtils.h"
 #include "render/Qt3DSRenderPathRender.h"
 #include "render/Qt3DSRenderPathSpecification.h"
-#include "UICRenderPathSubPath.h"
+#include "Qt3DSRenderPathSubPath.h"
 #include "UICImportPath.h"
-#include "UICRenderPathMath.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderPathMath.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/Qt3DSMutex.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
index b92c3c24..343be41f 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsRenderer.cpp
@@ -27,15 +27,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPixelGraphicsRenderer.h"
-#include "UICRenderPixelGraphicsTypes.h"
+#include "Qt3DSRenderPixelGraphicsRenderer.h"
+#include "Qt3DSRenderPixelGraphicsTypes.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderCamera.h"
-#include "UICRenderContext.h"
-#include "UICRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderShaderCache.h"
+#include "Qt3DSRenderShaderCache.h"
 
 using namespace qt3ds;
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp
index 253f2f2b..fe32437f 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderPixelGraphicsTypes.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPixelGraphicsTypes.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPixelGraphicsTypes.h"
+#include "Qt3DSRenderPixelGraphicsTypes.h"
 
 using namespace qt3ds;
 using namespace qt3ds::render;
@@ -63,4 +63,4 @@ SPGHorzLine::SPGHorzLine()
     , m_Right(0)
     , m_LineColor(0, 0, 0, 0)
 {
-}
\ No newline at end of file
+}
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
index 63acc498..ffd60eb3 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderPlugin.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderPlugin.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderPlugin.h"
+#include "Qt3DSRenderPlugin.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
@@ -36,9 +36,9 @@
 #include "foundation/Qt3DSSystem.h"
 #include "foundation/FileTools.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderString.h"
-#include "UICRenderPluginPropertyValue.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderString.h"
+#include "Qt3DSRenderPluginPropertyValue.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 #if defined(QT3DS_WINDOWS)
 #include "WINDOWS/DynamicLibLoader.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp
index bceacb1e..5376b8b9 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderRay.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRay.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderRay.h"
+#include "Qt3DSRenderRay.h"
 #include "foundation/Qt3DSPlane.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp
index 7862c029..118c855d 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderRenderList.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderRenderList.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderRenderList.h"
+#include "Qt3DSRenderRenderList.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
index 197797b2..6351f595 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCache.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCache.cpp
@@ -27,18 +27,18 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderShaderCache.h"
+#include "Qt3DSRenderShaderCache.h"
 #include "render/Qt3DSRenderContext.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/XML.h"
 #include "foundation/IOStreams.h"
 #include "foundation/StringConversionImpl.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/FileTools.h"
 #include "render/Qt3DSRenderShaderProgram.h"
-#include "UICRenderer.h"
+#include "Qt3DSRenderer.h"
 #include <memory>
 #include "foundation/Qt3DSTime.h"
 #include "foundation/Qt3DSPerfTimer.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp
index 2fdfea32..1cc9e9c7 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGenerator.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGenerator.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderShaderCodeGenerator.h"
+#include "Qt3DSRenderShaderCodeGenerator.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
index 7dd07063..e233e065 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderShaderCodeGeneratorV2.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShaderCodeGeneratorV2.cpp
@@ -27,15 +27,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSIntrinsics.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Utils.h"
-#include "UICRenderContext.h"
-#include "UICRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
 
 #include <QtGui/qopengl.h>
 
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
index e7542b5f..6aeb0d56 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderShadowMap.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderShadowMap.cpp
@@ -28,10 +28,10 @@
 **
 ****************************************************************************/
 
-#include "UICRenderLayer.h"
-#include "UICRenderShadowMap.h"
-#include "UICRenderResourceManager.h"
-#include "../RendererImpl/UICRendererImplLayerRenderData.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderShadowMap.h"
+#include "Qt3DSRenderResourceManager.h"
+#include "../RendererImpl/Qt3DSRendererImplLayerRenderData.h"
 #include "render/Qt3DSRenderShaderConstant.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
index 586c9e09..88bd17dd 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderSubpresentation.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderSubpresentation.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderSubpresentation.h"
-#include "UICRenderRenderList.h"
+#include "Qt3DSRenderSubpresentation.h"
+#include "Qt3DSRenderRenderList.h"
 #ifdef _WIN32
 #pragma warning(disable : 4355) // this used in initializer list.  I have never seen this result in
                                 // a physical error
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
index 37bd816e..931f27fb 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureAtlas.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureAtlas.cpp
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#include "UICRenderTextTextureAtlas.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSRenderTextTextureAtlas.h"
+#include "Qt3DSTextRenderer.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp
index 8bbfecd2..ce7b4689 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderTextTextureCache.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextTextureCache.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderTextTextureCache.h"
-#include "UICTextRenderer.h"
+#include "Qt3DSRenderTextTextureCache.h"
+#include "Qt3DSTextRenderer.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp
index 8d53f287..062e7d57 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderTextureAtlas.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderTextureAtlas.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderTextureAtlas.h"
+#include "Qt3DSRenderTextureAtlas.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp
index 1b034c6e..6ca36e65 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderThreadPool.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderThreadPool.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderThreadPool.h"
+#include "Qt3DSRenderThreadPool.h"
 #include "foundation/Qt3DSThread.h"
 #include "EASTL/utility.h"
 #include "EASTL/list.h"
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp
index 0b7bd0cf..e393cbcf 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderUIPLoader.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPLoader.cpp
@@ -29,17 +29,17 @@
 ****************************************************************************/
 #ifdef UIC_RENDER_ENABLE_LOAD_UIP
 
-#include "UICRenderUIPLoader.h"
-#include "UICRenderPresentation.h"
-#include "UICRenderNode.h"
-#include "UICRenderLight.h"
-#include "UICRenderCamera.h"
-#include "UICRenderLayer.h"
-#include "UICRenderModel.h"
-#include "UICRenderDefaultMaterial.h"
-#include "UICRenderImage.h"
-#include "UICRenderBufferManager.h"
-#include "UICRenderUIPSharedTranslation.h"
+#include "Qt3DSRenderUIPLoader.h"
+#include "Qt3DSRenderPresentation.h"
+#include "Qt3DSRenderNode.h"
+#include "Qt3DSRenderLight.h"
+#include "Qt3DSRenderCamera.h"
+#include "Qt3DSRenderLayer.h"
+#include "Qt3DSRenderModel.h"
+#include "Qt3DSRenderDefaultMaterial.h"
+#include "Qt3DSRenderImage.h"
+#include "Qt3DSRenderBufferManager.h"
+#include "Qt3DSRenderUIPSharedTranslation.h"
 #include <vector>
 #include <map>
 #include <set>
@@ -47,9 +47,9 @@
 #pragma warning(disable : 4201)
 #endif
 #include "UICDMXML.h"
-#include "UICTypes.h"
-#include "UICVector3.h"
-#include "UICMetadata.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSMetadata.h"
 #include "UICDMWStrOps.h"
 #include "UICDMWStrOpsImpl.h"
 #include "foundation/Qt3DSOption.h"
@@ -59,23 +59,23 @@
 #include "UICDMComposerTypeDefinitions.h"
 #include "EASTL/string.h"
 #include "foundation/StrConvertUTF.h"
-#include "UICRenderEffectSystem.h"
-#include "UICRenderString.h"
+#include "Qt3DSRenderEffectSystem.h"
+#include "Qt3DSRenderString.h"
 #include "foundation/FileTools.h"
-#include "UICRenderDynamicObjectSystemCommands.h"
+#include "Qt3DSRenderDynamicObjectSystemCommands.h"
 #include "EASTL/map.h"
-#include "UICRenderEffect.h"
+#include "Qt3DSRenderEffect.h"
 #include "UICDMMetaDataTypes.h"
-#include "UICTextRenderer.h"
-#include "UICRenderPlugin.h"
-#include "UICRenderPluginGraphObject.h"
-#include "UICRenderPluginPropertyValue.h"
-#include "UICRenderDynamicObjectSystem.h"
-#include "UICRenderCustomMaterialSystem.h"
-#include "UICRenderMaterialHelpers.h"
-#include "UICRenderPath.h"
-#include "UICRenderPathSubPath.h"
-#include "UICRenderPathManager.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderPlugin.h"
+#include "Qt3DSRenderPluginGraphObject.h"
+#include "Qt3DSRenderPluginPropertyValue.h"
+#include "Qt3DSRenderDynamicObjectSystem.h"
+#include "Qt3DSRenderCustomMaterialSystem.h"
+#include "Qt3DSRenderMaterialHelpers.h"
+#include "Qt3DSRenderPath.h"
+#include "Qt3DSRenderPathSubPath.h"
+#include "Qt3DSRenderPathManager.h"
 
 using qt3ds::foundation::Option;
 using qt3ds::foundation::Empty;
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp
index eb8fee58..99e075d6 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderUIPSharedTranslation.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderUIPSharedTranslation.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRenderUIPSharedTranslation.h"
+#include "Qt3DSRenderUIPSharedTranslation.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp
index fcfd53db..24fed087 100644
--- a/src/Runtime/Source/UICRender/Source/UICRenderWidgets.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderWidgets.cpp
@@ -28,10 +28,10 @@
 **
 ****************************************************************************/
 
-#include "UICRenderWidgets.h"
-#include "UICRenderNode.h"
+#include "Qt3DSRenderWidgets.h"
+#include "Qt3DSRenderNode.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICRenderShaderCodeGeneratorV2.h"
+#include "Qt3DSRenderShaderCodeGeneratorV2.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp
index aeb559c7..7bc108e0 100644
--- a/src/Runtime/Source/UICRender/Source/UICRendererUtil.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRendererUtil.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICRendererUtil.h"
-#include "UICRenderResourceBufferObjects.h"
-#include "UICRenderResourceTexture2D.h"
+#include "Qt3DSRendererUtil.h"
+#include "Qt3DSRenderResourceBufferObjects.h"
+#include "Qt3DSRenderResourceTexture2D.h"
 
 using namespace qt3ds::render;
 
diff --git a/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp
index f4e90c04..91a5eb78 100644
--- a/src/Runtime/Source/UICRender/Source/UICTextRenderer.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSTextRenderer.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICTextRenderer.h"
+#include "Qt3DSTextRenderer.h"
 #include "render/Qt3DSRenderTexture2D.h"
 
 using namespace qt3ds::render;
diff --git a/src/Runtime/Source/UICRender/Source/q3dsqmlrender.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
index 82379f7b..82379f7b 100644
--- a/src/Runtime/Source/UICRender/Source/q3dsqmlrender.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/q3dsqmlrender.cpp
diff --git a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
index c42bbadb..c3f4fe65 100644
--- a/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
+++ b/src/Runtime/Source/Qt3DSState/Include/Qt3DSStateScriptBridge.h
@@ -32,9 +32,9 @@
 
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 
 struct lua_State;
 //==============================================================================
diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h
index 81228328..ca8f44d5 100644
--- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h
+++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateApplication.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 
 namespace qt3ds {
 namespace state {
diff --git a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h
index 5a3d766b..83cf0553 100644
--- a/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h
+++ b/src/Runtime/Source/Qt3DSState/InternalInclude/Qt3DSStateLuaEngine.h
@@ -33,12 +33,12 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Studio Includes
 //==============================================================================
-#include "UICIScriptBridge.h"
+#include "Qt3DSIScriptBridge.h"
 #include "EASTL/map.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSPool.h"
@@ -46,7 +46,7 @@
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSSync.h"
 #include "foundation/Qt3DSMutex.h"
-#include "UICIComponentManager.h"
+#include "Qt3DSIComponentManager.h"
 #include "Qt3DSStateContext.h"
 
 #include "Qt3DSStateScriptBridge.h"
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
index 5dc6d633..849812a1 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
+++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateEngine.cpp
@@ -44,11 +44,11 @@
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSTime.h"
 
-#include "UICKernelTypes.h"
-#include "UICStateVisualBindingContext.h"
-#include "UICTypes.h"
-#include "UICTimer.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSStateVisualBindingContext.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSStateInterpreter.h"
 #include "EventPollingSystem.h"
 
 #include "Qt3DSStateContext.h"
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp
index f12a13ce..e75a448e 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp
+++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateFactory.cpp
@@ -38,14 +38,14 @@
 #include "foundation/Qt3DSAllocator.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 
-#include "UICTypes.h"
-#include "UICKernelTypes.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSKernelTypes.h"
 #include "Qt3DSStateLuaEngine.h"
 #include "EventPollingSystem.h"
 #include "EventSystem.h"
-#include "UICStateVisualBindingContext.h"
-#include "UICStateVisualBindingContextValues.h"
-#include "UICStateScriptContext.h"
+#include "Qt3DSStateVisualBindingContext.h"
+#include "Qt3DSStateVisualBindingContextValues.h"
+#include "Qt3DSStateScriptContext.h"
 
 #include "Qt3DSStateInputStreamFactory.h"
 #include "Qt3DSStateContext.h"
diff --git a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
index 0bc9e261..de001438 100644
--- a/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
+++ b/src/Runtime/Source/Qt3DSState/Source/Qt3DSStateLuaEngine.cpp
@@ -34,26 +34,26 @@
 // Includes
 //==============================================================================
 #include "Qt3DSStateLuaEngine.h"
-#include "UICFileStream.h"
-#include "UICDataLogger.h"
+#include "Qt3DSFileStream.h"
+#include "Qt3DSDataLogger.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSLogging.h"
 #include "foundation/Qt3DSSystem.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICStateLuaScriptContext.h"
-#include "UICStateDebugger.h"
+#include "Qt3DSStateLuaScriptContext.h"
+#include "Qt3DSStateDebugger.h"
 #include "EventPollingSystemLuaBinding.h"
-#include "UICHash.h"
+#include "Qt3DSHash.h"
 
 #include "EASTL/vector.h"
 #include <sys/stat.h>
 
-#include "UICStateDebugStreams.h"
+#include "Qt3DSStateDebugStreams.h"
 #include "foundation/Qt3DSPerfTimer.h"
-#include "UICLuaDebugger.h"
+#include "Qt3DSLuaDebugger.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICParametersSystem.h"
-#include "UICTypes.h"
+#include "Qt3DSParametersSystem.h"
+#include "Qt3DSTypes.h"
 
 #include "Qt3DSStateInputStreamFactory.h"
 #include "Qt3DSStateApplication.h"
diff --git a/src/Runtime/Source/UICState/Application/UICStateApplication.cpp b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp
index 69a42823..0ef23013 100644
--- a/src/Runtime/Source/UICState/Application/UICStateApplication.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateApplication.h"
+#include "Qt3DSStateApplication.h"
 #include "foundation/FileTools.h"
 #include "EASTL/vector.h"
 #include "foundation/IOStreams.h"
diff --git a/src/Runtime/Source/UICState/Application/UICStateApplication.h b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h
index 50d02dd2..50d02dd2 100644
--- a/src/Runtime/Source/UICState/Application/UICStateApplication.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Application/Qt3DSStateApplication.h
diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp
index 7d27ad7e..95ce6d88 100644
--- a/src/Runtime/Source/UICState/Debugger/UICLuaDatamodelCache.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDatamodelCache.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #ifndef UIC_LUA_DATAMODLE_CACHE_H
 #define UIC_LUA_DATAMODLE_CACHE_H
-#include "UICLuaDebugger.h"
-#include "UICLuaDebuggerProtocol.h"
+#include "Qt3DSLuaDebugger.h"
+#include "Qt3DSLuaDebuggerProtocol.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h
index 9065e130..516d660a 100644
--- a/src/Runtime/Source/UICState/Debugger/UICLuaDebugger.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebugger.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #ifndef UIC_LUA_DEBUGGER_H
 #define UIC_LUA_DEBUGGER_H
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerValues.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerValues.h"
 
 struct lua_State;
 
diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h
index 57c99438..1f6e00f6 100644
--- a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerImpl.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_LUA_DEBUGGER_IMPL_H
 #define UIC_LUA_DEBUGGER_IMPL_H
-#include "UICLuaDebugger.h"
+#include "Qt3DSLuaDebugger.h"
 #include "EASTL/hash_map.h"
 
 namespace eastl {
diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h
index 6e3635f3..647efde6 100644
--- a/src/Runtime/Source/UICState/Debugger/UICLuaDebuggerProtocol.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaDebuggerProtocol.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_LUA_DEBUGGER_PROTOCOL_H
 #define UIC_LUA_DEBUGGER_PROTOCOL_H
-#include "UICLuaDebugger.h"
+#include "Qt3DSLuaDebugger.h"
 #include "foundation/Qt3DSTime.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
 #include "foundation/SerializationTypes.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp
index 17b87b35..961c8099 100644
--- a/src/Runtime/Source/UICState/Debugger/UICLuaSideDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSLuaSideDebugger.cpp
@@ -27,13 +27,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICLuaDebugger.h"
-#include "UICLuaDebuggerProtocol.h"
+#include "Qt3DSLuaDebugger.h"
+#include "Qt3DSLuaDebuggerProtocol.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSContainers.h"
-#include "UICLuaDebuggerImpl.h"
+#include "Qt3DSLuaDebuggerImpl.h"
 #include "foundation/Qt3DSAtomic.h"
 
 extern "C" {
diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h
index 0f1c2fd0..a8e8777a 100644
--- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebugger.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebugger.h
@@ -30,7 +30,7 @@
 #ifndef UIC_SCENE_GRAPH_DEBUGGER_H
 #define UIC_SCENE_GRAPH_DEBUGGER_H
 #pragma once
-#include "UICStateDebugger.h"
+#include "Qt3DSStateDebugger.h"
 #include "UICUIADatamodel.h"
 
 namespace qt3ds {
@@ -108,4 +108,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h
index 4286e701..29a01dd5 100644
--- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerProtocol.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerProtocol.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #ifndef UIC_SCENE_GRAPH_DEBUGGER_PROTOCOL_H
 #define UIC_SCENE_GRAPH_DEBUGGER_PROTOCOL_H
-#include "UICSceneGraphDebugger.h"
-#include "UICSceneGraphDebuggerValue.h"
+#include "Qt3DSSceneGraphDebugger.h"
+#include "Qt3DSSceneGraphDebuggerValue.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
 #include "foundation/SerializationTypes.h"
 
diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h
index 327b012b..e3ce652f 100644
--- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphDebuggerValue.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphDebuggerValue.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_SCENE_GRAPH_DEBUGGER_VALUE_H
 #define UIC_SCENE_GRAPH_DEBUGGER_VALUE_H
-#include "UICSceneGraphDebugger.h"
+#include "Qt3DSSceneGraphDebugger.h"
 #include "UICUIADatamodel.h"
 #include "UICUIADatamodelValue.h"
 #include "UICStateEditorValue.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp
index 91886e17..403fb580 100644
--- a/src/Runtime/Source/UICState/Debugger/UICSceneGraphRuntimeDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSSceneGraphRuntimeDebugger.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICSceneGraphDebugger.h"
-#include "UICSceneGraphDebuggerValue.h"
-#include "UICSceneGraphDebuggerProtocol.h"
+#include "Qt3DSSceneGraphDebugger.h"
+#include "Qt3DSSceneGraphDebuggerValue.h"
+#include "Qt3DSSceneGraphDebuggerProtocol.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/StringTable.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp
index d3278e6b..f8b13f5c 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDataTest.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDataTest.cpp
@@ -27,10 +27,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICState.h"
-#include "UICStateTestCommon.h"
-#include "UICStateLuaScriptContext.h"
-#include "UICStateTest.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTestCommon.h"
+#include "Qt3DSStateLuaScriptContext.h"
+#include "Qt3DSStateTest.h"
 #include "foundation/IOStreams.h"
 #include "EASTL/string.h"
 #include "foundation/Utils.h"
@@ -41,10 +41,10 @@
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/TrackingAllocator.h"
 #include "foundation/StringTable.h"
-#include "UICStateContext.h"
+#include "Qt3DSStateContext.h"
 #include "foundation/AutoDeallocatorAllocator.h"
-#include "UICStateExecutionContext.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSStateExecutionContext.h"
+#include "Qt3DSStateInterpreter.h"
 
 extern "C" {
 #include "lua.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp
index 3738839e..2b6369a7 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateDebugStreams.h"
+#include "Qt3DSStateDebugStreams.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h
index d416f3f5..7a1446cb 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebugStreams.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugStreams.h
@@ -30,10 +30,10 @@
 #ifndef UIC_STATE_DEBUG_STREAMS_H
 #define UIC_STATE_DEBUG_STREAMS_H
 #pragma once
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Socket.h"
 #include "foundation/Qt3DSTime.h"
-#include "UICStateDebugger.h"
+#include "Qt3DSStateDebugger.h"
 
 struct lua_State;
 
@@ -138,4 +138,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp
index 2c32a1ba..a64e8589 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggedInterpreter.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggedInterpreter.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerProtocol.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerProtocol.h"
 #include "EASTL/map.h"
 #include "EASTL/set.h"
 #include "foundation/Qt3DSAtomic.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp
index 23ad1e90..47de0a96 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerValues.h"
-#include "UICStateDebuggerProtocol.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerValues.h"
+#include "Qt3DSStateDebuggerProtocol.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/IOStreams.h"
 
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h
index 55b3608a..e87b38d9 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebugger.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebugger.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_DEBUGGER_H
 #define UIC_STATE_DEBUGGER_H
 #pragma once
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/StringTable.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp
index 6b8abe3c..2045f84f 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerListener.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerListener.cpp
@@ -27,12 +27,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerValues.h"
-#include "UICStateDebuggerProtocol.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerValues.h"
+#include "Qt3DSStateDebuggerProtocol.h"
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICStateScriptContext.h"
+#include "Qt3DSStateScriptContext.h"
 
 using namespace qt3ds::state;
 using namespace qt3ds::state::debugger;
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h
index 18bda58c..37501723 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerProtocol.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerProtocol.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #ifndef UIC_STATE_DEBUGGER_PROTOCOL_H
 #define UIC_STATE_DEBUGGER_PROTOCOL_H
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerValues.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerValues.h"
 #include "foundation/StringConversion.h"
 #include "foundation/StringConversionImpl.h"
 #include "foundation/Qt3DSTime.h"
@@ -922,4 +922,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h
index 863110ee..b937fd35 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateDebuggerValues.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateDebuggerValues.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_DEBUGGER_VALUES_H
 #define UIC_STATE_DEBUGGER_VALUES_H
 #pragma once
-#include "UICStateDebugger.h"
+#include "Qt3DSStateDebugger.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateLuaTest.cpp
index 81755cae..a5eb3cae 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateLuaTest.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateLuaTest.cpp
@@ -27,9 +27,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICState.h"
-#include "UICStateTest.h"
-#include "UICStateTestCommon.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTest.h"
+#include "Qt3DSStateTestCommon.h"
 
 extern "C" {
 #include "lua.h"
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateTest.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h
index 14cbe4eb..97039ab5 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateTest.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTest.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_STATE_TEST_H
 #define UIC_STATE_TEST_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSOption.h"
 
@@ -92,4 +92,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h
index 293aaea8..e3e12790 100644
--- a/src/Runtime/Source/UICState/Debugger/UICStateTestCommon.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Debugger/Qt3DSStateTestCommon.h
@@ -29,13 +29,13 @@
 ****************************************************************************/
 #ifndef UIC_STATE_TEST_COMMON_H
 #define UIC_STATE_TEST_COMMON_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSIntrinsics.h"
 #include "foundation/Qt3DSMath.h"
 #include "foundation/FileTools.h"
-#include "UICStateTest.h"
+#include "Qt3DSStateTest.h"
 #include "EASTL/string.h"
 #include "foundation/TrackingAllocator.h"
 
diff --git a/src/Runtime/Source/UICState/Editor/UICLuaArchitectDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp
index 502178da..502178da 100644
--- a/src/Runtime/Source/UICState/Editor/UICLuaArchitectDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICLuaArchitectDebugger.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICSceneGraphArchitectDebugger.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICSceneGraphArchitectDebugger.cpp
index d752c9b1..d752c9b1 100644
--- a/src/Runtime/Source/UICState/Editor/UICSceneGraphArchitectDebugger.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICSceneGraphArchitectDebugger.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICStateDebuggerMaster.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateDebuggerMaster.cpp
index 3706d194..3706d194 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateDebuggerMaster.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateDebuggerMaster.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditor.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.cpp
index b8ffecbc..b8ffecbc 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditor.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditor.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h
index ecd566a6..0ade073e 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditor.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditor.h
@@ -30,15 +30,15 @@
 #ifndef UIC_STATE_EDITOR_H
 #define UIC_STATE_EDITOR_H
 #pragma once
-#include "UICState.h"
-#include "UICStateSignalConnection.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateSignalConnection.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/TaggedPointer.h"
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSVec2.h"
 #include "foundation/Qt3DSVec3.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSStateInterpreter.h"
 
 namespace qt3ds {
 namespace state {
@@ -312,4 +312,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorEditorsImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h
index 01c5528e..01c5528e 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorEditorsImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorEditorsImpl.h
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h
index 03fbd16f..cdeaf132 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorFoundation.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorFoundation.h
@@ -31,7 +31,7 @@
 #define UIC_STATE_EDITOR_FOUNDATION_H
 #pragma once
 
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h
index e0e3d793..e0e3d793 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorImpl.h
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorProperties.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h
index 91ed5b04..91ed5b04 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorProperties.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorProperties.h
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorTransactionImpl.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp
index 88794438..88794438 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorTransactionImpl.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorTransactionImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h
index 3a672a85..3a672a85 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorTransactionImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransactionImpl.h
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorTransitionPath.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.cpp
index 8df73b32..8df73b32 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorTransitionPath.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorTransitionPath.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h
index 24a4aa29..24a4aa29 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorTransitionPath.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorTransitionPath.h
diff --git a/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h
index 50b8f8f9..3149c093 100644
--- a/src/Runtime/Source/UICState/Editor/UICStateEditorValue.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICStateEditorValue.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_EDITOR_VALUE_H
 #define UIC_STATE_EDITOR_VALUE_H
 #pragma once
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "UICStateEditor.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
 #include "foundation/Qt3DSVec3.h"
diff --git a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.cpp b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp
index 3f1d6fd9..3f1d6fd9 100644
--- a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.cpp
diff --git a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.h
index 5ef1cd89..0fed90f7 100644
--- a/src/Runtime/Source/UICState/Editor/UICUIADatamodel.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodel.h
@@ -29,10 +29,10 @@
 ****************************************************************************/
 #ifndef UIA_DATAMODEL_H
 #define UIA_DATAMODEL_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "UICStateEditor.h"
-#include "UICMetadata.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSMetadata.h"
+#include "Qt3DSStateInterpreter.h"
 #include "UICStateEditorFoundation.h"
 
 namespace qt3ds {
@@ -171,4 +171,4 @@ namespace app {
     typedef NVScopedRefCounted<IDatamodel> TDatamodelPtr;
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h
index 5448da6e..5448da6e 100644
--- a/src/Runtime/Source/UICState/Editor/UICUIADatamodelValue.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Editor/UICUIADatamodelValue.h
diff --git a/src/Runtime/Source/UICState/Include/UICState.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h
index 5db768cc..5db768cc 100644
--- a/src/Runtime/Source/UICState/Include/UICState.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSState.h
diff --git a/src/Runtime/Source/UICState/Include/UICStateContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h
index aa70f001..8360f554 100644
--- a/src/Runtime/Source/UICState/Include/UICStateContext.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateContext.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #ifndef UIC_STATE_CONTEXT_H
 #define UIC_STATE_CONTEXT_H
-#include "UICState.h"
-#include "UICStateTypes.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTypes.h"
 
 namespace qt3ds {
 namespace state {
@@ -92,4 +92,4 @@ namespace state {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h
index 187eabb5..33f11dca 100644
--- a/src/Runtime/Source/UICState/Include/UICStateExecutionContext.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionContext.h
@@ -30,8 +30,8 @@
 #ifndef UIC_STATE_EXECUTION_CONTEXT_H
 #define UIC_STATE_EXECUTION_CONTEXT_H
 #pragma once
-#include "UICState.h"
-#include "UICStateTypes.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 
 namespace qt3ds {
@@ -70,4 +70,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h
index 433773bd..00c74ac2 100644
--- a/src/Runtime/Source/UICState/Include/UICStateExecutionTypes.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateExecutionTypes.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_EXECUTION_TYPES_H
 #define UIC_STATE_EXECUTION_TYPES_H
 #pragma once
-#include "UICStateTypes.h"
+#include "Qt3DSStateTypes.h"
 
 namespace qt3ds {
 namespace state {
@@ -389,4 +389,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateIdValue.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h
index d6da0fad..d6936930 100644
--- a/src/Runtime/Source/UICState/Include/UICStateIdValue.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateIdValue.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_STATE_ID_TYPE_VALUE_H
 #define UIC_STATE_ID_TYPE_VALUE_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
 
 // Discriminated union to unify different things that may be identified by an id
diff --git a/src/Runtime/Source/UICState/Include/UICStateInterpreter.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h
index 656fc859..825f2b6f 100644
--- a/src/Runtime/Source/UICState/Include/UICStateInterpreter.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateInterpreter.h
@@ -30,9 +30,9 @@
 #ifndef UIC_STATE_INTERPRETER_H
 #define UIC_STATE_INTERPRETER_H
 #pragma once
-#include "UICState.h"
-#include "UICStateTypes.h"
-#include "UICStateSignalConnection.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTypes.h"
+#include "Qt3DSStateSignalConnection.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSDataRef.h"
 
@@ -118,4 +118,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h
index c21fcbc0..130919bc 100644
--- a/src/Runtime/Source/UICState/Include/UICStateLuaScriptContext.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateLuaScriptContext.h
@@ -30,8 +30,8 @@
 #ifndef UIC_STATE_LUA_SCRIPT_CONTEXT_H
 #define UIC_STATE_LUA_SCRIPT_CONTEXT_H
 #pragma once
-#include "UICState.h"
-#include "UICStateScriptContext.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateScriptContext.h"
 
 struct lua_State;
 
@@ -92,4 +92,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateScriptContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h
index 8fda0be0..cfd741cf 100644
--- a/src/Runtime/Source/UICState/Include/UICStateScriptContext.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateScriptContext.h
@@ -30,8 +30,8 @@
 #ifndef UIC_STATE_SCRIPT_CONTEXT_H
 #define UIC_STATE_SCRIPT_CONTEXT_H
 #pragma once
-#include "UICState.h"
-#include "UICStateTypes.h"
+#include "Qt3DSState.h"
+#include "Qt3DSStateTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSOption.h"
 #include "foundation/StringTable.h"
@@ -125,4 +125,4 @@ namespace state {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h
index f9c9acc9..8f880f60 100644
--- a/src/Runtime/Source/UICState/Include/UICStateSharedImpl.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSharedImpl.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 #ifndef UIC_STATE_SHARED_IMPL_H
 #define UIC_STATE_SHARED_IMPL_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Utils.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h
index c22278c8..3c8ac21e 100644
--- a/src/Runtime/Source/UICState/Include/UICStateSignalConnection.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateSignalConnection.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_SIGNAL_CONNECTION_H
 #define UIC_STATE_SIGNAL_CONNECTION_H
 #pragma once
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSRefCounted.h"
 namespace qt3ds {
 namespace state {
diff --git a/src/Runtime/Source/UICState/Include/UICStateTypes.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
index 6f5489a5..999c5032 100644
--- a/src/Runtime/Source/UICState/Include/UICStateTypes.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateTypes.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_STATE_TYPES_H
 #define UIC_STATE_TYPES_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSFlags.h"
@@ -42,7 +42,7 @@
 #include "foundation/Qt3DSVec3.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Utils.h"
-#include "UICStateIdValue.h"
+#include "Qt3DSStateIdValue.h"
 
 namespace qt3ds {
 namespace state {
diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h
index 474df08f..7217080b 100644
--- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContext.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContext.h
@@ -30,10 +30,10 @@
 #pragma once
 #ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_H
 #define UIC_STATE_VISUAL_BINDING_CONTEXT_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/StringTable.h"
-#include "UICStateVisualBindingContextCommands.h"
+#include "Qt3DSStateVisualBindingContextCommands.h"
 
 namespace qt3ds {
 namespace foundation {
@@ -120,4 +120,4 @@ namespace state {
 }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
index 9774cc76..3bb46575 100644
--- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextCommands.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H
 #define UIC_STATE_VISUAL_BINDING_CONTEXT_COMMANDS_H
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/StringTable.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h
index 073889dd..d79b6a46 100644
--- a/src/Runtime/Source/UICState/Include/UICStateVisualBindingContextValues.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextValues.h
@@ -30,9 +30,9 @@
 #pragma once
 #ifndef UIC_STATE_VISUAL_BINDING_CONTEXT_VALUES_H
 #define UIC_STATE_VISUAL_BINDING_CONTEXT_VALUES_H
-#include "UICStateVisualBindingContext.h"
+#include "Qt3DSStateVisualBindingContext.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
-#include "UICStateVisualBindingContextCommands.h"
+#include "Qt3DSStateVisualBindingContextCommands.h"
 
 namespace qt3ds {
 namespace state {
diff --git a/src/Runtime/Source/UICState/Include/UICStateXMLIO.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h
index 51422660..075ec26b 100644
--- a/src/Runtime/Source/UICState/Include/UICStateXMLIO.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateXMLIO.h
@@ -30,7 +30,7 @@
 #ifndef UIC_STATE_XML_IO_H
 #define UIC_STATE_XML_IO_H
 #pragma once
-#include "UICState.h"
+#include "Qt3DSState.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/StringTable.h"
diff --git a/src/Runtime/Source/UICState/Source/UICStateContext.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp
index 63f4d010..60814ed5 100644
--- a/src/Runtime/Source/UICState/Source/UICStateContext.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateContext.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateContext.h"
-#include "UICStateXMLIO.h"
+#include "Qt3DSStateContext.h"
+#include "Qt3DSStateXMLIO.h"
 #include "foundation/XML.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
diff --git a/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp
index e16e4dd5..4516c2f9 100644
--- a/src/Runtime/Source/UICState/Source/UICStateExecutionContext.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateExecutionContext.cpp
@@ -27,14 +27,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateExecutionContext.h"
-#include "UICStateExecutionTypes.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSStateExecutionContext.h"
+#include "Qt3DSStateExecutionTypes.h"
+#include "Qt3DSStateInterpreter.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/StringConversionImpl.h"
-#include "UICStateScriptContext.h"
+#include "Qt3DSStateScriptContext.h"
 #include "foundation/Utils.h"
 #include "EASTL/string.h"
 
diff --git a/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp
index 9729206b..86a6f862 100644
--- a/src/Runtime/Source/UICState/Source/UICStateInterpreter.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateInterpreter.cpp
@@ -27,8 +27,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateTypes.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSStateTypes.h"
+#include "Qt3DSStateInterpreter.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSIntrinsics.h"
@@ -41,16 +41,16 @@
 #include "EASTL/set.h"
 #include "EASTL/sort.h"
 #include "EASTL/list.h"
-#include "UICStateExecutionContext.h"
-#include "UICStateExecutionTypes.h"
-#include "UICStateScriptContext.h"
-#include "UICStateSharedImpl.h"
+#include "Qt3DSStateExecutionContext.h"
+#include "Qt3DSStateExecutionTypes.h"
+#include "Qt3DSStateScriptContext.h"
+#include "Qt3DSStateSharedImpl.h"
 #include "foundation/XML.h"
-#include "UICStateIdValue.h"
-#include "UICStateDebugger.h"
-#include "UICStateXMLIO.h"
-#include "UICStateDebuggerValues.h"
-#include "UICStateContext.h"
+#include "Qt3DSStateIdValue.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateXMLIO.h"
+#include "Qt3DSStateDebuggerValues.h"
+#include "Qt3DSStateContext.h"
 #include "foundation/FastAllocator.h"
 
 using namespace qt3ds::state;
diff --git a/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateLuaScriptContext.cpp
index 9e32fc72..71e36d6b 100644
--- a/src/Runtime/Source/UICState/Source/UICStateLuaScriptContext.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateLuaScriptContext.cpp
@@ -27,7 +27,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateLuaScriptContext.h"
+#include "Qt3DSStateLuaScriptContext.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
@@ -38,18 +38,18 @@
 #include "foundation/StringTable.h"
 #include "foundation/AutoDeallocatorAllocator.h"
 #include "foundation/TrackingAllocator.h"
-#include "UICStateExecutionContext.h"
-#include "UICStateInterpreter.h"
+#include "Qt3DSStateExecutionContext.h"
+#include "Qt3DSStateInterpreter.h"
 #include "EASTL/string.h"
 #include "EASTL/map.h"
 #include "EASTL/hash_map.h"
 #include "EASTL/hash_set.h"
-#include "UICStateXMLIO.h"
+#include "Qt3DSStateXMLIO.h"
 #include "foundation/XML.h"
 #include "foundation/IOStreams.h"
-#include "UICStateDebugger.h"
-#include "UICStateDebuggerValues.h"
-#include "UICStateContext.h"
+#include "Qt3DSStateDebugger.h"
+#include "Qt3DSStateDebuggerValues.h"
+#include "Qt3DSStateContext.h"
 extern "C" {
 #include "lua.h"
 #include "lauxlib.h"
diff --git a/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp
index f8e45247..1bfc1b6c 100644
--- a/src/Runtime/Source/UICState/Source/UICStateVisualBindingContext.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateVisualBindingContext.cpp
@@ -27,17 +27,17 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateVisualBindingContext.h"
+#include "Qt3DSStateVisualBindingContext.h"
 
-#include "UICStateVisualBindingContextValues.h"
+#include "Qt3DSStateVisualBindingContextValues.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/AutoDeallocatorAllocator.h"
 #include "EASTL/string.h"
 #include "EASTL/hash_map.h"
-#include "UICStateInterpreter.h"
-#include "UICStateContext.h"
+#include "Qt3DSStateInterpreter.h"
+#include "Qt3DSStateContext.h"
 #include "foundation/XML.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
diff --git a/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
index a5258827..175af0cf 100644
--- a/src/Runtime/Source/UICState/Source/UICStateXMLIO.cpp
+++ b/src/Runtime/Source/Qt3DSStateApplication/Source/Qt3DSStateXMLIO.cpp
@@ -27,16 +27,16 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "UICStateXMLIO.h"
+#include "Qt3DSStateXMLIO.h"
 #include "foundation/XML.h"
-#include "UICStateTypes.h"
-#include "UICStateContext.h"
+#include "Qt3DSStateTypes.h"
+#include "Qt3DSStateContext.h"
 #include "foundation/Utils.h"
 #include "foundation/StringConversionImpl.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "EASTL/hash_map.h"
-#include "UICStateExecutionTypes.h"
+#include "Qt3DSStateExecutionTypes.h"
 #include "UICStateEditor.h"
 #include "UICStateEditorValue.h"
 
diff --git a/src/Runtime/Source/Runtime/Include/UICActivationManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h
index bd9cd7b1..9f9956a7 100644
--- a/src/Runtime/Source/Runtime/Include/UICActivationManager.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSActivationManager.h
@@ -34,11 +34,11 @@
 #include "EASTL/string.h"
 #include "foundation/Qt3DSAllocator.h"
 #include "foundation/Utils.h"
-#include "UICKernelTypes.h"
-#include "UICMetadata.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSMetadata.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICTimePolicy.h"
+#include "Qt3DSTimePolicy.h"
 
 namespace Q3DStudio {
 struct IComponentTimeOverrideFinishedCallback;
@@ -154,4 +154,4 @@ namespace runtime {
     };
 }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h
index 0fecb6ca..0fecb6ca 100644
--- a/src/Runtime/Source/Runtime/Include/UICAnimationSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSAnimationSystem.h
diff --git a/src/Runtime/Source/Runtime/Include/UICApplication.h b/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h
index f1490382..39255a67 100644
--- a/src/Runtime/Source/Runtime/Include/UICApplication.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSApplication.h
@@ -34,8 +34,8 @@
 #include "EASTL/string.h"
 #include "foundation/Qt3DSAllocator.h"
 #include "foundation/Utils.h"
-#include "UICKernelTypes.h"
-#include "UICMetadata.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSMetadata.h"
 
 namespace Q3DStudio {
 class IRuntimeFactory;
diff --git a/src/Runtime/Source/Runtime/Include/UICApplicationValues.h b/src/Runtime/Source/Runtime/Include/Qt3DSApplicationValues.h
index 987d6e4b..3c03d98b 100644
--- a/src/Runtime/Source/Runtime/Include/UICApplicationValues.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSApplicationValues.h
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/
 #pragma once
-#include "UICApplication.h"
+#include "Qt3DSApplication.h"
 #include "foundation/Qt3DSDiscriminatedUnion.h"
 #include "foundation/StringTable.h"
 
diff --git a/src/Runtime/Source/Runtime/Include/UICAttributeHashes.h b/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.h
index 7dbfdc7f..7dbfdc7f 100644
--- a/src/Runtime/Source/Runtime/Include/UICAttributeHashes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.h
diff --git a/src/Runtime/Source/Runtime/Include/UICAttributeHashes.txt b/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.txt
index 7db4fe51..7db4fe51 100644
--- a/src/Runtime/Source/Runtime/Include/UICAttributeHashes.txt
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSAttributeHashes.txt
diff --git a/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h
index a6b3531c..a6b3531c 100644
--- a/src/Runtime/Source/Runtime/Include/UICBinarySerializationHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializationHelper.h
diff --git a/src/Runtime/Source/Runtime/Include/UICBinarySerializer.h b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializer.h
index d999aa26..d999aa26 100644
--- a/src/Runtime/Source/Runtime/Include/UICBinarySerializer.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializer.h
diff --git a/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializerImpl.h
index ac359439..0d58ae20 100644
--- a/src/Runtime/Source/Runtime/Include/UICBinarySerializerImpl.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSBinarySerializerImpl.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICBinarySerializer.h"
+#include "Qt3DSBinarySerializer.h"
 #include "foundation/Qt3DSFoundation.h"
 
 namespace qt3ds {
diff --git a/src/Runtime/Source/Runtime/Include/UICCommandEventTypes.h b/src/Runtime/Source/Runtime/Include/Qt3DSCommandEventTypes.h
index 514a8430..01a12b44 100644
--- a/src/Runtime/Source/Runtime/Include/UICCommandEventTypes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSCommandEventTypes.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICHash.h"
+#include "Qt3DSHash.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICComponentManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSComponentManager.h
index b78be6d7..865b8aa9 100644
--- a/src/Runtime/Source/Runtime/Include/UICComponentManager.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSComponentManager.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICIComponentManager.h"
+#include "Qt3DSIComponentManager.h"
 #include "EASTL/hash_map.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Include/UICElementSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
index a894a49e..93cf0f5c 100644
--- a/src/Runtime/Source/Runtime/Include/UICElementSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSElementSystem.h
@@ -36,13 +36,13 @@
 #include "foundation/Qt3DSAllocator.h"
 #include "foundation/Utils.h"
 #include "foundation/StringTable.h"
-#include "UICKernelTypes.h"
+#include "Qt3DSKernelTypes.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/Qt3DSOption.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSInvasiveSet.h"
-#include "UICMetadata.h"
+#include "Qt3DSMetadata.h"
 
 // The uic runtime element system contains the element graph and the data in the element
 // graph.
diff --git a/src/Runtime/Source/Runtime/Include/UICEvent.h b/src/Runtime/Source/Runtime/Include/Qt3DSEvent.h
index 269549e4..aef317a5 100644
--- a/src/Runtime/Source/Runtime/Include/UICEvent.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSEvent.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICKernelTypes.h"
-#include "UICElementSystem.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSElementSystem.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICEventCallbacks.h b/src/Runtime/Source/Runtime/Include/Qt3DSEventCallbacks.h
index 4a54f9bf..5c17477d 100644
--- a/src/Runtime/Source/Runtime/Include/UICEventCallbacks.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSEventCallbacks.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "UICEvent.h"
-#include "UICMemory.h"
+#include "Qt3DSEvent.h"
+#include "Qt3DSMemory.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICFrameworkTypes.h b/src/Runtime/Source/Runtime/Include/Qt3DSFrameworkTypes.h
index a22812d2..8cb5c3b8 100644
--- a/src/Runtime/Source/Runtime/Include/UICFrameworkTypes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSFrameworkTypes.h
@@ -33,12 +33,12 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTypes.h"
-#include "UICArray.h"
-#include "UICVector3.h"
-#include "UICMatrix.h"
-#include "UICBoundingBox.h"
-#include "UICKernelTypes.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSArray.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSBoundingBox.h"
+#include "Qt3DSKernelTypes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICIComponentManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSIComponentManager.h
index 831fd86a..8185da2d 100644
--- a/src/Runtime/Source/Runtime/Include/UICIComponentManager.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIComponentManager.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICTimePolicy.h"
+#include "Qt3DSTimePolicy.h"
 #include "foundation/Qt3DSOption.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Include/UICIInputSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSIInputSystem.h
index 0d75bd8f..0d75bd8f 100644
--- a/src/Runtime/Source/Runtime/Include/UICIInputSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIInputSystem.h
diff --git a/src/Runtime/Source/Runtime/Include/UICIScene.h b/src/Runtime/Source/Runtime/Include/Qt3DSIScene.h
index a7040a0c..8872b93f 100644
--- a/src/Runtime/Source/Runtime/Include/UICIScene.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIScene.h
@@ -33,7 +33,7 @@
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/StringTable.h"
 #include "foundation/Qt3DSBounds3.h"
-#include "UICBoundingBox.h"
+#include "Qt3DSBoundingBox.h"
 namespace qt3ds {
 namespace render {
     class IImageLoadListener;
diff --git a/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h b/src/Runtime/Source/Runtime/Include/Qt3DSIScriptBridge.h
index d1b424ea..55372660 100644
--- a/src/Runtime/Source/Runtime/Include/UICIScriptBridge.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIScriptBridge.h
@@ -29,10 +29,10 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICIComponentManager.h"
+#include "Qt3DSIComponentManager.h"
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 #include "foundation/Qt3DSRefCounted.h"
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICIStateful.h b/src/Runtime/Source/Runtime/Include/Qt3DSIStateful.h
index d18a9534..0eca293e 100644
--- a/src/Runtime/Source/Runtime/Include/UICIStateful.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIStateful.h
@@ -32,7 +32,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICArray.h"
+#include "Qt3DSArray.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICIText.h b/src/Runtime/Source/Runtime/Include/Qt3DSIText.h
index c4694fe2..c4694fe2 100644
--- a/src/Runtime/Source/Runtime/Include/UICIText.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSIText.h
diff --git a/src/Runtime/Source/Runtime/Include/UICInputDefs.h b/src/Runtime/Source/Runtime/Include/Qt3DSInputDefs.h
index 447e424b..447e424b 100644
--- a/src/Runtime/Source/Runtime/Include/UICInputDefs.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSInputDefs.h
diff --git a/src/Runtime/Source/Runtime/Include/UICInputEngine.h b/src/Runtime/Source/Runtime/Include/Qt3DSInputEngine.h
index 55aaaf29..bf75e5a1 100644
--- a/src/Runtime/Source/Runtime/Include/UICInputEngine.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSInputEngine.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICKernelTypes.h"
-#include "UICPickFrame.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSPickFrame.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "EASTL/vector.h"
 #include "foundation/Qt3DSDataRef.h"
diff --git a/src/Runtime/Source/Runtime/Include/UICInputEventTypes.h b/src/Runtime/Source/Runtime/Include/Qt3DSInputEventTypes.h
index bdf6a03a..0b3c3981 100644
--- a/src/Runtime/Source/Runtime/Include/UICInputEventTypes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSInputEventTypes.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICHash.h"
+#include "Qt3DSHash.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICInputFrame.h b/src/Runtime/Source/Runtime/Include/Qt3DSInputFrame.h
index be44cad8..f80f3ebc 100644
--- a/src/Runtime/Source/Runtime/Include/UICInputFrame.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSInputFrame.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICPlatformSpecific.h"
-#include "UICInputDefs.h"
+#include "Qt3DSPlatformSpecific.h"
+#include "Qt3DSInputDefs.h"
 
 #include <EASTL/map.h>
 
diff --git a/src/Runtime/Source/Runtime/Include/UICKernelTypes.h b/src/Runtime/Source/Runtime/Include/Qt3DSKernelTypes.h
index 1ae1bdf6..7f44a161 100644
--- a/src/Runtime/Source/Runtime/Include/UICKernelTypes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSKernelTypes.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICArray.h"
+#include "Qt3DSArray.h"
 
 namespace qt3ds {
 namespace runtime {
diff --git a/src/Runtime/Source/Runtime/Include/UICLogicSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h
index cb72f547..24709d63 100644
--- a/src/Runtime/Source/Runtime/Include/UICLogicSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLogicSystem.h
@@ -30,7 +30,7 @@
 #pragma once
 #ifndef UIC_LOGIC_SYSTEM_H
 #define UIC_LOGIC_SYSTEM_H
-#include "UICElementSystem.h"
+#include "Qt3DSElementSystem.h"
 
 namespace qt3ds {
 namespace runtime {
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaAxis.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaAxis.h
index 829e2df6..5c812b01 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaAxis.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaAxis.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaButton.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaButton.h
index 765842d9..bc0db2d7 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaButton.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaButton.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaColor.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaColor.h
index 53b98b6a..c2b3353f 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaColor.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaColor.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaCommandHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaCommandHelper.h
index 397b136d..6437e2ea 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaCommandHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaCommandHelper.h
@@ -33,9 +33,9 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
-#include "UICIComponentManager.h"
-#include "UICLuaEngine.h"
+#include "Qt3DSLuaIncludes.h"
+#include "Qt3DSIComponentManager.h"
+#include "Qt3DSLuaEngine.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaElementHelper.h
index 71ef5aad..9f090403 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaElementHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaElementHelper.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 namespace qt3ds {
 namespace runtime {
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaEngine.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaEngine.h
index 2d701ccc..c9c67930 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaEngine.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaEngine.h
@@ -33,18 +33,18 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Studio Includes
 //==============================================================================
-#include "UICIScriptBridge.h"
+#include "Qt3DSIScriptBridge.h"
 #include "EASTL/map.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSPool.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICIComponentManager.h"
+#include "Qt3DSIComponentManager.h"
 #include "foundation/Qt3DSSync.h"
 #include "foundation/Qt3DSMutex.h"
 
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaEventHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaEventHelper.h
index 6bf077bd..f19c0a5a 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaEventHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaEventHelper.h
@@ -33,13 +33,13 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Studio Includes
 //==============================================================================
-#include "UICLuaEngine.h"
-#include "UICEvent.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSEvent.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaHelper.h
index f7c954d0..6e708d9d 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaHelper.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 namespace qt3ds {
 namespace foundation {
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaIncludes.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaIncludes.h
index d50e6e53..d50e6e53 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaIncludes.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaIncludes.h
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaKeyboard.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaKeyboard.h
index c939849d..899e1832 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaKeyboard.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaKeyboard.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaMatrix.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaMatrix.h
index b12eae03..2863335a 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaMatrix.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaMatrix.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaRotation.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaRotation.h
index 78601e2c..91ef7ae4 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaRotation.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaRotation.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaSceneHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaSceneHelper.h
index 257ae076..14d6673a 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaSceneHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaSceneHelper.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICLuaVector.h b/src/Runtime/Source/Runtime/Include/Qt3DSLuaVector.h
index e35c0be1..2d525d1b 100644
--- a/src/Runtime/Source/Runtime/Include/UICLuaVector.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSLuaVector.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Lua Includes
 //==============================================================================
-#include "UICLuaIncludes.h"
+#include "Qt3DSLuaIncludes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICOutputMemoryStream.h b/src/Runtime/Source/Runtime/Include/Qt3DSOutputMemoryStream.h
index 462ed5f7..da28245f 100644
--- a/src/Runtime/Source/Runtime/Include/UICOutputMemoryStream.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSOutputMemoryStream.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICHash.h"
+#include "Qt3DSHash.h"
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable : 4820) // X bytes padding added after data member
diff --git a/src/Runtime/Source/Runtime/Include/UICParametersSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h
index a6b08de8..97c160c9 100644
--- a/src/Runtime/Source/Runtime/Include/UICParametersSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSParametersSystem.h
@@ -30,7 +30,7 @@
 #ifndef UIC_PARAMETERS_SYSTEM_H
 #define UIC_PARAMETERS_SYSTEM_H
 #pragma once
-#include "UICKernelTypes.h"
+#include "Qt3DSKernelTypes.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "EASTL/utility.h"
 #include "foundation/Qt3DSFoundation.h"
diff --git a/src/Runtime/Source/Runtime/Include/UICPickFrame.h b/src/Runtime/Source/Runtime/Include/Qt3DSPickFrame.h
index 9019bc39..15da72c9 100644
--- a/src/Runtime/Source/Runtime/Include/UICPickFrame.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSPickFrame.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICInputFrame.h"
+#include "Qt3DSInputFrame.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICPresentation.h b/src/Runtime/Source/Runtime/Include/Qt3DSPresentation.h
index ad1e51d7..ca7c003f 100644
--- a/src/Runtime/Source/Runtime/Include/UICPresentation.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSPresentation.h
@@ -34,15 +34,15 @@
 //	Includes
 //==============================================================================
 #include "RuntimePrefix.h"
-#include "UICIPresentation.h"
-#include "UICPresentationFrameData.h"
-#include "UICAnimationSystem.h"
-#include "UICCircularArray.h"
-#include "UICEventCallbacks.h"
-#include "UICTimePolicy.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSPresentationFrameData.h"
+#include "Qt3DSAnimationSystem.h"
+#include "Qt3DSCircularArray.h"
+#include "Qt3DSEventCallbacks.h"
+#include "Qt3DSTimePolicy.h"
 #include "EASTL/hash_map.h"
 #include "foundation/StringTable.h"
-#include "UICComponentManager.h"
+#include "Qt3DSComponentManager.h"
 
 #include <QObject>
 
diff --git a/src/Runtime/Source/Runtime/Include/UICPresentationFrameData.h b/src/Runtime/Source/Runtime/Include/Qt3DSPresentationFrameData.h
index 332cc84a..332cc84a 100644
--- a/src/Runtime/Source/Runtime/Include/UICPresentationFrameData.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSPresentationFrameData.h
diff --git a/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h b/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
index c2c07d9b..3e635764 100644
--- a/src/Runtime/Source/Runtime/Include/UICQmlElementHelper.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSQmlElementHelper.h
@@ -31,9 +31,9 @@
 #ifndef UICQMLELEMENTHELPER_H
 #define UICQMLELEMENTHELPER_H
 
-#include "UICApplication.h"
-#include "UICPresentation.h"
-#include "UICKernelTypes.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSKernelTypes.h"
 
 namespace Q3DStudio {
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Include/UICQmlEngine.h b/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h
index a0fa4a46..76c12203 100644
--- a/src/Runtime/Source/Runtime/Include/UICQmlEngine.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSQmlEngine.h
@@ -32,15 +32,15 @@
 #ifndef UIC_QML_ENGINE_H
 #define UIC_QML_ENGINE_H
 
-#include "UICIScriptBridge.h"
-#include "UICIComponentManager.h"
+#include "Qt3DSIScriptBridge.h"
+#include "Qt3DSIComponentManager.h"
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
 #include "foundation/Qt3DSRefCounted.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSSync.h"
 #include "foundation/Qt3DSMutex.h"
-#include "UICTimer.h"
+#include "Qt3DSTimer.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h b/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
index b127abcb..0a017d22 100644
--- a/src/Runtime/Source/Runtime/Include/UICRuntimeFactory.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSRuntimeFactory.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTimer.h"
+#include "Qt3DSTimer.h"
 #include "foundation/Qt3DSRefCounted.h"
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/Runtime/Include/UICSceneManager.h b/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
index 52047ae5..0e40db9e 100644
--- a/src/Runtime/Source/Runtime/Include/UICSceneManager.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSSceneManager.h
@@ -33,11 +33,11 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICPickFrame.h"
-#include "UICIStateful.h"
+#include "Qt3DSPickFrame.h"
+#include "Qt3DSIStateful.h"
 #include "foundation/Qt3DSDataRef.h"
 #include "foundation/Qt3DSRefCounted.h"
-#include "UICIScene.h"
+#include "Qt3DSIScene.h"
 
 namespace qt3ds {
 namespace foundation {
diff --git a/src/Runtime/Source/Runtime/Include/UICSlideSystem.h b/src/Runtime/Source/Runtime/Include/Qt3DSSlideSystem.h
index 64d43419..29035b1e 100644
--- a/src/Runtime/Source/Runtime/Include/UICSlideSystem.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSSlideSystem.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "UICElementSystem.h"
+#include "Qt3DSElementSystem.h"
 
 namespace Q3DStudio {
 class ILogicManager;
diff --git a/src/Runtime/Source/Runtime/Include/UICTimePolicy.h b/src/Runtime/Source/Runtime/Include/Qt3DSTimePolicy.h
index 6a137196..6a137196 100644
--- a/src/Runtime/Source/Runtime/Include/UICTimePolicy.h
+++ b/src/Runtime/Source/Runtime/Include/Qt3DSTimePolicy.h
diff --git a/src/Runtime/Source/Runtime/Include/RuntimePrefix.h b/src/Runtime/Source/Runtime/Include/RuntimePrefix.h
index 4d6baf28..9d80fb35 100644
--- a/src/Runtime/Source/Runtime/Include/RuntimePrefix.h
+++ b/src/Runtime/Source/Runtime/Include/RuntimePrefix.h
@@ -85,21 +85,21 @@
 //==============================================================================
 //	ROOT INCLUDES FOR FRAMEWORK
 //==============================================================================
-#include "UICTypes.h"
-#include "UICPlatformSpecific.h"
-#include "UICAssert.h"
-#include "UICMacros.h"
-#include "UICConfig.h"
-#include "UICMemorySettings.h"
-#include "UICMemory.h"
-#include "UICFrameworkTypes.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSPlatformSpecific.h"
+#include "Qt3DSAssert.h"
+#include "Qt3DSMacros.h"
+#include "Qt3DSConfig.h"
+#include "Qt3DSMemorySettings.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSFrameworkTypes.h"
 
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTimer.h"
-#include "UICIScene.h"
-#include "UICSyncPrimitive.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSIScene.h"
+#include "Qt3DSSyncPrimitive.h"
 #include "foundation/Qt3DSRefCounted.h" //scoped releasable auto ptr.
 #include "EASTL/hash_map.h"
 #include "EASTL/string.h"
diff --git a/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h b/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h
index 9c2f6b84..bde0cfad 100644
--- a/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h
+++ b/src/Runtime/Source/Runtime/Include/q3dsqmlscript.h
@@ -37,9 +37,9 @@
 #include <QtGui/qvector3d.h>
 #include <QtGui/qmatrix4x4.h>
 
-#include "UICTypes.h"
-#include "UICKernelTypes.h"
-#include "UICEvent.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSKernelTypes.h"
+#include "Qt3DSEvent.h"
 
 namespace Q3DStudio {
 class CQmlEngine;
diff --git a/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSActivationManager.cpp
index 0fa4c57f..3d052742 100644
--- a/src/Runtime/Source/Runtime/Source/UICActivationManager.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSActivationManager.cpp
@@ -28,9 +28,9 @@
 **
 ****************************************************************************/
 #include "RuntimePrefix.h"
-#include "UICActivationManager.h"
-#include "UICElementSystem.h"
-#include "UICComponentManager.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSComponentManager.h"
 #include "foundation/Qt3DSFlags.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSInvasiveSet.h"
@@ -39,12 +39,12 @@
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/StringTable.h"
 #include "EASTL/sort.h"
-#include "UICAttributeHashes.h"
-#include "UICPresentation.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSPresentation.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/Qt3DSMutex.h"
 #include "foundation/Qt3DSSync.h"
-#include "UICRenderThreadPool.h"
+#include "Qt3DSRenderThreadPool.h"
 
 using namespace qt3ds::runtime;
 using namespace qt3ds::runtime::element;
diff --git a/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSAnimationSystem.cpp
index 0174a1c7..10588e43 100644
--- a/src/Runtime/Source/Runtime/Source/UICAnimationSystem.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSAnimationSystem.cpp
@@ -28,23 +28,23 @@
 **
 ****************************************************************************/
 #include "RuntimePrefix.h"
-#include "UICTypes.h"
-#include "UICAnimationSystem.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSAnimationSystem.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSInvasiveSet.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSPool.h"
-#include "UICElementSystem.h"
-#include "UICCubicRoots.h"
-#include "UICBezierEval.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSCubicRoots.h"
+#include "Qt3DSBezierEval.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/IOStreams.h"
 #include "EASTL/sort.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSIndexableLinkedList.h"
-#include "UICBinarySerializationHelper.h"
+#include "Qt3DSBinarySerializationHelper.h"
 
 using namespace qt3ds::runtime;
 using namespace qt3ds::runtime::element;
diff --git a/src/Runtime/Source/Runtime/Source/UICApplication.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
index 668e70c3..4bfae02b 100644
--- a/src/Runtime/Source/Runtime/Source/UICApplication.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
@@ -34,52 +34,52 @@
 #include <QImage>
 
 #include "RuntimePrefix.h"
-#include "UICApplication.h"
-#include "UICApplicationValues.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSApplicationValues.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICMemory.h"
-#include "UICRuntimeFactory.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSRuntimeFactory.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/FileTools.h"
-#include "UICIScriptBridge.h"
+#include "Qt3DSIScriptBridge.h"
 #include "foundation/Qt3DSOption.h"
 #include "foundation/XML.h"
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSContainers.h"
 #include "EASTL/hash_map.h"
-#include "UICPresentation.h"
-#include "UICInputEventTypes.h"
-#include "UICSceneManager.h"
-#include "UICIScene.h"
-#include "UICInputEngine.h"
-#include "UICStateVisualBindingContext.h"
-#include "UICMetadata.h"
-#include "UICUIPParser.h"
-#include "UICBinarySerializer.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEventTypes.h"
+#include "Qt3DSSceneManager.h"
+#include "Qt3DSIScene.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSStateVisualBindingContext.h"
+#include "Qt3DSMetadata.h"
+#include "Qt3DSUIPParser.h"
+#include "Qt3DSBinarySerializer.h"
 #include "foundation/Socket.h"
-#include "UICStateDebugStreams.h"
-#include "UICSceneGraphDebugger.h"
-#include "UICSceneGraphDebuggerValue.h"
+#include "Qt3DSStateDebugStreams.h"
+#include "Qt3DSSceneGraphDebugger.h"
+#include "Qt3DSSceneGraphDebuggerValue.h"
 #include "EventPollingSystem.h"
-#include "UICRenderContext.h"
+#include "Qt3DSRenderContextCore.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/SerializationTypes.h"
 #include "EASTL/sort.h"
-#include "UICRenderBufferLoader.h"
+#include "Qt3DSRenderBufferLoader.h"
 #include "foundation/Qt3DSMutex.h"
 #include "foundation/Qt3DSSync.h"
-#include "UICTextRenderer.h"
-#include "UICRenderThreadPool.h"
+#include "Qt3DSTextRenderer.h"
+#include "Qt3DSRenderThreadPool.h"
 #include "foundation/StringConversionImpl.h"
-#include "UICRenderLoadedTexture.h"
+#include "Qt3DSRenderLoadedTexture.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICActivationManager.h"
-#include "UICRenderer.h"
-#include "UICRenderShaderCache.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICAudioPlayer.h"
-#include "UICElementSystem.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSRenderer.h"
+#include "Qt3DSRenderShaderCache.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSAudioPlayer.h"
+#include "Qt3DSElementSystem.h"
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qpair.h>
 
diff --git a/src/Runtime/Source/Runtime/Source/UICAttributeHashes.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSAttributeHashes.cpp
index 5b9b09da..ded93d1d 100644
--- a/src/Runtime/Source/Runtime/Source/UICAttributeHashes.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSAttributeHashes.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //    Includes
 //==============================================================================
-#include "UICAttributeHashes.h"
+#include "Qt3DSAttributeHashes.h"
 
 //==============================================================================
 //    Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSBinarySerializerImpl.cpp
index 7e3eae1e..0c169666 100644
--- a/src/Runtime/Source/Runtime/Source/UICBinarySerializerImpl.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSBinarySerializerImpl.cpp
@@ -33,28 +33,28 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICBinarySerializerImpl.h"
-#include "UICIPresentation.h"
-#include "UICPresentation.h"
-#include "UICIScriptBridge.h"
-#include "UICAttributeHashes.h"
-#include "UICFileStream.h"
+#include "Qt3DSBinarySerializerImpl.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSIScriptBridge.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSFileStream.h"
 #include "foundation/IOStreams.h"
-#include "UICCommandEventTypes.h"
-#include "UICSceneManager.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSSceneManager.h"
 #include "EASTL/vector.h"
 #include "EASTL/string.h"
 #include "foundation/FileTools.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
 #include "foundation/Qt3DSPerfTimer.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/Qt3DSMutex.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICSlideSystem.h"
-#include "UICLogicSystem.h"
-#include "UICParametersSystem.h"
+#include "Qt3DSSlideSystem.h"
+#include "Qt3DSLogicSystem.h"
+#include "Qt3DSParametersSystem.h"
 
 using qt3ds::foundation::atomicIncrement;
 using qt3ds::foundation::atomicDecrement;
diff --git a/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSComponentManager.cpp
index 02e4c411..2cfb2311 100644
--- a/src/Runtime/Source/Runtime/Source/UICComponentManager.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSComponentManager.cpp
@@ -33,14 +33,14 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICComponentManager.h"
-#include "UICIPresentation.h"
-#include "UICSlideSystem.h"
-#include "UICCommandEventTypes.h"
-#include "UICPresentationFrameData.h"
-#include "UICApplication.h"
-#include "UICActivationManager.h"
-#include "UICPresentation.h"
+#include "Qt3DSComponentManager.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSSlideSystem.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSPresentationFrameData.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSPresentation.h"
 
 using qt3ds::runtime::SSlideKey;
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSElementSystem.cpp
index 8f7d9175..549a5ce8 100644
--- a/src/Runtime/Source/Runtime/Source/UICElementSystem.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSElementSystem.cpp
@@ -28,22 +28,22 @@
 **
 ****************************************************************************/
 #include "RuntimePrefix.h"
-#include "UICElementSystem.h"
+#include "Qt3DSElementSystem.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSPool.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/AutoDeallocatorAllocator.h"
 #include "EASTL/sort.h"
 #include "foundation/Qt3DSIntrinsics.h"
-#include "UICHash.h"
-#include "UICActivationManager.h"
-#include "UICIPresentation.h"
-#include "UICPresentationFrameData.h"
-#include "UICAttributeHashes.h"
+#include "Qt3DSHash.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSPresentationFrameData.h"
+#include "Qt3DSAttributeHashes.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/IOStreams.h"
 #include "foundation/Qt3DSIndexableLinkedList.h"
-#include "UICBinarySerializationHelper.h"
+#include "Qt3DSBinarySerializationHelper.h"
 
 using namespace qt3ds::runtime::element;
 using namespace qt3ds;
diff --git a/src/Runtime/Source/Runtime/Source/UICEventCallbacks.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSEventCallbacks.cpp
index 2f97bf91..25d720ea 100644
--- a/src/Runtime/Source/Runtime/Source/UICEventCallbacks.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSEventCallbacks.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICEventCallbacks.h"
+#include "Qt3DSEventCallbacks.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
index b1e275a6..38f9631f 100644
--- a/src/Runtime/Source/Runtime/Source/UICInputEngine.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSInputEngine.cpp
@@ -33,12 +33,12 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICInputEngine.h"
-#include "UICSceneManager.h"
-#include "UICInputEventTypes.h"
-#include "UICPresentation.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSSceneManager.h"
+#include "Qt3DSInputEventTypes.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
 #include "EventPollingSystem.h"
 #include "foundation/Qt3DSAssert.h"
 
diff --git a/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLogicSystem.cpp
index cfb0f882..1aec08f1 100644
--- a/src/Runtime/Source/Runtime/Source/UICLogicSystem.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLogicSystem.cpp
@@ -28,14 +28,14 @@
 **
 ****************************************************************************/
 #include "RuntimePrefix.h"
-#include "UICLogicSystem.h"
+#include "Qt3DSLogicSystem.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSPool.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICIPresentation.h"
-#include "UICApplication.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSApplication.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/IOStreams.h"
 
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaAxis.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaAxis.cpp
index 559874f1..8b82538c 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaAxis.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaAxis.cpp
@@ -32,10 +32,10 @@
 //	Includes
 //==============================================================================
 #include "RuntimePrefix.h"
-#include "UICInputFrame.h"
-#include "UICLuaAxis.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
+#include "Qt3DSInputFrame.h"
+#include "Qt3DSLuaAxis.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaButton.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaButton.cpp
index ce77a105..6dc85836 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaButton.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaButton.cpp
@@ -32,10 +32,10 @@
 //	Includes
 //==============================================================================
 #include "RuntimePrefix.h"
-#include "UICInputFrame.h"
-#include "UICLuaButton.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
+#include "Qt3DSInputFrame.h"
+#include "Qt3DSLuaButton.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaColor.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaColor.cpp
index 91a2562e..bded72db 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaColor.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaColor.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaColor.h"
-#include "UICColor.h"
+#include "Qt3DSLuaColor.h"
+#include "Qt3DSColor.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaCommandHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaCommandHelper.cpp
index ae42d9c3..e16e94a5 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaCommandHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaCommandHelper.cpp
@@ -33,13 +33,13 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaCommandHelper.h"
-#include "UICCommandEventTypes.h"
-#include "UICPresentation.h"
-#include "UICDataLogger.h"
-#include "UICApplication.h"
-#include "UICElementSystem.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSLuaCommandHelper.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSSlideSystem.h"
 
 //==============================================================================
 // Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaElementHelper.cpp
index 386d30b6..45909846 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaElementHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaElementHelper.cpp
@@ -33,17 +33,17 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaElementHelper.h"
-#include "UICLuaCommandHelper.h"
-#include "UICLuaEngine.h"
-#include "UICPresentation.h"
-#include "UICAttributeHashes.h"
-#include "UICApplication.h"
-#include "UICCommandEventTypes.h"
-#include "UICRuntimeFactory.h"
-#include "UICElementSystem.h"
-
-#include "UICDataLogger.h"
+#include "Qt3DSLuaElementHelper.h"
+#include "Qt3DSLuaCommandHelper.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSRuntimeFactory.h"
+#include "Qt3DSElementSystem.h"
+
+#include "Qt3DSDataLogger.h"
 
 using namespace qt3ds;
 
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp
index 58f22811..fa657d83 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaEngine.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEngine.cpp
@@ -33,53 +33,53 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaEngine.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
-#include "UICSceneManager.h"
-#include "UICVector3.h"
-#include "UICColor.h"
-#include "UICLuaElementHelper.h"
-#include "UICLuaEventHelper.h"
-#include "UICLuaCommandHelper.h"
-#include "UICLuaSceneHelper.h"
-#include "UICLuaVector.h"
-#include "UICLuaColor.h"
-#include "UICLuaRotation.h"
-#include "UICLuaMatrix.h"
-#include "UICAttributeHashes.h"
-#include "UICFileStream.h"
-#include "UICDataLogger.h"
-#include "UICLuaKeyboard.h"
-#include "UICLuaButton.h"
-#include "UICLuaAxis.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSSceneManager.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSColor.h"
+#include "Qt3DSLuaElementHelper.h"
+#include "Qt3DSLuaEventHelper.h"
+#include "Qt3DSLuaCommandHelper.h"
+#include "Qt3DSLuaSceneHelper.h"
+#include "Qt3DSLuaVector.h"
+#include "Qt3DSLuaColor.h"
+#include "Qt3DSLuaRotation.h"
+#include "Qt3DSLuaMatrix.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSFileStream.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSLuaKeyboard.h"
+#include "Qt3DSLuaButton.h"
+#include "Qt3DSLuaAxis.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSSystem.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICStateLuaScriptContext.h"
-#include "UICStateDebugger.h"
+#include "Qt3DSStateLuaScriptContext.h"
+#include "Qt3DSStateDebugger.h"
 #include "EventPollingSystemLuaBinding.h"
-#include "UICRenderBufferLoader.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSRenderBufferLoader.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 
 #include "EASTL/vector.h"
 #include <sys/stat.h>
-#include "UICCommandEventTypes.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
-#include "UICStateDebugStreams.h"
-#include "UICRenderContext.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
+#include "Qt3DSStateDebugStreams.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/Qt3DSPerfTimer.h"
-#include "UICLuaDebugger.h"
-#include "UICRenderThreadPool.h"
-#include "UICRenderImageBatchLoader.h"
+#include "Qt3DSLuaDebugger.h"
+#include "Qt3DSRenderThreadPool.h"
+#include "Qt3DSRenderImageBatchLoader.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICAudioPlayer.h"
-#include "UICActivationManager.h"
-#include "UICParametersSystem.h"
+#include "Qt3DSAudioPlayer.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSParametersSystem.h"
 
 #include <QtCore/QFileInfo>
 
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEventHelper.cpp
index 04317933..b8a7ac12 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaEventHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaEventHelper.cpp
@@ -33,12 +33,12 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaEventHelper.h"
-#include "UICLuaHelper.h"
-#include "UICLuaEngine.h"
-#include "UICPresentation.h"
-#include "UICDataLogger.h"
-#include "UICHash.h"
+#include "Qt3DSLuaEventHelper.h"
+#include "Qt3DSLuaHelper.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSHash.h"
 
 //==============================================================================
 // Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaHelper.cpp
index a66d1679..518101e5 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaHelper.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaHelper.h"
-#include "UICApplication.h"
+#include "Qt3DSLuaHelper.h"
+#include "Qt3DSApplication.h"
 #include "foundation/Qt3DSLogging.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaKeyboard.cpp
index 9faa8959..04db6e20 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaKeyboard.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaKeyboard.cpp
@@ -32,12 +32,12 @@
 //	Includes
 //==============================================================================
 #include "RuntimePrefix.h"
-#include "UICLuaEngine.h"
-#include "UICInputFrame.h"
-#include "UICLuaKeyboard.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
-#include "UICApplication.h"
+#include "Qt3DSLuaEngine.h"
+#include "Qt3DSInputFrame.h"
+#include "Qt3DSLuaKeyboard.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSApplication.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaMatrix.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaMatrix.cpp
index a1204d11..b2e6b28c 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaMatrix.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaMatrix.cpp
@@ -33,11 +33,11 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaMatrix.h"
-#include "UICMatrix.h"
-#include "UICVector3.h"
-#include "UICLuaVector.h"
-#include "UICDataLogger.h"
+#include "Qt3DSLuaMatrix.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSLuaVector.h"
+#include "Qt3DSDataLogger.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaRotation.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaRotation.cpp
index 2c691f71..64a8f37b 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaRotation.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaRotation.cpp
@@ -33,9 +33,9 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaRotation.h"
-#include "UICLuaVector.h"
-#include "UICVector3.h"
+#include "Qt3DSLuaRotation.h"
+#include "Qt3DSLuaVector.h"
+#include "Qt3DSVector3.h"
 #include <math.h>
 
 //==============================================================================
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaSceneHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaSceneHelper.cpp
index 447361c1..451898ed 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaSceneHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaSceneHelper.cpp
@@ -33,17 +33,17 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaSceneHelper.h"
-#include "UICPresentation.h"
-#include "UICAttributeHashes.h"
-#include "UICIScene.h"
-#include "UICLuaVector.h"
-#include "UICLuaMatrix.h"
-#include "UICBoundingBox.h"
-#include "UICMatrix.h"
-#include "UICVector3.h"
-
-#include "UICDataLogger.h"
+#include "Qt3DSLuaSceneHelper.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSIScene.h"
+#include "Qt3DSLuaVector.h"
+#include "Qt3DSLuaMatrix.h"
+#include "Qt3DSBoundingBox.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSVector3.h"
+
+#include "Qt3DSDataLogger.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICLuaVector.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSLuaVector.cpp
index 1e1a0835..43b00330 100644
--- a/src/Runtime/Source/Runtime/Source/UICLuaVector.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSLuaVector.cpp
@@ -33,10 +33,10 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICLuaVector.h"
-#include "UICVector3.h"
-#include "UICLuaMatrix.h"
-#include "UICDataLogger.h"
+#include "Qt3DSLuaVector.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSLuaMatrix.h"
+#include "Qt3DSDataLogger.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICOutputMemoryStream.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp
index 3e750c31..06d0eee6 100644
--- a/src/Runtime/Source/Runtime/Source/UICOutputMemoryStream.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSOutputMemoryStream.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICOutputMemoryStream.h"
-#include "UICHash.h"
+#include "Qt3DSOutputMemoryStream.h"
+#include "Qt3DSHash.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSParametersSystem.cpp
index 064345aa..00ee87c3 100644
--- a/src/Runtime/Source/Runtime/Source/UICParametersSystem.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSParametersSystem.cpp
@@ -29,13 +29,13 @@
 ****************************************************************************/
 
 #include "RuntimePrefix.h"
-#include "UICParametersSystem.h"
+#include "Qt3DSParametersSystem.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSIndexableLinkedList.h"
 #include "foundation/Qt3DSContainers.h"
 #include "foundation/SerializationTypes.h"
-#include "UICBinarySerializationHelper.h"
+#include "Qt3DSBinarySerializationHelper.h"
 #include "foundation/IOStreams.h"
 
 using namespace qt3ds::runtime;
diff --git a/src/Runtime/Source/Runtime/Source/UICPresentation.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
index 4db2e1e6..d6709267 100644
--- a/src/Runtime/Source/Runtime/Source/UICPresentation.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSPresentation.cpp
@@ -31,21 +31,21 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICPresentation.h"
-#include "UICCommandEventTypes.h"
-#include "UICIScriptBridge.h"
-#include "UICInputEventTypes.h"
-#include "UICDataLogger.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
-#include "UICLuaCommandHelper.h"
-#include "UICActivationManager.h"
-#include "UICRenderContext.h"
-#include "UICComponentManager.h"
-#include "UICRenderBufferLoader.h"
-#include "UICSlideSystem.h"
-#include "UICLogicSystem.h"
-#include "UICParametersSystem.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSIScriptBridge.h"
+#include "Qt3DSInputEventTypes.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
+#include "Qt3DSLuaCommandHelper.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSComponentManager.h"
+#include "Qt3DSRenderBufferLoader.h"
+#include "Qt3DSSlideSystem.h"
+#include "Qt3DSLogicSystem.h"
+#include "Qt3DSParametersSystem.h"
 
 //==============================================================================
 // Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICPresentationFrameData.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSPresentationFrameData.cpp
index bce1b55c..649462aa 100644
--- a/src/Runtime/Source/Runtime/Source/UICPresentationFrameData.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSPresentationFrameData.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICPresentationFrameData.h"
+#include "Qt3DSPresentationFrameData.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSQmlElementHelper.cpp
index d618c1a8..e43dff7d 100644
--- a/src/Runtime/Source/Runtime/Source/UICQmlElementHelper.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSQmlElementHelper.cpp
@@ -28,12 +28,12 @@
 **
 ****************************************************************************/
 
-#include "UICQmlElementHelper.h"
-#include "UICCommandEventTypes.h"
-#include "UICHash.h"
-#include "UICAttributeHashes.h"
-#include "UICElementSystem.h"
-#include "UICRuntimeFactory.h"
+#include "Qt3DSQmlElementHelper.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSHash.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSRuntimeFactory.h"
 
 using namespace Q3DStudio;
 using namespace qt3ds;
diff --git a/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSQmlEngine.cpp
index 623cfe1f..1c5667c5 100644
--- a/src/Runtime/Source/Runtime/Source/UICQmlEngine.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSQmlEngine.cpp
@@ -33,42 +33,42 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICQmlEngine.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
-#include "UICSceneManager.h"
-#include "UICVector3.h"
-#include "UICColor.h"
-#include "UICAttributeHashes.h"
-#include "UICFileStream.h"
-#include "UICDataLogger.h"
+#include "Qt3DSQmlEngine.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSSceneManager.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSColor.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSFileStream.h"
+#include "Qt3DSDataLogger.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "foundation/FileTools.h"
 #include "foundation/Qt3DSSystem.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICStateLuaScriptContext.h"
-#include "UICStateDebugger.h"
+#include "Qt3DSStateLuaScriptContext.h"
+#include "Qt3DSStateDebugger.h"
 #include "EventPollingSystemLuaBinding.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSSlideSystem.h"
 
 #include "EASTL/vector.h"
 #include "EASTL/list.h"
 #include <sys/stat.h>
-#include "UICCommandEventTypes.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
-#include "UICStateDebugStreams.h"
-#include "UICRenderContext.h"
-#include "UICRenderInputStreamFactory.h"
+#include "Qt3DSCommandEventTypes.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
+#include "Qt3DSStateDebugStreams.h"
+#include "Qt3DSRenderContextCore.h"
+#include "Qt3DSRenderInputStreamFactory.h"
 #include "foundation/Qt3DSPerfTimer.h"
-#include "UICRenderThreadPool.h"
-#include "UICRenderImageBatchLoader.h"
+#include "Qt3DSRenderThreadPool.h"
+#include "Qt3DSRenderImageBatchLoader.h"
 #include "foundation/Qt3DSAtomic.h"
-#include "UICAudioPlayer.h"
-#include "UICActivationManager.h"
-#include "UICParametersSystem.h"
-#include "UICQmlElementHelper.h"
+#include "Qt3DSAudioPlayer.h"
+#include "Qt3DSActivationManager.h"
+#include "Qt3DSParametersSystem.h"
+#include "Qt3DSQmlElementHelper.h"
 
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcontext.h>
diff --git a/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp
index 6e9c730a..9d0aac6f 100644
--- a/src/Runtime/Source/Runtime/Source/UICSlideSystem.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp
@@ -28,20 +28,20 @@
 **
 ****************************************************************************/
 #include "RuntimePrefix.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSSlideSystem.h"
 #include "foundation/Qt3DSInvasiveLinkedList.h"
 #include "foundation/Qt3DSPool.h"
 #include "foundation/Qt3DSAtomic.h"
 #include "foundation/Qt3DSFoundation.h"
 #include "foundation/Qt3DSBroadcastingAllocator.h"
-#include "UICAnimationSystem.h"
-#include "UICLogicSystem.h"
+#include "Qt3DSAnimationSystem.h"
+#include "Qt3DSLogicSystem.h"
 #include "foundation/SerializationTypes.h"
 #include "foundation/IOStreams.h"
-#include "UICHash.h"
-#include "UICTimePolicy.h"
+#include "Qt3DSHash.h"
+#include "Qt3DSTimePolicy.h"
 #include "foundation/Qt3DSIndexableLinkedList.h"
-#include "UICBinarySerializationHelper.h"
+#include "Qt3DSBinarySerializationHelper.h"
 
 using namespace qt3ds::runtime;
 using namespace qt3ds::runtime::element;
diff --git a/src/Runtime/Source/Runtime/Source/UICTimePolicy.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSTimePolicy.cpp
index a1764a63..e1efb8e0 100644
--- a/src/Runtime/Source/Runtime/Source/UICTimePolicy.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSTimePolicy.cpp
@@ -33,10 +33,10 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTimePolicy.h"
+#include "Qt3DSTimePolicy.h"
 #include "foundation/Qt3DSUnionCast.h"
 #include "foundation/Qt3DSIntrinsics.h"
-#include "UICComponentManager.h"
+#include "Qt3DSComponentManager.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp b/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp
index 54f7e9fa..92738d56 100644
--- a/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp
+++ b/src/Runtime/Source/Runtime/Source/q3dsqmlscript.cpp
@@ -29,14 +29,14 @@
 
 #include "q3dsqmlscript.h"
 
-#include "UICQmlEngine.h"
-#include "UICElementSystem.h"
-#include "UICApplication.h"
-#include "UICPresentation.h"
-#include "UICInputEngine.h"
-#include "UICInputFrame.h"
-#include "UICQmlElementHelper.h"
-#include "UICHash.h"
+#include "Qt3DSQmlEngine.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSPresentation.h"
+#include "Qt3DSInputEngine.h"
+#include "Qt3DSInputFrame.h"
+#include "Qt3DSQmlElementHelper.h"
+#include "Qt3DSHash.h"
 
 using namespace Q3DStudio;
 
diff --git a/src/Runtime/Source/System/Include/UICArray.h b/src/Runtime/Source/System/Include/Qt3DSArray.h
index 945c9ff3..805b8b0a 100644
--- a/src/Runtime/Source/System/Include/UICArray.h
+++ b/src/Runtime/Source/System/Include/Qt3DSArray.h
@@ -29,9 +29,9 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICMemorySettings.h"
-#include "UICMemory.h"
-#include "UICPlatformSpecific.h"
+#include "Qt3DSMemorySettings.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSPlatformSpecific.h"
 
 #ifdef WIN32
 #pragma warning(disable : 4625) // copy constructor could not be generated because a base class copy
@@ -132,4 +132,4 @@ private: // Disabled Copy Construction
 //==============================================================================
 //	Template code
 //==============================================================================
-#include "UICArray.inl"
+#include "Qt3DSArray.inl"
diff --git a/src/Runtime/Source/System/Include/UICArray.inl b/src/Runtime/Source/System/Include/Qt3DSArray.inl
index a9667fd2..a9667fd2 100644
--- a/src/Runtime/Source/System/Include/UICArray.inl
+++ b/src/Runtime/Source/System/Include/Qt3DSArray.inl
diff --git a/src/Runtime/Source/System/Include/UICAssert.h b/src/Runtime/Source/System/Include/Qt3DSAssert.h
index ae487564..a64ca7f6 100644
--- a/src/Runtime/Source/System/Include/UICAssert.h
+++ b/src/Runtime/Source/System/Include/Qt3DSAssert.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICAudioPlayer.h b/src/Runtime/Source/System/Include/Qt3DSAudioPlayer.h
index 3b6f3ef8..3b6f3ef8 100644
--- a/src/Runtime/Source/System/Include/UICAudioPlayer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSAudioPlayer.h
diff --git a/src/Runtime/Source/System/Include/UICBasicPluginDLL.h b/src/Runtime/Source/System/Include/Qt3DSBasicPluginDLL.h
index 63a2d1f6..63a2d1f6 100644
--- a/src/Runtime/Source/System/Include/UICBasicPluginDLL.h
+++ b/src/Runtime/Source/System/Include/Qt3DSBasicPluginDLL.h
diff --git a/src/Runtime/Source/System/Include/UICBezierEval.h b/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
index 252234b3..252234b3 100644
--- a/src/Runtime/Source/System/Include/UICBezierEval.h
+++ b/src/Runtime/Source/System/Include/Qt3DSBezierEval.h
diff --git a/src/Runtime/Source/System/Include/UICBoundingBox.h b/src/Runtime/Source/System/Include/Qt3DSBoundingBox.h
index b17dff3c..988a9ba8 100644
--- a/src/Runtime/Source/System/Include/UICBoundingBox.h
+++ b/src/Runtime/Source/System/Include/Qt3DSBoundingBox.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICVector3.h"
+#include "Qt3DSVector3.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICCircularArray.h b/src/Runtime/Source/System/Include/Qt3DSCircularArray.h
index 95062bc5..be921673 100644
--- a/src/Runtime/Source/System/Include/UICCircularArray.h
+++ b/src/Runtime/Source/System/Include/Qt3DSCircularArray.h
@@ -99,4 +99,4 @@ protected: // Internal methods
 //==============================================================================
 //	Template code
 //==============================================================================
-#include "UICCircularArray.inl"
+#include "Qt3DSCircularArray.inl"
diff --git a/src/Runtime/Source/System/Include/UICCircularArray.inl b/src/Runtime/Source/System/Include/Qt3DSCircularArray.inl
index 0d7f081f..0d7f081f 100644
--- a/src/Runtime/Source/System/Include/UICCircularArray.inl
+++ b/src/Runtime/Source/System/Include/Qt3DSCircularArray.inl
diff --git a/src/Runtime/Source/System/Include/UICColor.h b/src/Runtime/Source/System/Include/Qt3DSColor.h
index b917f46b..b917f46b 100644
--- a/src/Runtime/Source/System/Include/UICColor.h
+++ b/src/Runtime/Source/System/Include/Qt3DSColor.h
diff --git a/src/Runtime/Source/System/Include/UICConfig.h b/src/Runtime/Source/System/Include/Qt3DSConfig.h
index 563d7c9c..49c644da 100644
--- a/src/Runtime/Source/System/Include/UICConfig.h
+++ b/src/Runtime/Source/System/Include/Qt3DSConfig.h
@@ -34,7 +34,7 @@
 //	This file should only contain macros that configure the build environment
 //	and build options.
 //==============================================================================
-#include "UICMemorySettings.h"
+#include "Qt3DSMemorySettings.h"
 
 /// Number of chars to evaluate when generating a hash from a string.
 /// Verify that hash strings are unique after changing this value.
diff --git a/src/Runtime/Source/System/Include/UICCubicRoots.h b/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
index f522aa93..f522aa93 100644
--- a/src/Runtime/Source/System/Include/UICCubicRoots.h
+++ b/src/Runtime/Source/System/Include/Qt3DSCubicRoots.h
diff --git a/src/Runtime/Source/System/Include/UICCubicRootsImpl.h b/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
index 72a512b0..72a512b0 100644
--- a/src/Runtime/Source/System/Include/UICCubicRootsImpl.h
+++ b/src/Runtime/Source/System/Include/Qt3DSCubicRootsImpl.h
diff --git a/src/Runtime/Source/System/Include/UICDLLManager.h b/src/Runtime/Source/System/Include/Qt3DSDLLManager.h
index d670af2e..d670af2e 100644
--- a/src/Runtime/Source/System/Include/UICDLLManager.h
+++ b/src/Runtime/Source/System/Include/Qt3DSDLLManager.h
diff --git a/src/Runtime/Source/System/Include/UICDataLogger.h b/src/Runtime/Source/System/Include/Qt3DSDataLogger.h
index 9127bdfc..97d42130 100644
--- a/src/Runtime/Source/System/Include/UICDataLogger.h
+++ b/src/Runtime/Source/System/Include/Qt3DSDataLogger.h
@@ -34,8 +34,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTypes.h"
-#include "UICDataLoggerEnums.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSDataLoggerEnums.h"
 
 //==============================================================================
 //	Namespace
@@ -233,6 +233,6 @@ public:
 
 } // namespace Q3DStudio
 
-#include "UICDataLogger.hpp"
+#include "Qt3DSDataLogger.hpp"
 
 #endif // _DATA_LOGGER_H_
diff --git a/src/Runtime/Source/System/Include/UICDataLogger.hpp b/src/Runtime/Source/System/Include/Qt3DSDataLogger.hpp
index 4a6c4d20..0900c4a4 100644
--- a/src/Runtime/Source/System/Include/UICDataLogger.hpp
+++ b/src/Runtime/Source/System/Include/Qt3DSDataLogger.hpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICDataLogger.h"
+#include "Qt3DSDataLogger.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICDataLoggerEnums.h b/src/Runtime/Source/System/Include/Qt3DSDataLoggerEnums.h
index c30b0eaa..c30b0eaa 100644
--- a/src/Runtime/Source/System/Include/UICDataLoggerEnums.h
+++ b/src/Runtime/Source/System/Include/Qt3DSDataLoggerEnums.h
diff --git a/src/Runtime/Source/System/Include/UICDataLoggerViewer.h b/src/Runtime/Source/System/Include/Qt3DSDataLoggerViewer.h
index b8b7271b..0eaf9f6a 100644
--- a/src/Runtime/Source/System/Include/UICDataLoggerViewer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSDataLoggerViewer.h
@@ -34,9 +34,9 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTypes.h"
-#include "UICDataLogger.h"
-#include "UICDataLoggerEnums.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSDataLoggerEnums.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICEGLTimer.h b/src/Runtime/Source/System/Include/Qt3DSEGLTimer.h
index 6671ad49..4c9f4ce2 100644
--- a/src/Runtime/Source/System/Include/UICEGLTimer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSEGLTimer.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICTimer.h"
-#include "UICTypes.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSTypes.h"
 
 // You have to include egl before including this file.
 
diff --git a/src/Runtime/Source/System/Include/UICEndian.h b/src/Runtime/Source/System/Include/Qt3DSEndian.h
index f8913a72..f8913a72 100644
--- a/src/Runtime/Source/System/Include/UICEndian.h
+++ b/src/Runtime/Source/System/Include/Qt3DSEndian.h
diff --git a/src/Runtime/Source/System/Include/UICEulerAngles.h b/src/Runtime/Source/System/Include/Qt3DSEulerAngles.h
index 77476bbc..77476bbc 100644
--- a/src/Runtime/Source/System/Include/UICEulerAngles.h
+++ b/src/Runtime/Source/System/Include/Qt3DSEulerAngles.h
diff --git a/src/Runtime/Source/System/Include/UICFNDTimer.h b/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
index f29d5e02..7edae348 100644
--- a/src/Runtime/Source/System/Include/UICFNDTimer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFNDTimer.h
@@ -29,8 +29,8 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICTimer.h"
-#include "UICTypes.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSTypes.h"
 #include "foundation/Qt3DSTime.h"
 
 namespace Q3DStudio {
diff --git a/src/Runtime/Source/System/Include/UICFile.h b/src/Runtime/Source/System/Include/Qt3DSFile.h
index 6c3dd75f..e970cd2d 100644
--- a/src/Runtime/Source/System/Include/UICFile.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFile.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICFileStream.h b/src/Runtime/Source/System/Include/Qt3DSFileStream.h
index e0837fbb..49e272f4 100644
--- a/src/Runtime/Source/System/Include/UICFileStream.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFileStream.h
@@ -33,9 +33,9 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICIFileStream.h"
-#include "UICArray.h"
-#include "UICEndian.h"
+#include "Qt3DSIFileStream.h"
+#include "Qt3DSArray.h"
+#include "Qt3DSEndian.h"
 
 #include <QtCore/QString>
 
diff --git a/src/Runtime/Source/System/Include/UICFixedArray.h b/src/Runtime/Source/System/Include/Qt3DSFixedArray.h
index befc7ab5..78cc0be5 100644
--- a/src/Runtime/Source/System/Include/UICFixedArray.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFixedArray.h
@@ -86,4 +86,4 @@ public: // Array access
 //==============================================================================
 //	Template code
 //==============================================================================
-#include "UICFixedArray.inl"
+#include "Qt3DSFixedArray.inl"
diff --git a/src/Runtime/Source/System/Include/UICFixedArray.inl b/src/Runtime/Source/System/Include/Qt3DSFixedArray.inl
index 55242243..55242243 100644
--- a/src/Runtime/Source/System/Include/UICFixedArray.inl
+++ b/src/Runtime/Source/System/Include/Qt3DSFixedArray.inl
diff --git a/src/Runtime/Source/System/Include/UICFunctionWrappers.h b/src/Runtime/Source/System/Include/Qt3DSFunctionWrappers.h
index 8fff62de..8fff62de 100644
--- a/src/Runtime/Source/System/Include/UICFunctionWrappers.h
+++ b/src/Runtime/Source/System/Include/Qt3DSFunctionWrappers.h
diff --git a/src/Runtime/Source/System/Include/UICHash.h b/src/Runtime/Source/System/Include/Qt3DSHash.h
index 5e7a3544..8baa2dba 100644
--- a/src/Runtime/Source/System/Include/UICHash.h
+++ b/src/Runtime/Source/System/Include/Qt3DSHash.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICConfig.h"
+#include "Qt3DSConfig.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICIFileStream.h b/src/Runtime/Source/System/Include/Qt3DSIFileStream.h
index 08d41813..0b432601 100644
--- a/src/Runtime/Source/System/Include/UICIFileStream.h
+++ b/src/Runtime/Source/System/Include/Qt3DSIFileStream.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICIStream.h"
+#include "Qt3DSIStream.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICIStream.h b/src/Runtime/Source/System/Include/Qt3DSIStream.h
index a4c11955..a4c11955 100644
--- a/src/Runtime/Source/System/Include/UICIStream.h
+++ b/src/Runtime/Source/System/Include/Qt3DSIStream.h
diff --git a/src/Runtime/Source/System/Include/UICITimer.h b/src/Runtime/Source/System/Include/Qt3DSITimer.h
index e73fbb95..e73fbb95 100644
--- a/src/Runtime/Source/System/Include/UICITimer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSITimer.h
diff --git a/src/Runtime/Source/System/Include/UICMacros.h b/src/Runtime/Source/System/Include/Qt3DSMacros.h
index 9233da17..fbc40b4d 100644
--- a/src/Runtime/Source/System/Include/UICMacros.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMacros.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICAssert.h"
+#include "Qt3DSAssert.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMatrix.h b/src/Runtime/Source/System/Include/Qt3DSMatrix.h
index 4ef74420..4ef74420 100644
--- a/src/Runtime/Source/System/Include/UICMatrix.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMatrix.h
diff --git a/src/Runtime/Source/System/Include/UICMemory.h b/src/Runtime/Source/System/Include/Qt3DSMemory.h
index 42939fdb..cc04bf73 100644
--- a/src/Runtime/Source/System/Include/UICMemory.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemory.h
@@ -36,10 +36,10 @@
 #ifndef _INTEGRITYPLATFORM
 #include <memory.h>
 #endif
-#include "UICMemoryHeap.h"
-#include "UICMemoryManager.h"
-#include "UICMemoryFilter.h"
-#include "UICMemoryStatistics.h"
+#include "Qt3DSMemoryHeap.h"
+#include "Qt3DSMemoryManager.h"
+#include "Qt3DSMemoryFilter.h"
+#include "Qt3DSMemoryStatistics.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemoryFilter.h b/src/Runtime/Source/System/Include/Qt3DSMemoryFilter.h
index df9367da..df9367da 100644
--- a/src/Runtime/Source/System/Include/UICMemoryFilter.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryFilter.h
diff --git a/src/Runtime/Source/System/Include/UICMemoryHeap.h b/src/Runtime/Source/System/Include/Qt3DSMemoryHeap.h
index 18f15e83..ba7c1306 100644
--- a/src/Runtime/Source/System/Include/UICMemoryHeap.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryHeap.h
@@ -33,9 +33,9 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryProbe.h"
-#include "UICFixedArray.h"
-#include "UICMemorySettings.h"
+#include "Qt3DSMemoryProbe.h"
+#include "Qt3DSFixedArray.h"
+#include "Qt3DSMemorySettings.h"
 
 //==============================================================================
 /**
diff --git a/src/Runtime/Source/System/Include/UICMemoryManager.h b/src/Runtime/Source/System/Include/Qt3DSMemoryManager.h
index b82924db..fa54fce7 100644
--- a/src/Runtime/Source/System/Include/UICMemoryManager.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryManager.h
@@ -33,9 +33,9 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryPool.h"
-#include "UICMemoryProbe.h"
-#include "UICMemoryTracker.h"
+#include "Qt3DSMemoryPool.h"
+#include "Qt3DSMemoryProbe.h"
+#include "Qt3DSMemoryTracker.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemoryPool.h b/src/Runtime/Source/System/Include/Qt3DSMemoryPool.h
index 83bb9047..01b2e418 100644
--- a/src/Runtime/Source/System/Include/UICMemoryPool.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryPool.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryProbe.h"
+#include "Qt3DSMemoryProbe.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemoryProbe.h b/src/Runtime/Source/System/Include/Qt3DSMemoryProbe.h
index a628be0f..5f0844e8 100644
--- a/src/Runtime/Source/System/Include/UICMemoryProbe.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryProbe.h
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #pragma once
-#include "UICMacros.h"
+#include "Qt3DSMacros.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemorySettings.h b/src/Runtime/Source/System/Include/Qt3DSMemorySettings.h
index 03d2d8d2..54002424 100644
--- a/src/Runtime/Source/System/Include/UICMemorySettings.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemorySettings.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTypes.h"
+#include "Qt3DSTypes.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemoryStatistics.h b/src/Runtime/Source/System/Include/Qt3DSMemoryStatistics.h
index 30983ad9..81e30434 100644
--- a/src/Runtime/Source/System/Include/UICMemoryStatistics.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryStatistics.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryManager.h"
+#include "Qt3DSMemoryManager.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICMemoryTracker.h b/src/Runtime/Source/System/Include/Qt3DSMemoryTracker.h
index ee6ce699..ee6ce699 100644
--- a/src/Runtime/Source/System/Include/UICMemoryTracker.h
+++ b/src/Runtime/Source/System/Include/Qt3DSMemoryTracker.h
diff --git a/src/Runtime/Source/System/Include/UICPlatformSpecific.h b/src/Runtime/Source/System/Include/Qt3DSPlatformSpecific.h
index 3fc34016..3fc34016 100644
--- a/src/Runtime/Source/System/Include/UICPlatformSpecific.h
+++ b/src/Runtime/Source/System/Include/Qt3DSPlatformSpecific.h
diff --git a/src/Runtime/Source/System/Include/UICSyncPrimitive.h b/src/Runtime/Source/System/Include/Qt3DSSyncPrimitive.h
index 72ec0456..72ec0456 100644
--- a/src/Runtime/Source/System/Include/UICSyncPrimitive.h
+++ b/src/Runtime/Source/System/Include/Qt3DSSyncPrimitive.h
diff --git a/src/Runtime/Source/System/Include/UICThreadManager.h b/src/Runtime/Source/System/Include/Qt3DSThreadManager.h
index 884e9812..5dec67df 100644
--- a/src/Runtime/Source/System/Include/UICThreadManager.h
+++ b/src/Runtime/Source/System/Include/Qt3DSThreadManager.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "UICThreadSafeScratchpad.h"
-#include "UICThreadSafeQueue.h"
-#include "UICArray.h"
+#include "Qt3DSThreadSafeScratchpad.h"
+#include "Qt3DSThreadSafeQueue.h"
+#include "Qt3DSArray.h"
 
 namespace Q3DStudio {
 //==============================================================================
diff --git a/src/Runtime/Source/System/Include/UICThreadSafeQueue.h b/src/Runtime/Source/System/Include/Qt3DSThreadSafeQueue.h
index 2ca71daf..4d6345f8 100644
--- a/src/Runtime/Source/System/Include/UICThreadSafeQueue.h
+++ b/src/Runtime/Source/System/Include/Qt3DSThreadSafeQueue.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICSyncPrimitive.h"
-#include "UICArray.h"
+#include "Qt3DSSyncPrimitive.h"
+#include "Qt3DSArray.h"
 
 //==============================================================================
 //	Namespace
@@ -82,4 +82,4 @@ public:
 //==============================================================================
 //	Template code
 //==============================================================================
-#include "UICThreadSafeQueue.inl"
+#include "Qt3DSThreadSafeQueue.inl"
diff --git a/src/Runtime/Source/System/Include/UICThreadSafeQueue.inl b/src/Runtime/Source/System/Include/Qt3DSThreadSafeQueue.inl
index 84501916..84501916 100644
--- a/src/Runtime/Source/System/Include/UICThreadSafeQueue.inl
+++ b/src/Runtime/Source/System/Include/Qt3DSThreadSafeQueue.inl
diff --git a/src/Runtime/Source/System/Include/UICThreadSafeScratchpad.h b/src/Runtime/Source/System/Include/Qt3DSThreadSafeScratchpad.h
index fb7c0bd0..64f414c8 100644
--- a/src/Runtime/Source/System/Include/UICThreadSafeScratchpad.h
+++ b/src/Runtime/Source/System/Include/Qt3DSThreadSafeScratchpad.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICSyncPrimitive.h"
-#include "UICArray.h"
+#include "Qt3DSSyncPrimitive.h"
+#include "Qt3DSArray.h"
 #include "foundation/Qt3DSLogging.h"
 
 //==============================================================================
@@ -95,4 +95,4 @@ public:
 };
 }
 
-#include "UICThreadSafeScratchpad.inl"
+#include "Qt3DSThreadSafeScratchpad.inl"
diff --git a/src/Runtime/Source/System/Include/UICThreadSafeScratchpad.inl b/src/Runtime/Source/System/Include/Qt3DSThreadSafeScratchpad.inl
index 6b26764a..6b26764a 100644
--- a/src/Runtime/Source/System/Include/UICThreadSafeScratchpad.inl
+++ b/src/Runtime/Source/System/Include/Qt3DSThreadSafeScratchpad.inl
diff --git a/src/Runtime/Source/System/Include/UICTimer.h b/src/Runtime/Source/System/Include/Qt3DSTimer.h
index 3d2decfd..278bd4b4 100644
--- a/src/Runtime/Source/System/Include/UICTimer.h
+++ b/src/Runtime/Source/System/Include/Qt3DSTimer.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICITimer.h"
+#include "Qt3DSITimer.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Include/UICTypes.h b/src/Runtime/Source/System/Include/Qt3DSTypes.h
index 6330919c..6330919c 100644
--- a/src/Runtime/Source/System/Include/UICTypes.h
+++ b/src/Runtime/Source/System/Include/Qt3DSTypes.h
diff --git a/src/Runtime/Source/System/Include/UICVector3.h b/src/Runtime/Source/System/Include/Qt3DSVector3.h
index 08df028b..08df028b 100644
--- a/src/Runtime/Source/System/Include/UICVector3.h
+++ b/src/Runtime/Source/System/Include/Qt3DSVector3.h
diff --git a/src/Runtime/Source/System/Include/SystemPrefix.h b/src/Runtime/Source/System/Include/SystemPrefix.h
index 1fba858c..aa1ba185 100644
--- a/src/Runtime/Source/System/Include/SystemPrefix.h
+++ b/src/Runtime/Source/System/Include/SystemPrefix.h
@@ -82,11 +82,11 @@
 
 //==============================================================================
 //	OUR INCLUDES
-#include "UICTypes.h"
-#include "UICPlatformSpecific.h"
-#include "UICAssert.h"
-#include "UICMacros.h"
-#include "UICConfig.h"
-#include "UICMemorySettings.h"
-#include "UICMemory.h"
-#include "UICArray.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSPlatformSpecific.h"
+#include "Qt3DSAssert.h"
+#include "Qt3DSMacros.h"
+#include "Qt3DSConfig.h"
+#include "Qt3DSMemorySettings.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSArray.h"
diff --git a/src/Runtime/Source/System/Source/UICAssert.cpp b/src/Runtime/Source/System/Source/Qt3DSAssert.cpp
index 3ed6cd82..3fe6cfd8 100644
--- a/src/Runtime/Source/System/Source/UICAssert.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSAssert.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICAssert.h"
+#include "Qt3DSAssert.h"
 #include "foundation/Qt3DSLogging.h"
 //==============================================================================
 //	Platform Specific Includes
diff --git a/src/Runtime/Source/System/Source/UICBoundingBox.cpp b/src/Runtime/Source/System/Source/Qt3DSBoundingBox.cpp
index 9470df4d..2a9331d1 100644
--- a/src/Runtime/Source/System/Source/UICBoundingBox.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSBoundingBox.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICBoundingBox.h"
-#include "UICMatrix.h"
+#include "Qt3DSBoundingBox.h"
+#include "Qt3DSMatrix.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICColor.cpp b/src/Runtime/Source/System/Source/Qt3DSColor.cpp
index c4f3b811..a44d488b 100644
--- a/src/Runtime/Source/System/Source/UICColor.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSColor.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICColor.h"
+#include "Qt3DSColor.h"
 
 //==============================================================================
 // Namespace
diff --git a/src/Runtime/Source/System/Source/UICCubicRoots.cpp b/src/Runtime/Source/System/Source/Qt3DSCubicRoots.cpp
index 876986ef..ebcc54b8 100644
--- a/src/Runtime/Source/System/Source/UICCubicRoots.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSCubicRoots.cpp
@@ -33,6 +33,6 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICCubicRoots.h"
-#include "UICDataLogger.h"
-#include "UICCubicRootsImpl.h"
+#include "Qt3DSCubicRoots.h"
+#include "Qt3DSDataLogger.h"
+#include "Qt3DSCubicRootsImpl.h"
diff --git a/src/Runtime/Source/System/Source/UICDLLManager.cpp b/src/Runtime/Source/System/Source/Qt3DSDLLManager.cpp
index cb8cf9c6..259a1d49 100644
--- a/src/Runtime/Source/System/Source/UICDLLManager.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSDLLManager.cpp
@@ -31,8 +31,8 @@
 //	Includes
 //==============================================================================
 #include "SystemPrefix.h"
-#include "UICDLLManager.h"
-#include "UICBasicPluginDLL.h"
+#include "Qt3DSDLLManager.h"
+#include "Qt3DSBasicPluginDLL.h"
 #include <QDebug>
 #ifdef _LINUXPLATFORM
 #include <dlfcn.h>
diff --git a/src/Runtime/Source/System/Source/UICDataLogger.cpp b/src/Runtime/Source/System/Source/Qt3DSDataLogger.cpp
index 4ef19c9f..830a6065 100644
--- a/src/Runtime/Source/System/Source/UICDataLogger.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSDataLogger.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICDataLogger.h"
+#include "Qt3DSDataLogger.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICEulerAngles.cpp b/src/Runtime/Source/System/Source/Qt3DSEulerAngles.cpp
index ec186e6a..7c4364fc 100644
--- a/src/Runtime/Source/System/Source/UICEulerAngles.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSEulerAngles.cpp
@@ -37,7 +37,7 @@
 #include <float.h>
 #include <string.h>
 #include <stdio.h>
-#include "UICEulerAngles.h"
+#include "Qt3DSEulerAngles.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4365) // warnings on conversion from unsigned int to int
diff --git a/src/Runtime/Source/System/Source/UICFile.cpp b/src/Runtime/Source/System/Source/Qt3DSFile.cpp
index 60f60f52..a26b7351 100644
--- a/src/Runtime/Source/System/Source/UICFile.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSFile.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICFile.h"
+#include "Qt3DSFile.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICFileStream.cpp b/src/Runtime/Source/System/Source/Qt3DSFileStream.cpp
index 08f70e26..0a672c1e 100644
--- a/src/Runtime/Source/System/Source/UICFileStream.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSFileStream.cpp
@@ -32,9 +32,9 @@
 // Includes
 //==============================================================================
 #include "SystemPrefix.h"
-#include "UICFile.h"
-#include "UICFileStream.h"
-#include "UICThreadManager.h"
+#include "Qt3DSFile.h"
+#include "Qt3DSFileStream.h"
+#include "Qt3DSThreadManager.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICFunctionWrappers.cpp b/src/Runtime/Source/System/Source/Qt3DSFunctionWrappers.cpp
index 8fb8ea78..e96c3ce1 100644
--- a/src/Runtime/Source/System/Source/UICFunctionWrappers.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSFunctionWrappers.cpp
@@ -32,7 +32,7 @@
 // Includes
 //==============================================================================
 #include "SystemPrefix.h"
-#include "UICFunctionWrappers.h"
+#include "Qt3DSFunctionWrappers.h"
 
 using namespace Q3DStudio;
 
diff --git a/src/Runtime/Source/System/Source/UICMatrix.cpp b/src/Runtime/Source/System/Source/Qt3DSMatrix.cpp
index 22dfaea5..b5310d0e 100644
--- a/src/Runtime/Source/System/Source/UICMatrix.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMatrix.cpp
@@ -33,10 +33,10 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMatrix.h"
-#include "UICVector3.h"
-#include "UICEulerAngles.h"
-#include "UICDataLogger.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSEulerAngles.h"
+#include "Qt3DSDataLogger.h"
 #include <math.h>
 
 //==============================================================================
diff --git a/src/Runtime/Source/System/Source/UICMemory.cpp b/src/Runtime/Source/System/Source/Qt3DSMemory.cpp
index b1056b3d..17fa5c86 100644
--- a/src/Runtime/Source/System/Source/UICMemory.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemory.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemory.h"
+#include "Qt3DSMemory.h"
 
 //==============================================================================
 //	OS level memory routines
diff --git a/src/Runtime/Source/System/Source/UICMemoryFilter.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryFilter.cpp
index 6462f746..f6d6591c 100644
--- a/src/Runtime/Source/System/Source/UICMemoryFilter.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryFilter.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryFilter.h"
+#include "Qt3DSMemoryFilter.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICMemoryHeap.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryHeap.cpp
index 82bbb991..4ab36178 100644
--- a/src/Runtime/Source/System/Source/UICMemoryHeap.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryHeap.cpp
@@ -33,10 +33,10 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemory.h"
-#include "UICMemoryHeap.h"
-#include "UICMemoryStatistics.h"
-#include "UICIStream.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSMemoryHeap.h"
+#include "Qt3DSMemoryStatistics.h"
+#include "Qt3DSIStream.h"
 #include "foundation/Qt3DSLogging.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/System/Source/UICMemoryManager.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryManager.cpp
index 7ba93137..a1ace59e 100644
--- a/src/Runtime/Source/System/Source/UICMemoryManager.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryManager.cpp
@@ -33,12 +33,12 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemory.h"
-#include "UICMemoryManager.h"
-#include "UICMemoryHeap.h"
-#include "UICMemoryProbe.h"
-#include "UICMemoryTracker.h"
-#include "UICMemoryStatistics.h"
+#include "Qt3DSMemory.h"
+#include "Qt3DSMemoryManager.h"
+#include "Qt3DSMemoryHeap.h"
+#include "Qt3DSMemoryProbe.h"
+#include "Qt3DSMemoryTracker.h"
+#include "Qt3DSMemoryStatistics.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICMemoryPool.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryPool.cpp
index 49b2b343..44545d45 100644
--- a/src/Runtime/Source/System/Source/UICMemoryPool.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryPool.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryPool.h"
-#include "UICMemoryHeap.h"
+#include "Qt3DSMemoryPool.h"
+#include "Qt3DSMemoryHeap.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICMemoryProbe.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryProbe.cpp
index e01817d2..4e977ee1 100644
--- a/src/Runtime/Source/System/Source/UICMemoryProbe.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryProbe.cpp
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryProbe.h"
-#include "UICMemoryStatistics.h"
+#include "Qt3DSMemoryProbe.h"
+#include "Qt3DSMemoryStatistics.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICMemoryStatistics.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryStatistics.cpp
index 09ba78df..2f5eba0e 100644
--- a/src/Runtime/Source/System/Source/UICMemoryStatistics.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryStatistics.cpp
@@ -33,10 +33,10 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICIStream.h"
-#include "UICMemoryStatistics.h"
-#include "UICMemoryTracker.h"
-#include "UICMemoryHeap.h"
+#include "Qt3DSIStream.h"
+#include "Qt3DSMemoryStatistics.h"
+#include "Qt3DSMemoryTracker.h"
+#include "Qt3DSMemoryHeap.h"
 #include "foundation/Qt3DSLogging.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/System/Source/UICMemoryTracker.cpp b/src/Runtime/Source/System/Source/Qt3DSMemoryTracker.cpp
index a926cf6c..8aef9519 100644
--- a/src/Runtime/Source/System/Source/UICMemoryTracker.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSMemoryTracker.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICMemoryTracker.h"
+#include "Qt3DSMemoryTracker.h"
 #include "foundation/Qt3DSLogging.h"
 
 //==============================================================================
diff --git a/src/Runtime/Source/System/Source/UICSyncPrimitive.cpp b/src/Runtime/Source/System/Source/Qt3DSSyncPrimitive.cpp
index cf9bb451..bfc49856 100644
--- a/src/Runtime/Source/System/Source/UICSyncPrimitive.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSSyncPrimitive.cpp
@@ -34,7 +34,7 @@
 //	Includes
 //==============================================================================
 #include "SystemPrefix.h"
-#include "UICSyncPrimitive.h"
+#include "Qt3DSSyncPrimitive.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICThreadManager.cpp b/src/Runtime/Source/System/Source/Qt3DSThreadManager.cpp
index 3d2645d8..b7d30ea8 100644
--- a/src/Runtime/Source/System/Source/UICThreadManager.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSThreadManager.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICThreadManager.h"
+#include "Qt3DSThreadManager.h"
 
 #ifdef _TEGRAPLATFORM
 #include <Winbase.h.>
diff --git a/src/Runtime/Source/System/Source/UICTimer.cpp b/src/Runtime/Source/System/Source/Qt3DSTimer.cpp
index 47c9605b..d9e82eb9 100644
--- a/src/Runtime/Source/System/Source/UICTimer.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSTimer.cpp
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICTimer.h"
+#include "Qt3DSTimer.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/System/Source/UICTypes.cpp b/src/Runtime/Source/System/Source/Qt3DSTypes.cpp
index 25d41c8b..25d41c8b 100644
--- a/src/Runtime/Source/System/Source/UICTypes.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSTypes.cpp
diff --git a/src/Runtime/Source/System/Source/UICVector3.cpp b/src/Runtime/Source/System/Source/Qt3DSVector3.cpp
index 5244451b..2d790f95 100644
--- a/src/Runtime/Source/System/Source/UICVector3.cpp
+++ b/src/Runtime/Source/System/Source/Qt3DSVector3.cpp
@@ -33,9 +33,9 @@
 //==============================================================================
 // Includes
 //==============================================================================
-#include "UICVector3.h"
-#include "UICMatrix.h"
-#include "UICDataLogger.h"
+#include "Qt3DSVector3.h"
+#include "Qt3DSMatrix.h"
+#include "Qt3DSDataLogger.h"
 #include <math.h>
 
 //==============================================================================
diff --git a/src/Runtime/Source/UIPParser/Include/UICIPresentation.h b/src/Runtime/Source/UIPParser/Include/Qt3DSIPresentation.h
index 446a1c06..2ffa7d87 100644
--- a/src/Runtime/Source/UIPParser/Include/UICIPresentation.h
+++ b/src/Runtime/Source/UIPParser/Include/Qt3DSIPresentation.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICEventCallbacks.h"
+#include "Qt3DSEventCallbacks.h"
 
 namespace qt3ds {
 namespace runtime {
diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParser.h b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParser.h
index 1c31d457..1c31d457 100644
--- a/src/Runtime/Source/UIPParser/Include/UICUIPParser.h
+++ b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParser.h
diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h
index 3af0cf03..3d9d44ce 100644
--- a/src/Runtime/Source/UIPParser/Include/UICUIPParserActionHelper.h
+++ b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserActionHelper.h
@@ -33,7 +33,7 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICUIPParserImpl.h"
+#include "Qt3DSUIPParserImpl.h"
 
 namespace qt3ds {
 namespace runtime {
diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserImpl.h
index 70269e44..bca85650 100644
--- a/src/Runtime/Source/UIPParser/Include/UICUIPParserImpl.h
+++ b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserImpl.h
@@ -85,18 +85,18 @@ uip file data.
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICUIPParser.h"
-#include "UICTypes.h"
-#include "UICMetadata.h"
-#include "UICRenderInputStreamFactory.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSUIPParser.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSMetadata.h"
+#include "Qt3DSRenderInputStreamFactory.h"
+#include "Qt3DSSlideSystem.h"
 #include "UICDMDataTypes.h"
 #include "foundation/Qt3DSMemoryBuffer.h"
 #include <EASTL/map.h>
 #include <EASTL/set.h>
 #include <EASTL/hash_map.h>
-#include "UICElementSystem.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSSlideSystem.h"
 
 namespace qt3ds {
 namespace render {
diff --git a/src/Runtime/Source/UIPParser/Include/UICUIPParserObjectRefHelper.h b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h
index 23070ae5..fcd16985 100644
--- a/src/Runtime/Source/UIPParser/Include/UICUIPParserObjectRefHelper.h
+++ b/src/Runtime/Source/UIPParser/Include/Qt3DSUIPParserObjectRefHelper.h
@@ -33,8 +33,8 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICUIPParser.h"
-#include "UICUIPParserImpl.h"
+#include "Qt3DSUIPParser.h"
+#include "Qt3DSUIPParserImpl.h"
 
 //==============================================================================
 //	Namespace
diff --git a/src/Runtime/Source/UIPParser/Source/UICUIPParserActionHelper.cpp b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp
index 0ec90b53..6c544a7a 100644
--- a/src/Runtime/Source/UIPParser/Source/UICUIPParserActionHelper.cpp
+++ b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserActionHelper.cpp
@@ -36,18 +36,18 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICUIPParserActionHelper.h"
-#include "UICUIPParserObjectRefHelper.h"
-#include "UICIPresentation.h"
-#include "UICCommandEventTypes.h"
+#include "Qt3DSUIPParserActionHelper.h"
+#include "Qt3DSUIPParserObjectRefHelper.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSCommandEventTypes.h"
 
 #include "UICDMPrefix.h"
 #include "UICDMXML.h"
 #include "UICDMWStrOpsImpl.h"
-#include "UICMetadata.h"
-#include "UICEulerAngles.h"
-#include "UICLogicSystem.h"
-#include "UICParametersSystem.h"
+#include "Qt3DSMetadata.h"
+#include "Qt3DSEulerAngles.h"
+#include "Qt3DSLogicSystem.h"
+#include "Qt3DSParametersSystem.h"
 
 using namespace qt3dsdm;
 
diff --git a/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
index 2dc8b12a..18f1e792 100644
--- a/src/Runtime/Source/UIPParser/Source/UICUIPParserImpl.cpp
+++ b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
@@ -36,22 +36,22 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICIPresentation.h"
-#include "UICIScriptBridge.h"
-#include "UICAttributeHashes.h"
-#include "UICCommandEventTypes.h"
+#include "Qt3DSIPresentation.h"
+#include "Qt3DSIScriptBridge.h"
+#include "Qt3DSAttributeHashes.h"
+#include "Qt3DSCommandEventTypes.h"
 #include "UICDMPrefix.h"
 #include "UICDMComposerTypeDefinitions.h"
 #include "UICDMWStrOpsImpl.h"
-#include "UICUIPParserActionHelper.h"
-#include "UICUIPParserObjectRefHelper.h"
-#include "UICApplication.h"
-#include "UICRuntimeFactory.h"
-#include "UICSceneGraphDebugger.h"
+#include "Qt3DSUIPParserActionHelper.h"
+#include "Qt3DSUIPParserObjectRefHelper.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSRuntimeFactory.h"
+#include "Qt3DSSceneGraphDebugger.h"
 #include "foundation/Qt3DSFoundation.h"
-#include "UICElementSystem.h"
-#include "UICAnimationSystem.h"
-#include "UICSlideSystem.h"
+#include "Qt3DSElementSystem.h"
+#include "Qt3DSAnimationSystem.h"
+#include "Qt3DSSlideSystem.h"
 
 using namespace qt3dsdm;
 
diff --git a/src/Runtime/Source/UIPParser/Source/UICUIPParserObjectRefHelper.cpp b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
index 21714e58..25968ea2 100644
--- a/src/Runtime/Source/UIPParser/Source/UICUIPParserObjectRefHelper.cpp
+++ b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserObjectRefHelper.cpp
@@ -37,11 +37,11 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "UICUIPParserObjectRefHelper.h"
+#include "Qt3DSUIPParserObjectRefHelper.h"
 
 #include "UICDMPrefix.h"
 #include "UICDMXML.h"
-#include "UICMetadata.h"
+#include "Qt3DSMetadata.h"
 
 using namespace qt3dsdm;
 
diff --git a/src/Runtime/Source/Viewer/UICAudioPlayerImpl.cpp b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
index 4f7f8fb4..3a1dce8c 100644
--- a/src/Runtime/Source/Viewer/UICAudioPlayerImpl.cpp
+++ b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/
 
-#include "UICAudioPlayerImpl.h"
+#include "Qt3DSAudioPlayerImpl.h"
 #include "foundation/Qt3DSLogging.h"
 #include <QDebug>
 
diff --git a/src/Runtime/Source/Viewer/UICAudioPlayerImpl.h b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
index 33f11540..bd607ab6 100644
--- a/src/Runtime/Source/Viewer/UICAudioPlayerImpl.h
+++ b/src/Runtime/Source/Viewer/Qt3DSAudioPlayerImpl.h
@@ -31,7 +31,7 @@
 #ifndef UIC_VIEWER_LIB_UIC_AUDIO_PLAYER_IMPL_H
 #define UIC_VIEWER_LIB_UIC_AUDIO_PLAYER_IMPL_H
 
-#include "UICAudioPlayer.h"
+#include "Qt3DSAudioPlayer.h"
 #include "qt3dsruntimeglobal.h"
 
 namespace UICViewer {
diff --git a/src/Runtime/Source/Viewer/UICEmbeddedWatermark.h b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h
index cbead585..cbead585 100644
--- a/src/Runtime/Source/Viewer/UICEmbeddedWatermark.h
+++ b/src/Runtime/Source/Viewer/Qt3DSEmbeddedWatermark.h
diff --git a/src/Runtime/Source/Viewer/UICViewerApp.cpp b/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
index 9172f180..7a6a331a 100644
--- a/src/Runtime/Source/Viewer/UICViewerApp.cpp
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerApp.cpp
@@ -31,16 +31,16 @@
 #include <algorithm>
 
 #include "EnginePrefix.h"
-#include "UICTegraApplication.h"
-#include "UICViewerApp.h"
-#include "UICTegraInputEngine.h"
+#include "Qt3DSTegraApplication.h"
+#include "Qt3DSViewerApp.h"
+#include "Qt3DSTegraInputEngine.h"
 #if !defined(Q_OS_MACOS)
 #include "TCPPerfLogClientStub.h"
 #endif
-#include "UICInputFrame.h" // keyboard mapping
+#include "Qt3DSInputFrame.h" // keyboard mapping
 #include "foundation/Qt3DSTime.h"
-#include "UICFNDTimer.h"
-#include "UICAudioPlayer.h"
+#include "Qt3DSFNDTimer.h"
+#include "Qt3DSAudioPlayer.h"
 
 #include <QList>
 #include <QFileInfo>
@@ -75,7 +75,7 @@ void EASTL_DEBUG_BREAK()
 #ifdef _WIN32
 #include <Xinput.h>
 #include <ShellAPI.h>
-#include "UICInputFrame.h"
+#include "Qt3DSInputFrame.h"
 
 void HandleController(Q3DStudio::CTegraApplication &inApplication)
 {
diff --git a/src/Runtime/Source/Viewer/UICViewerApp.h b/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
index bf134bd8..ebf15c65 100644
--- a/src/Runtime/Source/Viewer/UICViewerApp.h
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerApp.h
@@ -37,7 +37,7 @@
 #include <vector>
 #include <QObject>
 
-#include "UICInputDefs.h"
+#include "Qt3DSInputDefs.h"
 
 #include <QtGui/qsurfaceformat.h>
 
diff --git a/src/Runtime/Source/Viewer/UICViewerTimer.h b/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
index cf7ac032..cf7ac032 100644
--- a/src/Runtime/Source/Viewer/UICViewerTimer.h
+++ b/src/Runtime/Source/Viewer/Qt3DSViewerTimer.h
diff --git a/src/Runtime/commoninclude.pri b/src/Runtime/commoninclude.pri
index 3a10070e..058dcf12 100644
--- a/src/Runtime/commoninclude.pri
+++ b/src/Runtime/commoninclude.pri
@@ -12,8 +12,7 @@ DEFINES += COMPILED_FROM_DSP \
 
 INCLUDEPATH += \
     $$PWD/Source \
-    $$PWD/Source/UICRender/Include \
-    $$PWD/Source/RuntimeUICDM/Include \
+    $$PWD/Source/DataModel/Include \
     $$PWD/Source/Runtime/Include \
     $$PWD/Source/System/Include \
     $$PWD/Source/Engine/Include \
@@ -24,13 +23,12 @@ INCLUDEPATH += \
     $$PWD/Source/Qt3DSRender/Source/gl3 \
     $$PWD/Source/Qt3DSRender/Source/glg \
     $$PWD/Source/UIPParser/Include \
-    $$PWD/Source/UICState/Include \
-    $$PWD/Source/UICState/Editor \
-    $$PWD/Source/UICState/Debugger \
-    $$PWD/Source/UICEvent/Include \
-    $$PWD/Source/UICEvent/InternalInclude \
-    $$PWD/Source/UICRender/GraphObjects \
-    $$PWD/Source/UICRender/ResourceManager \
+    $$PWD/Source/Qt3DSState/Include \
+    $$PWD/Source/Qt3DSStateApplication/Include \
+    $$PWD/Source/Qt3DSStateApplication/Editor \
+    $$PWD/Source/Qt3DSStateApplication/Debugger \
+    $$PWD/Source/Qt3DSEvent/Include \
+    $$PWD/Source/Qt3DSEvent/InternalInclude \
     $$PWD/Source/Viewer \
     $$PWD/Source/Viewer/PerfLog \
     $$PWD/../Authoring/UICIMP/UICImportLib \
@@ -42,7 +40,10 @@ INCLUDEPATH += \
     ../3rdparty/utf8cpp/2.3.2/source \
     ../3rdparty/color \
     ../3rdparty/RuntimePlatformSpecific/$$PlatformSpecificDir/PlatformLibs \
-    $$PWD/../QtExtras/qmlstreamer
+    $$PWD/../QtExtras/qmlstreamer \
+    $$PWD/Source/Qt3DSRuntimeRender/Include \
+    $$PWD/Source/Qt3DSRuntimeRender/GraphObjects \
+    $$PWD/Source/Qt3DSRuntimeRender/ResourceManager
 
 # TODO: Investigate whether these can be moved to commonplatform
 win32 {
diff --git a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
index 255a7635..70810a23 100644
--- a/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
+++ b/src/Viewer/qmlviewer/Qt3DSRenderer.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 
 #include "Qt3DSRenderer.h"
-#include "UICViewerApp.h"
-#include "UICAudioPlayerImpl.h"
+#include "Qt3DSViewerApp.h"
+#include "Qt3DSAudioPlayerImpl.h"
 
 #include <QtStudio3D/private/q3dscommandqueue_p.h>
 #include <QtStudio3D/private/q3dsviewersettings_p.h>
diff --git a/src/Viewer/qmlviewer/Qt3DSRenderer.h b/src/Viewer/qmlviewer/Qt3DSRenderer.h
index b9582547..fd9168f1 100644
--- a/src/Viewer/qmlviewer/Qt3DSRenderer.h
+++ b/src/Viewer/qmlviewer/Qt3DSRenderer.h
@@ -34,7 +34,7 @@
 #include <QtGui/qopenglframebufferobject.h>
 #include <QtQuick/qquickframebufferobject.h>
 
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 #include "Qt3DSView.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/Viewer/studio3d/q3dselement_p.h b/src/Viewer/studio3d/q3dselement_p.h
index 6327b189..8d2e1dae 100644
--- a/src/Viewer/studio3d/q3dselement_p.h
+++ b/src/Viewer/studio3d/q3dselement_p.h
@@ -43,7 +43,7 @@
 
 #include "q3dselement.h"
 #include "q3dscommandqueue_p.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/Viewer/studio3d/q3dspresentation_p.h b/src/Viewer/studio3d/q3dspresentation_p.h
index 5c953c35..c416c03e 100644
--- a/src/Viewer/studio3d/q3dspresentation_p.h
+++ b/src/Viewer/studio3d/q3dspresentation_p.h
@@ -42,7 +42,7 @@
 //
 
 #include "q3dspresentation.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 #include <QtCore/QHash>
 #include <QtCore/QUrl>
 
diff --git a/src/Viewer/studio3d/q3dssceneelement_p.h b/src/Viewer/studio3d/q3dssceneelement_p.h
index 548733d5..0cd6a999 100644
--- a/src/Viewer/studio3d/q3dssceneelement_p.h
+++ b/src/Viewer/studio3d/q3dssceneelement_p.h
@@ -44,7 +44,7 @@
 #include "q3dssceneelement.h"
 #include "q3dselement_p.h"
 #include "q3dscommandqueue_p.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/Viewer/studio3d/q3dssurfaceviewer.cpp b/src/Viewer/studio3d/q3dssurfaceviewer.cpp
index b295ac37..5c76df68 100644
--- a/src/Viewer/studio3d/q3dssurfaceviewer.cpp
+++ b/src/Viewer/studio3d/q3dssurfaceviewer.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "q3dssurfaceviewer_p.h"
-#include "UICAudioPlayerImpl.h"
+#include "Qt3DSAudioPlayerImpl.h"
 #include "viewerqmlstreamproxy_p.h"
 #include "q3dsviewersettings_p.h"
 #include "q3dspresentation_p.h"
diff --git a/src/Viewer/studio3d/q3dssurfaceviewer_p.h b/src/Viewer/studio3d/q3dssurfaceviewer_p.h
index f038de3f..415e6d6b 100644
--- a/src/Viewer/studio3d/q3dssurfaceviewer_p.h
+++ b/src/Viewer/studio3d/q3dssurfaceviewer_p.h
@@ -42,7 +42,7 @@
 //
 
 #include "q3dssurfaceviewer.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 #include <QtCore/qtimer.h>
 
diff --git a/src/Viewer/studio3d/q3dsviewersettings.cpp b/src/Viewer/studio3d/q3dsviewersettings.cpp
index e68a314d..4c8cfdf0 100644
--- a/src/Viewer/studio3d/q3dsviewersettings.cpp
+++ b/src/Viewer/studio3d/q3dsviewersettings.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "q3dsviewersettings_p.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 #include "q3dscommandqueue_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/src/Viewer/studio3d/q3dsviewersettings_p.h b/src/Viewer/studio3d/q3dsviewersettings_p.h
index 6f34d439..3c88b598 100644
--- a/src/Viewer/studio3d/q3dsviewersettings_p.h
+++ b/src/Viewer/studio3d/q3dsviewersettings_p.h
@@ -42,7 +42,7 @@
 //
 
 #include "q3dsviewersettings.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/Viewer/studio3d/q3dswidget.cpp b/src/Viewer/studio3d/q3dswidget.cpp
index e079eb8d..e2f65aad 100644
--- a/src/Viewer/studio3d/q3dswidget.cpp
+++ b/src/Viewer/studio3d/q3dswidget.cpp
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 #include "q3dswidget_p.h"
-#include "UICAudioPlayerImpl.h"
+#include "Qt3DSAudioPlayerImpl.h"
 #include "viewerqmlstreamproxy_p.h"
 #include "q3dsviewersettings_p.h"
 #include "q3dspresentation_p.h"
diff --git a/src/Viewer/studio3d/q3dswidget_p.h b/src/Viewer/studio3d/q3dswidget_p.h
index 5a919081..ee88abee 100644
--- a/src/Viewer/studio3d/q3dswidget_p.h
+++ b/src/Viewer/studio3d/q3dswidget_p.h
@@ -42,7 +42,7 @@
 #define Q3DSWIDGET_P_H
 
 #include "q3dswidget.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 #include <QtCore/qtimer.h>
 
diff --git a/src/Viewer/studio3d/viewerqmlstreamproxy_p.h b/src/Viewer/studio3d/viewerqmlstreamproxy_p.h
index aeb4c96e..e936d138 100644
--- a/src/Viewer/studio3d/viewerqmlstreamproxy_p.h
+++ b/src/Viewer/studio3d/viewerqmlstreamproxy_p.h
@@ -39,7 +39,7 @@
 
 #include "qstudio3dglobal.h"
 #include "q3dsqmlstreamproxy.h"
-#include "UICViewerApp.h"
+#include "Qt3DSViewerApp.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.h b/tests/auto/runtime/Qt3DSRenderTestBase.h
index 3bef8fd5..64026ef2 100644
--- a/tests/auto/runtime/Qt3DSRenderTestBase.h
+++ b/tests/auto/runtime/Qt3DSRenderTestBase.h
@@ -34,11 +34,11 @@
 #include "foundation/Qt3DSBroadcastingAllocator.h"
 #include "render/Qt3DSRenderBaseTypes.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICWindowSystem.h"
-#include "UICTypes.h"
-#include "UICTimer.h"
-#include "UICRenderRuntimeBinding.h"
-#include "UICRenderRuntimeBindingImpl.h"
+#include "Qt3DSWindowSystem.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSTimer.h"
+#include "Qt3DSRenderRuntimeBinding.h"
+#include "Qt3DSRenderRuntimeBindingImpl.h"
 #include "UICRenderContext.h"
 #include "UICRendererImpl.h"
 #include "UICMetadata.h"
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
index 3f0664ec..034b0a4b 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
@@ -37,12 +37,12 @@
 #include "UICRenderDynamicObjectSystem.h"
 #include "UICRenderDynamicObjectSystemCommands.h"
 #include "UICRenderContext.h"
-#include "UICTypes.h"
-#include "UICRenderRuntimeBinding.h"
-#include "UICApplication.h"
-#include "UICInputEngine.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSRenderRuntimeBinding.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSInputEngine.h"
 #include "foundation/FileTools.h"
-#include "UICWindowSystem.h"
+#include "Qt3DSWindowSystem.h"
 #include "UICRenderContext.h"
 #include "UICRenderShaderCache.h"
 #include "UICRendererImpl.h"
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
index dbbee093..6858a517 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
@@ -31,12 +31,12 @@
 #include "../Qt3DSRenderTestMathUtil.h"
 #include "render/Qt3DSRenderShaderProgram.h"
 #include "render/Qt3DSRenderContext.h"
-#include "UICTypes.h"
-#include "UICRenderRuntimeBinding.h"
-#include "UICApplication.h"
-#include "UICInputEngine.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSRenderRuntimeBinding.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSInputEngine.h"
 #include "foundation/FileTools.h"
-#include "UICWindowSystem.h"
+#include "Qt3DSWindowSystem.h"
 #include "UICRenderContext.h"
 #include "UICRenderShaderCache.h"
 #include "UICRendererImpl.h"
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
index 2b0c73f8..3e94cd5c 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
@@ -37,12 +37,12 @@
 #include "UICRenderDynamicObjectSystem.h"
 #include "UICRenderDynamicObjectSystemCommands.h"
 #include "UICRenderContext.h"
-#include "UICTypes.h"
-#include "UICRenderRuntimeBinding.h"
-#include "UICApplication.h"
-#include "UICInputEngine.h"
+#include "Qt3DSTypes.h"
+#include "Qt3DSRenderRuntimeBinding.h"
+#include "Qt3DSApplication.h"
+#include "Qt3DSInputEngine.h"
 #include "foundation/FileTools.h"
-#include "UICWindowSystem.h"
+#include "Qt3DSWindowSystem.h"
 #include "UICRenderContext.h"
 #include "UICRenderShaderCache.h"
 #include "UICRendererImpl.h"