diff --git a/Assets/UniGLTF/UniGLTF/Editor/Serialization/DeserializerGenerator.cs b/Assets/UniGLTF/UniGLTF/Editor/Serialization/DeserializerGenerator.cs
index 77099c19e..c4642d804 100644
--- a/Assets/UniGLTF/UniGLTF/Editor/Serialization/DeserializerGenerator.cs
+++ b/Assets/UniGLTF/UniGLTF/Editor/Serialization/DeserializerGenerator.cs
@@ -15,7 +15,7 @@ namespace UniGLTF
             get
             {
                 return Path.Combine(UnityEngine.Application.dataPath,
-                "VRM/UniGLTF/Scripts/IO/GltfDeserializer.g.cs");
+                "UniGLTF/UniGLTF/Scripts/IO/GltfDeserializer.g.cs");
             }
         }
 
diff --git a/Assets/UniGLTF/UniGLTF/Editor/Serialization/ExtensionSerialization.cs b/Assets/UniGLTF/UniGLTF/Editor/Serialization/ExtensionSerialization.cs
index 16c8e5f2c..ac2fe6031 100644
--- a/Assets/UniGLTF/UniGLTF/Editor/Serialization/ExtensionSerialization.cs
+++ b/Assets/UniGLTF/UniGLTF/Editor/Serialization/ExtensionSerialization.cs
@@ -16,7 +16,7 @@ namespace UniGLTF
 
         public string GenerateDeserializerCall(string callName, string argName)
         {
-            return $"new glTFExtension({argName})";
+            return $"new glTFExtensionImport({argName})";
         }
     }
 }
diff --git a/Assets/UniGLTF/UniGLTF/Editor/Serialization/SerializerGenerator.cs b/Assets/UniGLTF/UniGLTF/Editor/Serialization/SerializerGenerator.cs
index 8535763d2..a2bb1082f 100644
--- a/Assets/UniGLTF/UniGLTF/Editor/Serialization/SerializerGenerator.cs
+++ b/Assets/UniGLTF/UniGLTF/Editor/Serialization/SerializerGenerator.cs
@@ -19,7 +19,7 @@ namespace UniGLTF
             get
             {
                 return Path.Combine(UnityEngine.Application.dataPath,
-                "VRM/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs");
+                "UniGLTF/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs");
             }
         }
 
@@ -115,8 +115,6 @@ namespace UniGLTF
 using System;
 using System.Collections.Generic;
 using UniJSON;
-using UnityEngine;
-using VRM;
 
 namespace UniGLTF {
 
@@ -297,7 +295,7 @@ namespace UniGLTF {
                         {
 
                         }
-                        else if (fi.FieldType == typeof(glTF_KHR_materials_unlit))
+                        else if (fi.FieldType == typeof(glTFExtension))
                         {
 
                         }
diff --git a/Assets/UniGLTF/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs b/Assets/UniGLTF/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs
index 1addfff91..c38cbc992 100644
--- a/Assets/UniGLTF/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs
+++ b/Assets/UniGLTF/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using UniJSON;
-using UnityEngine;
 
 namespace UniGLTF {