diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs
index 58143cb66..b14d7fc82 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/MToonValidator.cs
@@ -16,15 +16,15 @@ namespace VRMShaders.VRM10.MToon10.Runtime
 
         public void Validate()
         {
-            var alphaMode = (AlphaMode) _material.GetInt(MToon10Prop.AlphaMode);
-            var zWriteMode = (TransparentWithZWriteMode) _material.GetInt(MToon10Prop.TransparentWithZWrite);
+            var alphaMode = (MToon10AlphaMode) _material.GetInt(MToon10Prop.AlphaMode);
+            var zWriteMode = (MToon10TransparentWithZWriteMode) _material.GetInt(MToon10Prop.TransparentWithZWrite);
             var renderQueueOffset = _material.GetInt(MToon10Prop.RenderQueueOffsetNumber);
-            var doubleSidedMode = (DoubleSidedMode) _material.GetInt(MToon10Prop.DoubleSided);
+            var doubleSidedMode = (MToon10DoubleSidedMode) _material.GetInt(MToon10Prop.DoubleSided);
             SetUnityShaderPassSettings(_material, alphaMode, zWriteMode, renderQueueOffset, doubleSidedMode);
             SetUnityShaderVariants(_material);
         }
 
-        private static void SetUnityShaderPassSettings(Material material, AlphaMode alphaMode, TransparentWithZWriteMode zWriteMode, int renderQueueOffset, DoubleSidedMode doubleSidedMode)
+        private static void SetUnityShaderPassSettings(Material material, MToon10AlphaMode alphaMode, MToon10TransparentWithZWriteMode zWriteMode, int renderQueueOffset, MToon10DoubleSidedMode doubleSidedMode)
         {
             material.SetInt(MToon10Prop.AlphaMode, (int) alphaMode);
             material.SetInt(MToon10Prop.TransparentWithZWrite, (int) zWriteMode);
@@ -32,7 +32,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime
 
             switch (alphaMode)
             {
-                case AlphaMode.Opaque:
+                case MToon10AlphaMode.Opaque:
                     material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.OpaqueValue);
                     material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.One);
                     material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.Zero);
@@ -42,7 +42,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime
                     renderQueueOffset = 0;
                     material.renderQueue = (int) RenderQueue.Geometry;
                     break;
-                case AlphaMode.Cutout:
+                case MToon10AlphaMode.Cutout:
                     material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentCutoutValue);
                     material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.One);
                     material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.Zero);
@@ -52,7 +52,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime
                     renderQueueOffset = 0;
                     material.renderQueue = (int) RenderQueue.AlphaTest;
                     break;
-                case AlphaMode.Transparent when zWriteMode == TransparentWithZWriteMode.Off:
+                case MToon10AlphaMode.Transparent when zWriteMode == MToon10TransparentWithZWriteMode.Off:
                     material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentValue);
                     material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha);
                     material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha);
@@ -62,7 +62,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime
                     renderQueueOffset = Mathf.Clamp(renderQueueOffset, -9, 0);
                     material.renderQueue = (int) RenderQueue.Transparent + renderQueueOffset;
                     break;
-                case AlphaMode.Transparent when zWriteMode == TransparentWithZWriteMode.On:
+                case MToon10AlphaMode.Transparent when zWriteMode == MToon10TransparentWithZWriteMode.On:
                     material.SetOverrideTag(UnityRenderTag.Key, UnityRenderTag.TransparentValue);
                     material.SetInt(MToon10Prop.UnitySrcBlend, (int) BlendMode.SrcAlpha);
                     material.SetInt(MToon10Prop.UnityDstBlend, (int) BlendMode.OneMinusSrcAlpha);
@@ -78,10 +78,10 @@ namespace VRMShaders.VRM10.MToon10.Runtime
 
             switch (doubleSidedMode)
             {
-                case DoubleSidedMode.Off:
+                case MToon10DoubleSidedMode.Off:
                     material.SetInt(MToon10Prop.UnityCullMode, (int) CullMode.Back);
                     break;
-                case DoubleSidedMode.On:
+                case MToon10DoubleSidedMode.On:
                     material.SetInt(MToon10Prop.UnityCullMode, (int) CullMode.Off);
                     break;
                 default:
@@ -92,7 +92,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime
             material.SetInt(MToon10Prop.RenderQueueOffsetNumber, renderQueueOffset);
         }
 
-        private static void SetUnityCullingSettings(Material material, DoubleSidedMode doubleSidedMode)
+        private static void SetUnityCullingSettings(Material material, MToon10DoubleSidedMode doubleSidedMode)
         {
 
         }
@@ -101,42 +101,42 @@ namespace VRMShaders.VRM10.MToon10.Runtime
         {
             material.SetKeyword(
                 UnityAlphaModeKeyword.AlphaTest,
-                (AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == AlphaMode.Cutout
+                (MToon10AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == MToon10AlphaMode.Cutout
             );
             material.SetKeyword(
                 UnityAlphaModeKeyword.AlphaBlend,
-                (AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == AlphaMode.Transparent
+                (MToon10AlphaMode) material.GetInt(MToon10Prop.AlphaMode) == MToon10AlphaMode.Transparent
             );
             material.SetKeyword(
                 UnityAlphaModeKeyword.AlphaPremultiply,
                 false
             );
             material.SetKeyword(
-                NormalMapKeyword.On,
+                MToon10NormalMapKeyword.On,
                 material.GetTexture(MToon10Prop.NormalTexture) != null
             );
             material.SetKeyword(
-                EmissiveMapKeyword.On,
+                MToon10EmissiveMapKeyword.On,
                 material.GetTexture(MToon10Prop.EmissiveTexture) != null
             );
             material.SetKeyword(
-                RimMapKeyword.On,
+                MToon10RimMapKeyword.On,
                 material.GetTexture(MToon10Prop.MatcapTexture) != null || // Matcap
                 material.GetTexture(MToon10Prop.RimMultiplyTexture) != null // Rim
             );
             material.SetKeyword(
-                ParameterMapKeyword.On,
+                MToon10ParameterMapKeyword.On,
                 material.GetTexture(MToon10Prop.ShadingShiftTexture) != null || // Shading Shift (R)
                 material.GetTexture(MToon10Prop.OutlineWidthMultiplyTexture) != null || // Outline Width (G)
                 material.GetTexture(MToon10Prop.UvAnimationMaskTexture) != null // UV Anim Mask (B)
             );
             material.SetKeyword(
-                OutlineModeKeyword.World,
-                (OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == OutlineMode.World
+                MToon10OutlineModeKeyword.World,
+                (MToon10OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == MToon10OutlineMode.World
             );
             material.SetKeyword(
-                OutlineModeKeyword.Screen,
-                (OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == OutlineMode.Screen
+                MToon10OutlineModeKeyword.Screen,
+                (MToon10OutlineMode) material.GetInt(MToon10Prop.OutlineWidthMode) == MToon10OutlineMode.Screen
             );
         }
     }
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs
similarity index 78%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs
index 801577b7f..fce84b9c8 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public enum AlphaMode
+    public enum MToon10AlphaMode
     {
         Opaque = 0,
         Cutout = 1,
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/AlphaMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs
similarity index 69%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs
index aef0bf38a..0f487f06c 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public enum DoubleSidedMode
+    public enum MToon10DoubleSidedMode
     {
         Off = 0,
         On = 1,
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/DoubleSidedMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs
similarity index 69%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs
index d528adb7f..e5885d888 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public static class EmissiveMapKeyword
+    public static class MToon10EmissiveMapKeyword
     {
         public const string On = "_MTOON_EMISSIVEMAP";
     }
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/EmissiveMapKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs
similarity index 68%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs
index d6e39c522..2ae3edc7a 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public static class NormalMapKeyword
+    public static class MToon10NormalMapKeyword
     {
         public const string On = "_NORMALMAP";
     }
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/NormalMapKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs
similarity index 76%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs
index 536403a30..05c2da674 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public enum OutlineMode
+    public enum MToon10OutlineMode
     {
         None = 0,
         World = 1,
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs
similarity index 78%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs
index d4f1f4e19..87ce3de3e 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public static class OutlineModeKeyword
+    public static class MToon10OutlineModeKeyword
     {
         public const string World = "_MTOON_OUTLINE_WORLD";
         public const string Screen = "_MTOON_OUTLINE_SCREEN";
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/OutlineModeKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs
similarity index 69%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs
index 7acea68a2..785e2c538 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public static class ParameterMapKeyword
+    public static class MToon10ParameterMapKeyword
     {
         public const string On = "_MTOON_PARAMETERMAP";
     }
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/ParameterMapKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs
similarity index 70%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs
index d9d19c698..0e81947d1 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public static class RimMapKeyword
+    public static class MToon10RimMapKeyword
     {
         public const string On = "_MTOON_RIMMAP";
     }
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/RimMapKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs
similarity index 65%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs
index 7c1194eb8..188d273c5 100644
--- a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs
@@ -1,6 +1,6 @@
 namespace VRMShaders.VRM10.MToon10.Runtime
 {
-    public enum TransparentWithZWriteMode
+    public enum MToon10TransparentWithZWriteMode
     {
         Off = 0,
         On = 1,
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValue/TransparentWithZWriteMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta
new file mode 100644
index 000000000..3b5652ab8
--- /dev/null
+++ b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d1d968d263d340c48c2bebaca85bbbbe
+timeCreated: 1623308194
\ No newline at end of file
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/MToon10Meta.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Prop.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/MToon10Properties.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaModeKeyword.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityAlphaToMaskMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityRenderTag.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs.meta
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs
diff --git a/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs.meta b/Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta
similarity index 100%
rename from Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/UnityDefinedValue/UnityZWriteMode.cs.meta
rename to Assets/VRMShaders/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs.meta