CoreObjectCore -> ct::CoreObject

Source/BansheeCore/Include/BsBlendState.h

@@ -178,7 +178,7 @@ namespace bs
 		BlendState(const BLEND_STATE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		BlendProperties mProperties;
 		mutable UINT32 mId;
@@ -206,7 +206,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT BlendStateCore : public CoreObjectCore
+	class BS_CORE_EXPORT BlendStateCore : public CoreObject
 	{
 	public:
 		virtual ~BlendStateCore();
@@ -228,7 +228,7 @@ namespace bs
 
 		BlendStateCore(const BLEND_STATE_DESC& desc, UINT32 id);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Creates any API-specific state objects. */

Source/BansheeCore/Include/BsCamera.h

@@ -578,7 +578,7 @@ namespace bs
 		Rect2I getViewportRect() const override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CameraBase::_markCoreDirty */
 		void _markCoreDirty(CameraDirtyFlag flag = CameraDirtyFlag::Everything) override;
@@ -608,7 +608,7 @@ namespace bs
 	namespace ct
 	{
 	/** @copydoc CameraBase */
-	class BS_CORE_EXPORT CameraCore : public CoreObjectCore, public TCamera<true>
+	class BS_CORE_EXPORT CameraCore : public CoreObject, public TCamera<true>
 	{
 	public:
 		~CameraCore();
@@ -624,7 +624,7 @@ namespace bs
 
 		CameraCore(const SPtr<ViewportCore>& viewport);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc CameraBase */

Source/BansheeCore/Include/BsCoreObject.h

@@ -19,7 +19,7 @@ namespace bs
 	 * It also provides a standardized way to initialize/destroy objects, and a way to specify dependant CoreObject%s. For
 	 * those purposes it might also be used for objects that only exist on the core thread.
 	 *
-	 * @note	CoreObjectCore is a counterpart to CoreObject that is used exclusively on the core thread. CoreObject on the
+	 * @note	ct::CoreObject is a counterpart to CoreObject that is used exclusively on the core thread. CoreObject on the
 	 *			other hand should be used exclusively on the simulation thread. Types that exist on both threads need to
 	 *			implement both of these.
 	 */
@@ -76,7 +76,7 @@ namespace bs
 		 *
 		 * @note	Thread safe to retrieve, but its data is only valid on the core thread.
 		 */
-		SPtr<ct::CoreObjectCore> getCore() const { return mCoreSpecific; }
+		SPtr<ct::CoreObject> getCore() const { return mCoreSpecific; }
 
 		/**
 		 * Ensures all dirty syncable data is send to the core thread counterpart of this object (if any).
@@ -115,7 +115,7 @@ namespace bs
 		/**
 		 * Constructs a new core object.
 		 *
-		 * @param[in]	requiresCoreInit	(optional) Determines if the CoreObjectCore counterpart of this object 
+		 * @param[in]	requiresCoreInit	(optional) Determines if the ct::CoreObject counterpart of this object 
 		 *									(if it has any, see createCore()) requires initialization and destruction on the
 		 *									core thread.
 		 */
@@ -129,7 +129,7 @@ namespace bs
 		 * Requires a shared pointer to the object this function will be executed on, in order to make sure the object is 
 		 * not deleted before the command executes. Can be null if the function is static or global.
 		 */
-		static void queueGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void()> func);
+		static void queueGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void()> func);
 
 		/**
 		 * Queues a command to be executed on the core thread, with a return value in the form of AsyncOp.
@@ -140,7 +140,7 @@ namespace bs
 		 * Requires a shared pointer to the object this function will be executed on, in order to make sure the object is 
 		 * not deleted before the command executes. Can be null if the function is static or global.
 		 */
-		static AsyncOp queueReturnGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void(AsyncOp&)> func);
+		static AsyncOp queueReturnGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void(AsyncOp&)> func);
 
 		bool requiresInitOnCoreThread() const { return (mFlags & CGO_INIT_ON_CORE_THREAD) != 0; }
 		void setIsDestroyed(bool destroyed) { mFlags = destroyed ? mFlags | CGO_DESTROYED : mFlags & ~CGO_DESTROYED; }
@@ -156,7 +156,7 @@ namespace bs
 		 * Queues object initialization command on the core thread. The command is added to the primary core thread queue 
 		 * and will be executed as soon as the core thread is ready.
 		 */
-		static void queueInitializeGpuCommand(const SPtr<ct::CoreObjectCore>& obj);
+		static void queueInitializeGpuCommand(const SPtr<ct::CoreObject>& obj);
 
 		/**
 		 * Queues object destruction command on the core thread. The command is added to the core thread queue of this 
@@ -164,13 +164,13 @@ namespace bs
 		 *
 		 * @note	It is up to the caller to ensure no other threads attempt to use this object.
 		 */
-		static void queueDestroyGpuCommand(const SPtr<ct::CoreObjectCore>& obj);
+		static void queueDestroyGpuCommand(const SPtr<ct::CoreObject>& obj);
 
 		/** Helper wrapper method used for queuing commands with no return value on the core thread. */
-		static void executeGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void()> func);
+		static void executeGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void()> func);
 
 		/**	Helper wrapper method used for queuing commands with a return value on the core thread. */
-		static void executeReturnGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void(AsyncOp&)> func, 
+		static void executeReturnGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void(AsyncOp&)> func, 
 			AsyncOp& op);
 
 	protected:
@@ -182,7 +182,7 @@ namespace bs
 		 * Creates an object that contains core thread specific data and methods for this CoreObject. Can be null if such 
 		 * object is not required.
 		 */
-		virtual SPtr<ct::CoreObjectCore> createCore() const { return nullptr; }
+		virtual SPtr<ct::CoreObject> createCore() const { return nullptr; }
 
 		/**
 		 * Marks the core data as dirty. This causes the syncToCore() method to trigger the next time objects are synced 
@@ -233,7 +233,7 @@ namespace bs
 		virtual void getCoreDependencies(Vector<CoreObject*>& dependencies) { }
 
 	protected:
-		SPtr<ct::CoreObjectCore> mCoreSpecific;
+		SPtr<ct::CoreObject> mCoreSpecific;
 	};
 
 	/**

Source/BansheeCore/Include/BsCoreObjectCore.h

@@ -19,7 +19,7 @@ namespace bs
 	 * @note	Core thread only.
 	 * @note	Different CoreObject implementations should implement this class for their own needs.
 	 */
-	class BS_CORE_EXPORT CoreObjectCore
+	class BS_CORE_EXPORT CoreObject
 	{
 	protected:
 		/** Values that represent current state of the object */
@@ -30,14 +30,14 @@ namespace bs
 		};
 
 	public:
-		CoreObjectCore();
-		virtual ~CoreObjectCore();
+		CoreObject();
+		virtual ~CoreObject();
 
 		/**	Called on the core thread when the object is first created. */
 		virtual void initialize();
 
 		/** Returns a shared_ptr version of "this" pointer. */
-		SPtr<CoreObjectCore> getThisPtr() const { return mThis.lock(); }
+		SPtr<CoreObject> getThisPtr() const { return mThis.lock(); }
 
 	public: // ***** INTERNAL ******
 		/** @name Internal
@@ -49,13 +49,13 @@ namespace bs
 		 *
 		 * @note	Called automatically by the factory creation methods so user should not call this manually.
 		 */
-		void _setThisPtr(SPtr<CoreObjectCore> ptrThis);
+		void _setThisPtr(SPtr<CoreObject> ptrThis);
 
 		/** @} */
 
 	protected:
 		friend class CoreObjectManager;
-		friend class CoreObject;
+		friend class bs::CoreObject;
 
 		/**
 		 * Update internal data from provided memory buffer that was populated with data from the sim thread.
@@ -85,7 +85,7 @@ namespace bs
 		void setScheduledToBeInitialized(bool scheduled) { mFlags = scheduled ? mFlags | CGCO_SCHEDULED_FOR_INIT : mFlags & ~CGCO_SCHEDULED_FOR_INIT; }
 
 		volatile UINT8 mFlags;
-		std::weak_ptr<CoreObjectCore> mThis;
+		std::weak_ptr<CoreObject> mThis;
 
 		static Signal mCoreGpuObjectLoadedCondition;
 		static Mutex mCoreGpuObjectLoadedMutex;

Source/BansheeCore/Include/BsCoreObjectManager.h

@@ -33,11 +33,11 @@ namespace bs
 				:internalId(0)
 			{ }
 
-			CoreStoredSyncObjData(const SPtr<ct::CoreObjectCore> destObj, UINT64 internalId, const CoreSyncData& syncData)
+			CoreStoredSyncObjData(const SPtr<ct::CoreObject> destObj, UINT64 internalId, const CoreSyncData& syncData)
 				:destinationObj(destObj), syncData(syncData), internalId(internalId)
 			{ }
 
-			SPtr<ct::CoreObjectCore> destinationObj;
+			SPtr<ct::CoreObject> destinationObj;
 			CoreSyncData syncData;
 			UINT64 internalId;
 		};

Source/BansheeCore/Include/BsCorePrerequisites.h

@@ -410,7 +410,7 @@ namespace bs
 		class DepthStencilStateCore;
 		class RasterizerStateCore;
 		class BlendStateCore;
-		class CoreObjectCore;
+		class CoreObject;
 		class CameraCore;
 		class MeshCoreBase;
 		class MeshCore;

Source/BansheeCore/Include/BsDepthStencilState.h

@@ -169,7 +169,7 @@ namespace bs
 		DepthStencilState(const DEPTH_STENCIL_STATE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		DepthStencilProperties mProperties;
 		mutable UINT32 mId;
@@ -197,7 +197,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT DepthStencilStateCore : public CoreObjectCore
+	class BS_CORE_EXPORT DepthStencilStateCore : public CoreObject
 	{
 	public:
 		virtual ~DepthStencilStateCore();
@@ -219,7 +219,7 @@ namespace bs
 
 		DepthStencilStateCore(const DEPTH_STENCIL_STATE_DESC& desc, UINT32 id);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Creates any API-specific state objects. */

Source/BansheeCore/Include/BsGpuBuffer.h

@@ -122,7 +122,7 @@ namespace bs
 		GpuBuffer(const GPU_BUFFER_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		GpuBufferProperties mProperties;
     };
@@ -140,7 +140,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT GpuBufferCore : public CoreObjectCore, public HardwareBuffer
+	class BS_CORE_EXPORT GpuBufferCore : public CoreObject, public HardwareBuffer
 	{
 	public:
 		virtual ~GpuBufferCore();

Source/BansheeCore/Include/BsGpuParamBlockBuffer.h

@@ -60,7 +60,7 @@ namespace bs
 
 	protected:
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::syncToCore */
 		CoreSyncData syncToCore(FrameAlloc* allocator) override;
@@ -83,7 +83,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT GpuParamBlockBufferCore : public CoreObjectCore
+	class BS_CORE_EXPORT GpuParamBlockBufferCore : public CoreObject
 	{
 	public:
 		GpuParamBlockBufferCore(UINT32 size, GpuParamBlockUsage usage, GpuDeviceFlags deviceMask);
@@ -135,7 +135,7 @@ namespace bs
 			GpuDeviceFlags deviceMask = GDF_DEFAULT);
 
 	protected:
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data)  override;
 
 		GpuParamBlockUsage mUsage;

Source/BansheeCore/Include/BsGpuParams.h

@@ -286,7 +286,7 @@ namespace bs
 		SPtr<GpuParams> _getThisPtr() const override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::syncToCore */
 		CoreSyncData syncToCore(FrameAlloc* allocator) override;
@@ -314,7 +314,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT GpuParamsCore : public CoreObjectCore, public TGpuParams<true>
+	class BS_CORE_EXPORT GpuParamsCore : public CoreObject, public TGpuParams<true>
 	{
 	public:
 		virtual ~GpuParamsCore() { }
@@ -349,7 +349,7 @@ namespace bs
 		/** @copydoc CoreObject::getThisPtr */
 		SPtr<GpuParamsCore> _getThisPtr() const override;
 
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;
 	};
 

Source/BansheeCore/Include/BsGpuPipelineParamInfo.h

@@ -112,13 +112,13 @@ namespace bs
 		GpuPipelineParamInfo(const GPU_PIPELINE_PARAMS_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 	};
 
 	namespace ct
 	{
 	/** Core thread version of a GpuPipelineParamInfo. */
-	class BS_CORE_EXPORT GpuPipelineParamInfoCore : public CoreObjectCore, public GpuPipelineParamInfoBase
+	class BS_CORE_EXPORT GpuPipelineParamInfoCore : public CoreObject, public GpuPipelineParamInfoBase
 	{
 	public:
 		virtual ~GpuPipelineParamInfoCore() { }

Source/BansheeCore/Include/BsGpuPipelineState.h

@@ -182,7 +182,7 @@ namespace bs
 		GraphicsPipelineState(const PIPELINE_STATE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		virtual SPtr<ct::CoreObjectCore> createCore() const;
+		virtual SPtr<ct::CoreObject> createCore() const;
     };
 
 	/**
@@ -210,7 +210,7 @@ namespace bs
 		ComputePipelineState(const SPtr<GpuProgram>& program);
 
 		/** @copydoc CoreObject::createCore */
-		virtual SPtr<ct::CoreObjectCore> createCore() const;
+		virtual SPtr<ct::CoreObject> createCore() const;
     };
 
 	/** @} */
@@ -222,13 +222,13 @@ namespace bs
 	 */
 
 	/** Core thread version of a GraphicsPipelineState. */
-	class BS_CORE_EXPORT GraphicsPipelineStateCore : public CoreObjectCore, public TGraphicsPipelineState<true>
+	class BS_CORE_EXPORT GraphicsPipelineStateCore : public CoreObject, public TGraphicsPipelineState<true>
 	{
 	public:
 		GraphicsPipelineStateCore(const PIPELINE_STATE_DESC& desc, GpuDeviceFlags deviceMask);
 		virtual ~GraphicsPipelineStateCore() { }
 
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/** @copydoc RenderStateManager::createGraphicsPipelineState */
@@ -240,13 +240,13 @@ namespace bs
 	};
 
 	/** Core thread version of a ComputePipelineState. */
-	class BS_CORE_EXPORT ComputePipelineStateCore : public CoreObjectCore, public TComputePipelineState<true>
+	class BS_CORE_EXPORT ComputePipelineStateCore : public CoreObject, public TComputePipelineState<true>
 	{
 	public:
 		ComputePipelineStateCore(const SPtr<GpuProgramCore>& program, GpuDeviceFlags deviceMask);
 		virtual ~ComputePipelineStateCore() { }
 
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/** @copydoc RenderStateManager::createComputePipelineState */

Source/BansheeCore/Include/BsGpuProgram.h

@@ -131,7 +131,7 @@ namespace bs
 		GpuProgram(const GPU_PROGRAM_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 	protected:
 		bool mNeedsAdjacencyInfo;
@@ -160,7 +160,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT GpuProgramCore : public CoreObjectCore
+	class BS_CORE_EXPORT GpuProgramCore : public CoreObject
 	{
 	public:
 		virtual ~GpuProgramCore() { }

Source/BansheeCore/Include/BsIndexBuffer.h

@@ -69,7 +69,7 @@ namespace bs
 		IndexBuffer(const INDEX_BUFFER_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		virtual SPtr<ct::CoreObjectCore> createCore() const;
+		virtual SPtr<ct::CoreObject> createCore() const;
 
 		IndexBufferProperties mProperties;
 		GpuBufferUsage mUsage;
@@ -84,7 +84,7 @@ namespace bs
 	 */
 
 	/** Core thread specific implementation of an IndexBuffer. */
-	class BS_CORE_EXPORT IndexBufferCore : public CoreObjectCore, public HardwareBuffer
+	class BS_CORE_EXPORT IndexBufferCore : public CoreObject, public HardwareBuffer
 	{
 	public:
 		IndexBufferCore(const INDEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask = GDF_DEFAULT);

Source/BansheeCore/Include/BsMaterial.h

@@ -600,7 +600,7 @@ namespace bs
 		Material(const HShader& shader);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::syncToCore */
 		CoreSyncData syncToCore(FrameAlloc* allocator) override;
@@ -656,7 +656,7 @@ namespace bs
 	 */
 
 	/** @copydoc MaterialBase */
-	class BS_CORE_EXPORT MaterialCore : public CoreObjectCore, public TMaterial<true>
+	class BS_CORE_EXPORT MaterialCore : public CoreObject, public TMaterial<true>
 	{
 	public:
 		~MaterialCore() { }
@@ -675,7 +675,7 @@ namespace bs
 		MaterialCore(const SPtr<ShaderCore>& shader, const Vector<SPtr<TechniqueCore>>& techniques,
 			const SPtr<MaterialParamsCore>& materialParams);
 
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;
 	};
 

Source/BansheeCore/Include/BsMesh.h

@@ -141,7 +141,7 @@ namespace bs
 		void updateBounds(const MeshData& meshData);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/**
 		 * Creates buffers used for caching of CPU mesh data.
@@ -281,7 +281,7 @@ namespace bs
 
 		~MeshCore();
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc MeshCoreBase::getVertexData */

Source/BansheeCore/Include/BsMeshBase.h

@@ -137,7 +137,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT MeshCoreBase : public CoreObjectCore
+	class BS_CORE_EXPORT MeshCoreBase : public CoreObject
 	{
 	public:
 		MeshCoreBase(UINT32 numVertices, UINT32 numIndices, const Vector<SubMesh>& subMeshes);
@@ -179,7 +179,7 @@ namespace bs
 		const MeshProperties& getProperties() const { return mProperties; }
 
 	protected:
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;
 
 		MeshProperties mProperties;

Source/BansheeCore/Include/BsMeshHeap.h

@@ -63,7 +63,7 @@ namespace bs
 			const SPtr<VertexDataDesc>& vertexDesc, IndexType indexType = IT_32BIT);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 	private:
 		UINT32 mNumVertices;
@@ -89,7 +89,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT MeshHeapCore : public CoreObjectCore
+	class BS_CORE_EXPORT MeshHeapCore : public CoreObject
 	{
 		/**	Signifies how is a data chunk used. */
 		enum class UseFlags
@@ -135,7 +135,7 @@ namespace bs
 		MeshHeapCore(UINT32 numVertices, UINT32 numIndices, 
 			const SPtr<VertexDataDesc>& vertexDesc, IndexType indexType, GpuDeviceFlags deviceMask);
 
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/**

Source/BansheeCore/Include/BsPass.h

@@ -181,7 +181,7 @@ namespace bs
 		CoreSyncData syncToCore(FrameAlloc* allocator) override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::syncToCore */
 		void getCoreDependencies(Vector<CoreObject*>& dependencies) override;
@@ -211,7 +211,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT PassCore : public CoreObjectCore, public TPass<true>
+	class BS_CORE_EXPORT PassCore : public CoreObject, public TPass<true>
     {
     public:
 		virtual ~PassCore() { }
@@ -223,7 +223,7 @@ namespace bs
 		friend class Pass;
 		friend class TechniqueCore;
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		PassCore() { }
@@ -231,7 +231,7 @@ namespace bs
 		PassCore(const PASS_DESC& desc, const SPtr<GraphicsPipelineStateCore>& pipelineState);
 		PassCore(const PASS_DESC& desc, const SPtr<ComputePipelineStateCore>& pipelineState);
 
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;
     };
 

Source/BansheeCore/Include/BsRasterizerState.h

@@ -150,7 +150,7 @@ namespace bs
 		RasterizerState(const RASTERIZER_STATE_DESC& desc);
 		
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		RasterizerProperties mProperties;
 		mutable UINT32 mId;
@@ -178,7 +178,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT RasterizerStateCore : public CoreObjectCore
+	class BS_CORE_EXPORT RasterizerStateCore : public CoreObject
 	{
 	public:
 		virtual ~RasterizerStateCore();
@@ -200,7 +200,7 @@ namespace bs
 
 		RasterizerStateCore(const RASTERIZER_STATE_DESC& desc, UINT32 id);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Creates any API-specific state objects. */

Source/BansheeCore/Include/BsRenderTarget.h

@@ -201,7 +201,7 @@ namespace bs
 	 *
 	 * @note	Core thread only.
 	 */
-	class BS_CORE_EXPORT RenderTargetCore : public CoreObjectCore
+	class BS_CORE_EXPORT RenderTargetCore : public CoreObject
 	{
 	public:
 		/** Frame buffer type when double-buffering is used. */

Source/BansheeCore/Include/BsRenderTexture.h

@@ -84,7 +84,7 @@ namespace bs
 		RenderTexture(const RENDER_TEXTURE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::syncToCore */
 		CoreSyncData syncToCore(FrameAlloc* allocator) override;
@@ -126,7 +126,7 @@ namespace bs
 		RenderTextureCore(const RENDER_TEXTURE_DESC& desc, UINT32 deviceIdx);
 		virtual ~RenderTextureCore();
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc TextureManager::createRenderTexture(const RENDER_TEXTURE_DESC&, UINT32) */
@@ -150,7 +150,7 @@ namespace bs
 		const RenderTextureProperties& getProperties() const;
 
 	protected:
-		/** @copydoc CoreObjectCore::syncToCore */
+		/** @copydoc CoreObject::syncToCore */
 		void syncToCore(const CoreSyncData& data) override;
 
 	private:

Source/BansheeCore/Include/BsRenderWindow.h

@@ -199,7 +199,7 @@ namespace bs
 		RenderWindowProperties& getMutableProperties();
 
 		/** @copydoc RenderTarget::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/**	Updates window properties from the synced property data. */
 		virtual void syncProperties() = 0;

Source/BansheeCore/Include/BsSamplerState.h

@@ -156,7 +156,7 @@ namespace bs
 		SamplerState(const SAMPLER_STATE_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		SamplerProperties mProperties;
 
@@ -185,7 +185,7 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT SamplerStateCore : public CoreObjectCore
+	class BS_CORE_EXPORT SamplerStateCore : public CoreObject
 	{
 	public:
 		virtual ~SamplerStateCore();
@@ -204,7 +204,7 @@ namespace bs
 
 		SamplerStateCore(const SAMPLER_STATE_DESC& desc, GpuDeviceFlags deviceMask);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Creates any API-specific state objects. */

Source/BansheeCore/Include/BsShader.h

@@ -437,7 +437,7 @@ namespace bs
 		void getCoreDependencies(Vector<CoreObject*>& dependencies) override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** Converts a sim thread version of the shader descriptor to a core thread version. */
 		ct::SHADER_DESC convertDesc(const SHADER_DESC& desc) const;
@@ -483,7 +483,7 @@ namespace bs
 	 */
 
 	/** Core thread version of Shader. */
-	class BS_CORE_EXPORT ShaderCore : public CoreObjectCore, public TShader<true>
+	class BS_CORE_EXPORT ShaderCore : public CoreObject, public TShader<true>
 	{
 	public:
 		/** @copydoc Shader::create */

Source/BansheeCore/Include/BsTechnique.h

@@ -118,7 +118,7 @@ namespace bs
 
 	protected:
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc CoreObject::getCoreDependencies */
 		void getCoreDependencies(Vector<CoreObject*>& dependencies) override;
@@ -149,7 +149,7 @@ namespace bs
 	 */
 
 	/** Core thread version of Technique. */
-	class BS_CORE_EXPORT TechniqueCore : public CoreObjectCore, public TTechnique<true>
+	class BS_CORE_EXPORT TechniqueCore : public CoreObject, public TTechnique<true>
 	{
 	public:
 		TechniqueCore(const String& language, const StringID& renderer, const Vector<StringID>& tags,

Source/BansheeCore/Include/BsTexture.h

@@ -262,7 +262,7 @@ namespace bs
 		void initialize() override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** Calculates the size of the texture, in bytes. */
 		UINT32 calculateSize() const;
@@ -306,14 +306,14 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT TextureCore : public CoreObjectCore
+	class BS_CORE_EXPORT TextureCore : public CoreObject
 	{
 	public:
 		TextureCore(const TEXTURE_DESC& desc, const SPtr<PixelData>& initData, GpuDeviceFlags deviceMask);
 		virtual ~TextureCore() {}
 
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**

Source/BansheeCore/Include/BsTransientMesh.h

@@ -42,7 +42,7 @@ namespace bs
 		void markAsDestroyed() { mIsDestroyed = true; }
 
 		/** @copydoc RenderTarget::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 	protected:
 		bool mIsDestroyed;

Source/BansheeCore/Include/BsVertexBuffer.h

@@ -64,7 +64,7 @@ namespace bs
 		VertexBuffer(const VERTEX_BUFFER_DESC& desc);
 
 		/** @copydoc CoreObject::createCore */
-		virtual SPtr<ct::CoreObjectCore> createCore() const;
+		virtual SPtr<ct::CoreObject> createCore() const;
 
 	protected:
 		VertexBufferProperties mProperties;
@@ -81,7 +81,7 @@ namespace bs
 	 */
 
 	/** Core thread specific implementation of a VertexBuffer. */
-	class BS_CORE_EXPORT VertexBufferCore : public CoreObjectCore, public HardwareBuffer
+	class BS_CORE_EXPORT VertexBufferCore : public CoreObject, public HardwareBuffer
 	{
 	public:
 		VertexBufferCore(const VERTEX_BUFFER_DESC& desc, GpuDeviceFlags deviceMask = GDF_DEFAULT);

Source/BansheeCore/Include/BsVertexDeclaration.h

@@ -186,7 +186,7 @@ namespace bs
 		VertexDeclaration(const List<VertexElement>& elements);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 	protected:
 		VertexDeclarationProperties mProperties;
@@ -219,12 +219,12 @@ namespace bs
 	 *
 	 * @note	Core thread.
 	 */
-	class BS_CORE_EXPORT VertexDeclarationCore : public CoreObjectCore
+	class BS_CORE_EXPORT VertexDeclarationCore : public CoreObject
     {
 	public:
 		virtual ~VertexDeclarationCore() { }
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Returns properties describing the vertex declaration. */

Source/BansheeCore/Include/BsViewport.h

@@ -167,7 +167,7 @@ namespace bs
 		void getCoreDependencies(Vector<CoreObject*>& dependencies) override;
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
         SPtr<RenderTarget> mTarget;
 
@@ -193,7 +193,7 @@ namespace bs
 	 */
 
 	/** @copydoc ViewportBase */
-	class BS_CORE_EXPORT ViewportCore : public CoreObjectCore, public ViewportBase
+	class BS_CORE_EXPORT ViewportCore : public CoreObject, public ViewportBase
     {
     public:       
         /**	Returns the render target the viewport is associated with. */

Source/BansheeCore/Source/BsBlendState.cpp

@@ -110,7 +110,7 @@ namespace bs
 		return std::static_pointer_cast<ct::BlendStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> BlendState::createCore() const
+	SPtr<ct::CoreObject> BlendState::createCore() const
 	{
 		SPtr<ct::BlendStateCore> core = ct::RenderStateManager::instance()._createBlendState(mProperties.mData);
 		mId = core->getId(); // Accessing core from sim thread is okay here since core ID is immutable
@@ -189,7 +189,7 @@ namespace bs
 			return;
 
 		createInternal();
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	const BlendProperties& BlendStateCore::getProperties() const

Source/BansheeCore/Source/BsCamera.cpp

@@ -754,7 +754,7 @@ namespace bs
 		return handlerPtr;
 	}
 
-	SPtr<ct::CoreObjectCore> Camera::createCore() const
+	SPtr<ct::CoreObject> Camera::createCore() const
 	{
 		ct::CameraCore* handler = new (bs_alloc<ct::CameraCore>()) ct::CameraCore(mViewport->getCore());
 		SPtr<ct::CameraCore> handlerPtr = bs_shared_ptr<ct::CameraCore>(handler);
@@ -888,7 +888,7 @@ namespace bs
 	{
 		RendererManager::instance().getActive()->notifyCameraAdded(this);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	Rect2I CameraCore::getViewportRect() const

Source/BansheeCore/Source/BsCoreObject.cpp

@@ -43,7 +43,7 @@ namespace bs
 		{
 			assert(BS_THREAD_CURRENT_ID != CoreThread::instance().getCoreThreadId() && "Cannot destroy sim thead object from core thread.");
 
-			// This will only destroy the CoreObjectCore if this was the last reference
+			// This will only destroy the ct::CoreObject if this was the last reference
 			queueDestroyGpuCommand(mCoreSpecific);
 		}
 
@@ -110,7 +110,7 @@ namespace bs
 		mThis = ptrThis;
 	}
 
-	void CoreObject::queueGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void()> func)
+	void CoreObject::queueGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void()> func)
 	{
 		// We call another internal method and go through an additional layer of abstraction in order to keep an active
 		// reference to the obj (saved in the bound function).
@@ -119,37 +119,37 @@ namespace bs
 		gCoreThread().queueCommand(std::bind(&CoreObject::executeGpuCommand, obj, func));
 	}
 
-	AsyncOp CoreObject::queueReturnGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void(AsyncOp&)> func)
+	AsyncOp CoreObject::queueReturnGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void(AsyncOp&)> func)
 	{
 		// See queueGpuCommand
 		return gCoreThread().queueReturnCommand(std::bind(&CoreObject::executeReturnGpuCommand, obj, func, _1));
 	}
 
-	void CoreObject::queueInitializeGpuCommand(const SPtr<ct::CoreObjectCore>& obj)
+	void CoreObject::queueInitializeGpuCommand(const SPtr<ct::CoreObject>& obj)
 	{
-		std::function<void()> func = std::bind(&ct::CoreObjectCore::initialize, obj.get());
+		std::function<void()> func = std::bind(&ct::CoreObject::initialize, obj.get());
 
 		CoreThread::instance().queueCommand(std::bind(&CoreObject::executeGpuCommand, obj, func), CTQF_InternalQueue);
 	}
 
-	void CoreObject::queueDestroyGpuCommand(const SPtr<ct::CoreObjectCore>& obj)
+	void CoreObject::queueDestroyGpuCommand(const SPtr<ct::CoreObject>& obj)
 	{
 		std::function<void()> func = [&](){}; // Do nothing function. We just need the shared pointer to stay alive until it reaches the core thread
 
 		gCoreThread().queueCommand(std::bind(&CoreObject::executeGpuCommand, obj, func));
 	}
 
-	void CoreObject::executeGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void()> func)
+	void CoreObject::executeGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void()> func)
 	{
-		volatile SPtr<ct::CoreObjectCore> objParam = obj; // Makes sure obj isn't optimized out?
+		volatile SPtr<ct::CoreObject> objParam = obj; // Makes sure obj isn't optimized out?
 
 		func();
 	}
 
-	void CoreObject::executeReturnGpuCommand(const SPtr<ct::CoreObjectCore>& obj, std::function<void(AsyncOp&)> func, 
+	void CoreObject::executeReturnGpuCommand(const SPtr<ct::CoreObject>& obj, std::function<void(AsyncOp&)> func, 
 		AsyncOp& op)
 	{
-		volatile SPtr<ct::CoreObjectCore> objParam = obj; // Makes sure obj isn't optimized out?
+		volatile SPtr<ct::CoreObject> objParam = obj; // Makes sure obj isn't optimized out?
 
 		func(op);
 	}

Source/BansheeCore/Source/BsCoreObjectCore.cpp

@@ -7,19 +7,19 @@ namespace bs
 {
 	namespace ct 
 	{
-	Signal CoreObjectCore::mCoreGpuObjectLoadedCondition;
-	Mutex CoreObjectCore::mCoreGpuObjectLoadedMutex;
+	Signal CoreObject::mCoreGpuObjectLoadedCondition;
+	Mutex CoreObject::mCoreGpuObjectLoadedMutex;
 
-	CoreObjectCore::CoreObjectCore()
+	CoreObject::CoreObject()
 		:mFlags(0)
 	{ }
 
-	CoreObjectCore::~CoreObjectCore()
+	CoreObject::~CoreObject()
 	{ 
 		THROW_IF_NOT_CORE_THREAD;
 	}
 
-	void CoreObjectCore::initialize()
+	void CoreObject::initialize()
 	{
 		{
 			Lock lock(mCoreGpuObjectLoadedMutex);
@@ -31,7 +31,7 @@ namespace bs
 		mCoreGpuObjectLoadedCondition.notify_all();
 	}
 
-	void CoreObjectCore::synchronize()
+	void CoreObject::synchronize()
 	{
 		if (!isInitialized())
 		{
@@ -51,7 +51,7 @@ namespace bs
 		}
 	}
 
-	void CoreObjectCore::_setThisPtr(SPtr<CoreObjectCore> ptrThis)
+	void CoreObject::_setThisPtr(SPtr<CoreObject> ptrThis)
 	{
 		mThis = ptrThis;
 	}

Source/BansheeCore/Source/BsCoreObjectManager.cpp

@@ -58,7 +58,7 @@ namespace bs
 
 			if (isDirty)
 			{
-				SPtr<ct::CoreObjectCore> coreObject = object->getCore();
+				SPtr<ct::CoreObject> coreObject = object->getCore();
 				if (coreObject != nullptr)
 				{
 					CoreSyncData objSyncData = object->syncToCore(gCoreThread().getFrameAlloc());
@@ -215,7 +215,7 @@ namespace bs
 	{
 		struct IndividualCoreSyncData
 		{
-			SPtr<ct::CoreObjectCore> destination;
+			SPtr<ct::CoreObject> destination;
 			CoreSyncData syncData;
 			FrameAlloc* allocator;
 		};
@@ -244,7 +244,7 @@ namespace bs
 					syncObject(dependency);
 			}
 
-			SPtr<ct::CoreObjectCore> objectCore = curObj->getCore();
+			SPtr<ct::CoreObject> objectCore = curObj->getCore();
 			if (objectCore == nullptr)
 			{
 				curObj->markCoreClean();
@@ -347,7 +347,7 @@ namespace bs
 						syncObject(dependency);
 				}
 
-				SPtr<ct::CoreObjectCore> objectCore = curObj->getCore();
+				SPtr<ct::CoreObject> objectCore = curObj->getCore();
 				if (objectCore == nullptr)
 				{
 					curObj->markCoreClean();
@@ -387,7 +387,7 @@ namespace bs
 
 		for (auto& objSyncData : syncData.entries)
 		{
-			SPtr<ct::CoreObjectCore> destinationObj = objSyncData.destinationObj;
+			SPtr<ct::CoreObject> destinationObj = objSyncData.destinationObj;
 			if (destinationObj != nullptr)
 				destinationObj->syncToCore(objSyncData.syncData);
 

Source/BansheeCore/Source/BsDepthStencilState.cpp

@@ -49,7 +49,7 @@ namespace bs
 		return std::static_pointer_cast<ct::DepthStencilStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> DepthStencilState::createCore() const
+	SPtr<ct::CoreObject> DepthStencilState::createCore() const
 	{
 		SPtr<ct::DepthStencilStateCore> core = ct::RenderStateManager::instance()._createDepthStencilState(mProperties.mData);
 		mId = core->getId(); // Accessing core from sim thread is okay here since core ID is immutable
@@ -128,7 +128,7 @@ namespace bs
 			return;
 
 		createInternal();
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	const DepthStencilProperties& DepthStencilStateCore::getProperties() const

Source/BansheeCore/Source/BsGpuBuffer.cpp

@@ -36,7 +36,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GpuBufferCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GpuBuffer::createCore() const
+	SPtr<ct::CoreObject> GpuBuffer::createCore() const
 	{
 		return ct::HardwareBufferManager::instance().createGpuBufferInternal(mProperties.mDesc);
 	}

Source/BansheeCore/Source/BsGpuParamBlockBuffer.cpp

@@ -70,7 +70,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GpuParamBlockBufferCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GpuParamBlockBuffer::createCore() const
+	SPtr<ct::CoreObject> GpuParamBlockBuffer::createCore() const
 	{
 		return ct::HardwareBufferManager::instance().createGpuParamBlockBufferInternal(mSize, mUsage);
 	}

Source/BansheeCore/Source/BsGpuParams.cpp

@@ -562,7 +562,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GpuParamsCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GpuParams::createCore() const
+	SPtr<ct::CoreObject> GpuParams::createCore() const
 	{
 		SPtr<GpuPipelineParamInfo> paramInfo = std::static_pointer_cast<GpuPipelineParamInfo>(mParamInfo);
 

Source/BansheeCore/Source/BsGpuPipelineParamInfo.cpp

@@ -235,7 +235,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GpuPipelineParamInfoCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GpuPipelineParamInfo::createCore() const
+	SPtr<ct::CoreObject> GpuPipelineParamInfo::createCore() const
 	{
 		GPU_PIPELINE_PARAMS_DESC desc;
 		desc.fragmentParams = mParamDescs[GPT_FRAGMENT_PROGRAM];

Source/BansheeCore/Source/BsGpuPipelineState.cpp

@@ -78,7 +78,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GraphicsPipelineStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GraphicsPipelineState::createCore() const
+	SPtr<ct::CoreObject> GraphicsPipelineState::createCore() const
 	{
 		ct::PIPELINE_STATE_DESC desc;
 		convertPassDesc(mData, desc);
@@ -118,7 +118,7 @@ namespace bs
 		return std::static_pointer_cast<ct::ComputePipelineStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> ComputePipelineState::createCore() const
+	SPtr<ct::CoreObject> ComputePipelineState::createCore() const
 	{
 		return ct::RenderStateManager::instance()._createComputePipelineState(mProgram->getCore());
 	}
@@ -154,7 +154,7 @@ namespace bs
 
 		mParamInfo = GpuPipelineParamInfoCore::create(paramsDesc, mDeviceMask);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	SPtr<GraphicsPipelineStateCore> GraphicsPipelineStateCore::create(const PIPELINE_STATE_DESC& desc, GpuDeviceFlags deviceMask)
@@ -173,7 +173,7 @@ namespace bs
 
 		mParamInfo = GpuPipelineParamInfoCore::create(paramsDesc, mDeviceMask);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	SPtr<ComputePipelineStateCore> ComputePipelineStateCore::create(const SPtr<GpuProgramCore>& program, 

Source/BansheeCore/Source/BsGpuProgram.cpp

@@ -41,7 +41,7 @@ namespace bs
 		return std::static_pointer_cast<ct::GpuProgramCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> GpuProgram::createCore() const
+	SPtr<ct::CoreObject> GpuProgram::createCore() const
 	{
 		GPU_PROGRAM_DESC desc;
 		desc.source = mProperties.getSource();

Source/BansheeCore/Source/BsIndexBuffer.cpp

@@ -33,7 +33,7 @@ namespace bs
 		return std::static_pointer_cast<ct::IndexBufferCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> IndexBuffer::createCore() const
+	SPtr<ct::CoreObject> IndexBuffer::createCore() const
 	{
 		INDEX_BUFFER_DESC desc;
 		desc.indexType = mProperties.mIndexType;

Source/BansheeCore/Source/BsMaterial.cpp

@@ -409,7 +409,7 @@ namespace bs
 		return std::static_pointer_cast<ct::MaterialCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> Material::createCore() const
+	SPtr<ct::CoreObject> Material::createCore() const
 	{
 		ct::MaterialCore* material = nullptr;
 

Source/BansheeCore/Source/BsMesh.cpp

@@ -113,7 +113,7 @@ namespace bs
 		return std::static_pointer_cast<ct::MeshCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> Mesh::createCore() const
+	SPtr<ct::CoreObject> Mesh::createCore() const
 	{
 		MESH_DESC desc;
 		desc.numVertices = mProperties.mNumVertices;
@@ -127,7 +127,7 @@ namespace bs
 
 		ct::MeshCore* obj = new (bs_alloc<ct::MeshCore>()) ct::MeshCore(mCPUData, desc, GDF_DEFAULT);
 
-		SPtr<ct::CoreObjectCore> meshCore = bs_shared_ptr<ct::MeshCore>(obj);
+		SPtr<ct::CoreObject> meshCore = bs_shared_ptr<ct::MeshCore>(obj);
 		meshCore->_setThisPtr(meshCore);
 
 		if ((mUsage & MU_CPUCACHED) == 0)

Source/BansheeCore/Source/BsMeshHeap.cpp

@@ -67,7 +67,7 @@ namespace bs
 		return std::static_pointer_cast<ct::MeshHeapCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> MeshHeap::createCore() const
+	SPtr<ct::CoreObject> MeshHeap::createCore() const
 	{
 		ct::MeshHeapCore* obj = new (bs_alloc<ct::MeshHeapCore>()) ct::MeshHeapCore(mNumVertices, mNumIndices,
 			mVertexDesc, mIndexType, GDF_DEFAULT);
@@ -115,7 +115,7 @@ namespace bs
 		growVertexBuffer(mNumVertices);
 		growIndexBuffer(mNumIndices);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	void MeshHeapCore::alloc(SPtr<TransientMeshCore> mesh, const SPtr<MeshData>& meshData)

Source/BansheeCore/Source/BsPass.cpp

@@ -104,7 +104,7 @@ namespace bs
 		return std::static_pointer_cast<ct::PassCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> Pass::createCore() const
+	SPtr<ct::CoreObject> Pass::createCore() const
 	{
 		ct::PASS_DESC desc;
 		convertPassDesc(mData, desc);
@@ -255,7 +255,7 @@ namespace bs
 			}
 		}
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	void PassCore::syncToCore(const CoreSyncData& data)

Source/BansheeCore/Source/BsRasterizerState.cpp

@@ -41,7 +41,7 @@ namespace bs
 		return std::static_pointer_cast<ct::RasterizerStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> RasterizerState::createCore() const
+	SPtr<ct::CoreObject> RasterizerState::createCore() const
 	{
 		SPtr<ct::RasterizerStateCore> core = ct::RenderStateManager::instance()._createRasterizerState(mProperties.mData);
 		mId = core->getId(); // Accessing core from sim thread is okay here since core ID is immutable
@@ -115,7 +115,7 @@ namespace bs
 			return;
 
 		createInternal();
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	const RasterizerProperties& RasterizerStateCore::getProperties() const

Source/BansheeCore/Source/BsRenderTexture.cpp

@@ -88,7 +88,7 @@ namespace bs
 			mBindableDepthStencilTex = desc.depthStencilSurface.texture;
 	}
 
-	SPtr<ct::CoreObjectCore> RenderTexture::createCore() const
+	SPtr<ct::CoreObject> RenderTexture::createCore() const
 	{
 		ct::RENDER_TEXTURE_DESC coreDesc;
 

Source/BansheeCore/Source/BsRenderWindow.cpp

@@ -211,7 +211,7 @@ namespace bs
 		return std::static_pointer_cast<ct::RenderWindowCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> RenderWindow::createCore() const
+	SPtr<ct::CoreObject> RenderWindow::createCore() const
 	{
 		RENDER_WINDOW_DESC desc = mDesc;
 		return ct::RenderWindowManager::instance().createInternal(desc, mWindowId);

Source/BansheeCore/Source/BsSamplerState.cpp

@@ -60,7 +60,7 @@ namespace bs
 		return std::static_pointer_cast<ct::SamplerStateCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> SamplerState::createCore() const
+	SPtr<ct::CoreObject> SamplerState::createCore() const
 	{
 		return ct::RenderStateManager::instance()._createSamplerState(mProperties.mData);
 	}
@@ -135,7 +135,7 @@ namespace bs
 			return;
 
 		createInternal();
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	const SamplerProperties& SamplerStateCore::getProperties() const

Source/BansheeCore/Source/BsShader.cpp

@@ -336,7 +336,7 @@ namespace bs
 		meta->includes = includes;
 	}
 
-	SPtr<ct::CoreObjectCore> Shader::createCore() const
+	SPtr<ct::CoreObject> Shader::createCore() const
 	{
 		Vector<SPtr<ct::TechniqueCore>> techniques;
 		for (auto& technique : mTechniques)

Source/BansheeCore/Source/BsTechnique.cpp

@@ -77,7 +77,7 @@ namespace bs
 		return std::static_pointer_cast<ct::TechniqueCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> Technique::createCore() const
+	SPtr<ct::CoreObject> Technique::createCore() const
 	{
 		Vector<SPtr<ct::PassCore>> passes;
 		for (auto& pass : mPasses)

Source/BansheeCore/Source/BsTexture.cpp

@@ -104,11 +104,11 @@ namespace bs
 		Resource::initialize();
 	}
 
-	SPtr<ct::CoreObjectCore> Texture::createCore() const
+	SPtr<ct::CoreObject> Texture::createCore() const
 	{
 		const TextureProperties& props = getProperties();
 
-		SPtr<ct::CoreObjectCore> coreObj = ct::TextureManager::instance().createTextureInternal(props.mDesc, mInitData);
+		SPtr<ct::CoreObject> coreObj = ct::TextureManager::instance().createTextureInternal(props.mDesc, mInitData);
 
 		if ((mProperties.getUsage() & TU_CPUCACHED) == 0)
 			mInitData = nullptr;

Source/BansheeCore/Source/BsTransientMesh.cpp

@@ -28,12 +28,12 @@ namespace bs
 		return std::static_pointer_cast<ct::TransientMeshCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> TransientMesh::createCore() const
+	SPtr<ct::CoreObject> TransientMesh::createCore() const
 	{
 		ct::TransientMeshCore* core = new (bs_alloc<ct::TransientMeshCore>()) ct::TransientMeshCore(
 			mParentHeap->getCore(), mId, mProperties.mNumVertices, mProperties.mNumIndices, mProperties.mSubMeshes);
 
-		SPtr<ct::CoreObjectCore> meshCore = bs_shared_ptr<ct::TransientMeshCore>(core);
+		SPtr<ct::CoreObject> meshCore = bs_shared_ptr<ct::TransientMeshCore>(core);
 		meshCore->_setThisPtr(meshCore);
 
 		return meshCore;

Source/BansheeCore/Source/BsVertexBuffer.cpp

@@ -15,7 +15,7 @@ namespace bs
 
     }
 
-	SPtr<ct::CoreObjectCore> VertexBuffer::createCore() const
+	SPtr<ct::CoreObject> VertexBuffer::createCore() const
 	{
 		VERTEX_BUFFER_DESC desc;
 		desc.vertexSize = mProperties.mVertexSize;

Source/BansheeCore/Source/BsVertexDeclaration.cpp

@@ -259,7 +259,7 @@ namespace bs
 		return std::static_pointer_cast<ct::VertexDeclarationCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> VertexDeclaration::createCore() const
+	SPtr<ct::CoreObject> VertexDeclaration::createCore() const
 	{
 		return ct::HardwareBufferManager::instance().createVertexDeclarationInternal(mProperties.mElementList);
 	}
@@ -329,7 +329,7 @@ namespace bs
 	void VertexDeclarationCore::initialize()
 	{
 		mId = NextFreeId++;
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	SPtr<VertexDeclarationCore> VertexDeclarationCore::create(const SPtr<VertexDataDesc>& desc, GpuDeviceFlags deviceMask)

Source/BansheeCore/Source/BsViewport.cpp

@@ -125,7 +125,7 @@ namespace bs
 		return 0;
 	}
 
-	SPtr<ct::CoreObjectCore> Viewport::createCore() const
+	SPtr<ct::CoreObject> Viewport::createCore() const
 	{
 		SPtr<ct::RenderTargetCore> targetCore;
 		if (mTarget != nullptr)

Source/BansheeD3D11RenderAPI/Include/BsD3D11RenderWindow.h

@@ -137,7 +137,7 @@ namespace bs {
 	protected:
 		friend class bs::D3D11RenderWindow;
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/**	Creates internal resources dependent on window size. */

Source/BansheeD3D11RenderAPI/Include/BsD3D11Texture.h

@@ -37,7 +37,7 @@ namespace bs { namespace ct
 
 		D3D11Texture(const TEXTURE_DESC& desc, const SPtr<PixelData>& initialData, GpuDeviceFlags deviceMask);
 
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/** @copydoc TextureCore::lockImpl */

Source/BansheeEngine/Include/BsLight.h

@@ -234,7 +234,7 @@ namespace bs
 			bool castsShadows, Degree spotAngle, Degree spotFalloffAngle);
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc LightBase::_markCoreDirty */
 		void _markCoreDirty(LightDirtyFlag flag = LightDirtyFlag::Everything) override;
@@ -266,7 +266,7 @@ namespace bs
 	 *
 	 * @see		LightBase
 	 */
-	class BS_EXPORT LightCore : public CoreObjectCore, public LightBase
+	class BS_EXPORT LightCore : public CoreObject, public LightBase
 	{
 	public:
 		~LightCore();
@@ -288,7 +288,7 @@ namespace bs
 		LightCore(LightType type, Color color, float intensity, 
 			float range, bool castsShadows, Degree spotAngle, Degree spotFalloffAngle);
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc CoreObject::syncToCore */

Source/BansheeEngine/Include/BsRenderable.h

@@ -204,7 +204,7 @@ namespace bs
 		Renderable();
 
 		/** @copydoc CoreObject::createCore */
-		SPtr<ct::CoreObjectCore> createCore() const override;
+		SPtr<ct::CoreObject> createCore() const override;
 
 		/** @copydoc TRenderable::onMeshChanged */
 		void onMeshChanged() override;
@@ -254,7 +254,7 @@ namespace bs
 	namespace ct
 	{
 	/** @copydoc TRenderable */
-	class BS_EXPORT RenderableCore : public CoreObjectCore, public TRenderable<true>
+	class BS_EXPORT RenderableCore : public CoreObject, public TRenderable<true>
 	{
 	public:
 		~RenderableCore();

Source/BansheeEngine/Source/BsLight.cpp

@@ -161,7 +161,7 @@ namespace bs
 		return handlerPtr;
 	}
 
-	SPtr<ct::CoreObjectCore> Light::createCore() const
+	SPtr<ct::CoreObject> Light::createCore() const
 	{
 		ct::LightCore* handler = new (bs_alloc<ct::LightCore>())
 			ct::LightCore(mType, mColor, mIntensity, mRange, mCastsShadows, mSpotAngle, mSpotFalloffAngle);
@@ -256,7 +256,7 @@ namespace bs
 		updateBounds();
 		gRenderer()->notifyLightAdded(this);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	void LightCore::syncToCore(const CoreSyncData& data)

Source/BansheeEngine/Source/BsRenderable.cpp

@@ -197,7 +197,7 @@ namespace bs
 		return std::static_pointer_cast<ct::RenderableCore>(mCoreSpecific);
 	}
 
-	SPtr<ct::CoreObjectCore> Renderable::createCore() const
+	SPtr<ct::CoreObject> Renderable::createCore() const
 	{
 		ct::RenderableCore* handler = new (bs_alloc<ct::RenderableCore>()) ct::RenderableCore();
 		SPtr<ct::RenderableCore> handlerPtr = bs_shared_ptr<ct::RenderableCore>(handler);
@@ -438,7 +438,7 @@ namespace bs
 	{
 		gRenderer()->notifyRenderableAdded(this);
 
-		CoreObjectCore::initialize();
+		CoreObject::initialize();
 	}
 
 	Bounds RenderableCore::getBounds() const

Source/BansheeGLRenderAPI/Include/Win32/BsWin32RenderWindow.h

@@ -135,7 +135,7 @@ namespace bs
 	protected:
 		friend class Win32GLSupport;
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc RenderWindowCore::getProperties */

Source/BansheeVulkanRenderAPI/Include/BsVulkanRenderTexture.h

@@ -50,7 +50,7 @@ namespace bs
 		void getCustomAttribute(const String& name, void* data) const override;
 
 	protected:
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/** @copydoc RenderTextureCore::getProperties */

Source/BansheeVulkanRenderAPI/Include/BsVulkanTexture.h

@@ -194,7 +194,7 @@ namespace bs { namespace ct
 
 		VulkanTexture(const TEXTURE_DESC& desc, const SPtr<PixelData>& initialData, GpuDeviceFlags deviceMask);
 
-		/** @copydoc CoreObjectCore::initialize() */
+		/** @copydoc CoreObject::initialize() */
 		void initialize() override;
 
 		/** @copydoc TextureCore::lockImpl */

Source/BansheeVulkanRenderAPI/Include/Win32/BsWin32RenderWindow.h

@@ -132,7 +132,7 @@ namespace bs
 	protected:
 		friend class bs::Win32RenderWindow;
 
-		/** @copydoc CoreObjectCore::initialize */
+		/** @copydoc CoreObject::initialize */
 		void initialize() override;
 
 		/** @copydoc RenderWindowCore::getProperties */