diff --git a/Source/Engine/Content/Assets/Model.cpp b/Source/Engine/Content/Assets/Model.cpp
index c57b9c7be..254a3cd11 100644
--- a/Source/Engine/Content/Assets/Model.cpp
+++ b/Source/Engine/Content/Assets/Model.cpp
@@ -979,7 +979,13 @@ Asset::LoadResult Model::load()
             ModelSDFHeader data;
             sdfStream.ReadBytes(&data, sizeof(data));
             if (!SDF.Texture)
-                SDF.Texture = GPUTexture::New();
+            {
+                String name;
+#if !BUILD_RELEASE
+                name = GetPath() + TEXT(".SDF");
+#endif
+                SDF.Texture = GPUDevice::Instance->CreateTexture(name);
+            }
             if (SDF.Texture->Init(GPUTextureDescription::New3D(data.Width, data.Height, data.Depth, data.Format, GPUTextureFlags::ShaderResource, data.MipLevels)))
                 return LoadResult::Failed;
             SDF.LocalToUVWMul = data.LocalToUVWMul;
diff --git a/Source/Engine/Graphics/GPUResource.h b/Source/Engine/Graphics/GPUResource.h
index 05f409b9c..94265a7b3 100644
--- a/Source/Engine/Graphics/GPUResource.h
+++ b/Source/Engine/Graphics/GPUResource.h
@@ -147,7 +147,8 @@ public:
         : _device(device)
     {
 #if GPU_ENABLE_RESOURCE_NAMING
-        GPUResource::_name = name;
+        if (name.HasChars())
+            GPUResource::_name = name;
 #endif
         device->AddResource(this);
     }
diff --git a/Source/Engine/Graphics/GPUSwapChain.cpp b/Source/Engine/Graphics/GPUSwapChain.cpp
index bd2ac858b..43a2582ca 100644
--- a/Source/Engine/Graphics/GPUSwapChain.cpp
+++ b/Source/Engine/Graphics/GPUSwapChain.cpp
@@ -35,6 +35,13 @@ public:
     }
 };
 
+GPUSwapChain::GPUSwapChain()
+{
+#if GPU_ENABLE_RESOURCE_NAMING
+    _name = TEXT("Swap Chain (backbuffers)");
+#endif
+}
+
 Task* GPUSwapChain::DownloadDataAsync(TextureData& result)
 {
     if (_downloadTask)
diff --git a/Source/Engine/Graphics/GPUSwapChain.h b/Source/Engine/Graphics/GPUSwapChain.h
index 738aeaf40..b4a8bd8bd 100644
--- a/Source/Engine/Graphics/GPUSwapChain.h
+++ b/Source/Engine/Graphics/GPUSwapChain.h
@@ -24,9 +24,7 @@ protected:
     Window* _window = nullptr;
     Task* _downloadTask = nullptr;
 
-    GPUSwapChain()
-    {
-    }
+    GPUSwapChain();
 
 public:
     /// <summary>
diff --git a/Source/Engine/Graphics/Models/SkinnedMesh.cpp b/Source/Engine/Graphics/Models/SkinnedMesh.cpp
index d7984d378..17c63ac8e 100644
--- a/Source/Engine/Graphics/Models/SkinnedMesh.cpp
+++ b/Source/Engine/Graphics/Models/SkinnedMesh.cpp
@@ -53,7 +53,7 @@ bool SkinnedMesh::Load(uint32 vertices, uint32 triangles, void* vb0, void* ib, b
 
     // Create vertex buffer
 #if GPU_ENABLE_RESOURCE_NAMING
-    vertexBuffer = GPUDevice::Instance->CreateBuffer(GetSkinnedModel()->ToString() + TEXT(".VB"));
+    vertexBuffer = GPUDevice::Instance->CreateBuffer(GetSkinnedModel()->GetPath() + TEXT(".VB"));
 #else
 	vertexBuffer = GPUDevice::Instance->CreateBuffer(String::Empty);
 #endif
@@ -62,7 +62,7 @@ bool SkinnedMesh::Load(uint32 vertices, uint32 triangles, void* vb0, void* ib, b
 
     // Create index buffer
 #if GPU_ENABLE_RESOURCE_NAMING
-    indexBuffer = GPUDevice::Instance->CreateBuffer(GetSkinnedModel()->ToString() + TEXT(".IB"));
+    indexBuffer = GPUDevice::Instance->CreateBuffer(GetSkinnedModel()->GetPath() + TEXT(".IB"));
 #else
 	indexBuffer = GPUDevice::Instance->CreateBuffer(String::Empty);
 #endif
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index 9d6969a92..54800f2c5 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -134,6 +134,9 @@ bool ModelTool::GenerateModelSDF(Model* inputModel, ModelData* modelData, float
             SAFE_DELETE_GPU_RESOURCE(outputSDF->Texture);
             return true;
         }
+#if !BUILD_RELEASE
+        outputSDF->Texture->SetName(TEXT("ModelSDF"));
+#endif
     }
 
     // TODO: support GPU to generate model SDF on-the-fly (if called during rendering)