diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImporter.cs
index 7b284db05..012993ced 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImporter.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImporter.cs
@@ -12,15 +12,15 @@ namespace UniGLTF
     {
         public MaterialImportParam GetMaterialParam(GltfParser parser, int i)
         {
-            if (!GltfUnlitMaterial.TryCreateParam(parser, i, out var param))
+            if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out var param))
             {
-                if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
+                if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
                 {
                     // fallback
 #if VRM_DEVELOP
                     Debug.LogWarning($"material: {i} out of range. fallback");
 #endif
-                    return new MaterialImportParam(GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
+                    return new MaterialImportParam(GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
                 }
             }
 
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs
similarity index 99%
rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs
rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs
index a9ff09904..99e98813a 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs
@@ -35,7 +35,7 @@ namespace UniGLTF
     /// _ZWrite
     ///
     /// </summary>
-    public static class GltfPBRMaterial
+    public static class GltfPbrMaterialImporter
     {
         public const string ShaderName = "Standard";
 
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs.meta
similarity index 100%
rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs.meta
rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs.meta
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs
index c72081b79..5f2baecc9 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs
@@ -38,7 +38,7 @@ namespace UniGLTF
                 // base color
                 if (m.pbrMetallicRoughness?.baseColorTexture != null)
                 {
-                    yield return GltfPBRMaterial.BaseColorTexture(parser, m);
+                    yield return GltfPbrMaterialImporter.BaseColorTexture(parser, m);
                 }
 
                 // metallic roughness
@@ -51,13 +51,13 @@ namespace UniGLTF
             // emission
             if (m.emissiveTexture != null)
             {
-                yield return GltfPBRMaterial.EmissiveTexture(parser, m);
+                yield return GltfPbrMaterialImporter.EmissiveTexture(parser, m);
             }
 
             // normal
             if (m.normalTexture != null)
             {
-                yield return GltfPBRMaterial.NormalTexture(parser, m);
+                yield return GltfPbrMaterialImporter.NormalTexture(parser, m);
             }
 
             // occlusion
@@ -70,7 +70,7 @@ namespace UniGLTF
             // metallicSmooth and occlusion
             if (metallicRoughnessTexture.HasValue || occlusionTexture.HasValue)
             {
-                yield return GltfPBRMaterial.StandardTexture(parser, m);
+                yield return GltfPbrMaterialImporter.StandardTexture(parser, m);
             }
         }
 
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
similarity index 98%
rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs
rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
index ea833944d..149570a6a 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
@@ -4,7 +4,7 @@ using VRMShaders;
 
 namespace UniGLTF
 {
-    public static class GltfUnlitMaterial
+    public static class GltfUnlitMaterialImporter
     {
         public const string ShaderName = "UniGLTF/UniUnlit";
 
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs.meta
similarity index 100%
rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs.meta
rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs.meta
diff --git a/Assets/VRM/Runtime/IO/VRMMaterialImporter.cs b/Assets/VRM/Runtime/IO/VRMMaterialImporter.cs
index ed25512e3..2032d1c8b 100644
--- a/Assets/VRM/Runtime/IO/VRMMaterialImporter.cs
+++ b/Assets/VRM/Runtime/IO/VRMMaterialImporter.cs
@@ -100,16 +100,16 @@ namespace VRM
             if (!TryCreateParam(parser, i, out MaterialImportParam param))
             {
                 // unlit
-                if (!GltfUnlitMaterial.TryCreateParam(parser, i, out param))
+                if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out param))
                 {
                     // pbr
-                    if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
+                    if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
                     {
                         // fallback
 #if VRM_DEVELOP
                         Debug.LogWarning($"material: {i} out of range. fallback");
 #endif
-                        return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
+                        return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
                     }
                 }
             }
diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialTextureImporter.cs b/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialTextureImporter.cs
index 586b88ba3..127f9a7e7 100644
--- a/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialTextureImporter.cs
+++ b/Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialTextureImporter.cs
@@ -62,7 +62,7 @@ namespace UniVRM10
         {
             try
             {
-                pair = GltfPBRMaterial.BaseColorTexture(parser, src);
+                pair = GltfPbrMaterialImporter.BaseColorTexture(parser, src);
                 return true;
             }
             catch (NullReferenceException)
@@ -81,7 +81,7 @@ namespace UniVRM10
         {
             try
             {
-                pair = GltfPBRMaterial.EmissiveTexture(parser, src);
+                pair = GltfPbrMaterialImporter.EmissiveTexture(parser, src);
                 return true;
             }
             catch (NullReferenceException)
@@ -101,7 +101,7 @@ namespace UniVRM10
         {
             try
             {
-                pair = GltfPBRMaterial.NormalTexture(parser, src);
+                pair = GltfPbrMaterialImporter.NormalTexture(parser, src);
                 return true;
             }
             catch (NullReferenceException)
diff --git a/Assets/VRM10/Runtime/IO/Vrm10MaterialImporter.cs b/Assets/VRM10/Runtime/IO/Vrm10MaterialImporter.cs
index b9196f20b..384fa7902 100644
--- a/Assets/VRM10/Runtime/IO/Vrm10MaterialImporter.cs
+++ b/Assets/VRM10/Runtime/IO/Vrm10MaterialImporter.cs
@@ -12,16 +12,16 @@ namespace UniVRM10
             if (!TryCreateMToonParam(parser, i, out MaterialImportParam param))
             {
                 // unlit
-                if (!GltfUnlitMaterial.TryCreateParam(parser, i, out param))
+                if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out param))
                 {
                     // pbr
-                    if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
+                    if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
                     {
                         // fallback
 #if VRM_DEVELOP
                         Debug.LogWarning($"material: {i} out of range. fallback");
 #endif
-                        return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
+                        return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
                     }
                 }
             }