diff --git a/src/Buildin/UnityComponents.cs b/src/Buildin/UnityComponent.cs
similarity index 100%
rename from src/Buildin/UnityComponents.cs
rename to src/Buildin/UnityComponent.cs
diff --git a/src/Buildin/UnityComponents.cs.meta b/src/Buildin/UnityComponent.cs.meta
similarity index 100%
rename from src/Buildin/UnityComponents.cs.meta
rename to src/Buildin/UnityComponent.cs.meta
diff --git a/src/Internal/Editor/UnityEditorUtility.cs b/src/Internal/Editor/UnityEditorUtility.cs
index 7dbe4b4..dc2b47d 100644
--- a/src/Internal/Editor/UnityEditorUtility.cs
+++ b/src/Internal/Editor/UnityEditorUtility.cs
@@ -120,11 +120,17 @@ namespace DCFApixels.DragonECS.Unity.Editors
             if (scriptsAssets.TryGetValue(type, out script) == false)
             {
                 script = null;
-                var guids = AssetDatabase.FindAssets($"{type.Name} t:MonoScript");
+                string name = type.Name;
+                int indexOf = name.LastIndexOf('`');
+                if(indexOf >= 0)
+                {
+                    name = name.Substring(0, indexOf);
+                }
+                var guids = AssetDatabase.FindAssets($"{name} t:MonoScript");
                 for (var i = 0; i < guids.Length; i++)
                 {
                     MonoScript textAsset = AssetDatabase.LoadAssetAtPath<MonoScript>(AssetDatabase.GUIDToAssetPath(guids[i]));
-                    if (textAsset != null && textAsset.name == type.Name)
+                    if (textAsset != null && textAsset.name == name)
                     {
                         script = textAsset;
                         break;