diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java
index 0f27091..c561629 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java
@@ -25,11 +25,13 @@ public class ExtensionMain implements Extension {
         File[] files = source.listFiles();
         if (files != null) {
             for (File file : files) {
-                String id = "modelengine:" + file.getName();
+                String id = "modelengine:" + file.getName().toLowerCase();
                 GeyserUtils.addCustomEntity(id);
             }
         }
     }
+
+
     @Subscribe
     public void onPackLoad(GeyserLoadResourcePacksEvent event) {
 
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/GeneratorMain.java b/src/main/java/re/imc/geysermodelenginepackgenerator/GeneratorMain.java
index ed558c3..ee63a65 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/GeneratorMain.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/GeneratorMain.java
@@ -40,7 +40,7 @@ public class GeneratorMain {
                 if (file1.listFiles() == null) {
                     continue;
                 }
-                String modelId = file1.getName();
+                String modelId = file1.getName().toLowerCase();
 
                 entityMap.put(modelId, new Entity(modelId));
                 for (File e : file1.listFiles()) {
@@ -59,7 +59,6 @@ public class GeneratorMain {
                             }
 
                             if (isGeometryFile(json)) {
-                                System.out.println("G");
                                 Geometry geometry = new Geometry();
                                 geometry.load(json);
                                 geometry.setModelId(modelId);
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
index 8e630db..19af177 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
@@ -66,8 +66,8 @@ public class Animation {
                 }
                 if (name.startsWith("h_") || name.startsWith("hi_")) {
                     bones.add(name, new JsonParser().parse(HEAD_TEMPLATE));
+                    i++;
                 }
-                i++;
             }
         }
         if (i == 0) {
@@ -75,6 +75,7 @@ public class Animation {
         }
         GeneratorMain.entityMap
                         .get(modelId).setHasHeadAnimation(true);
+
         object.add("bones", bones);
         json.get("animations").getAsJsonObject().add("animation." + modelId + ".look_at_target", object);
     }
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
index 855c093..4d0d621 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
@@ -26,8 +26,9 @@ public class Entity {
                     "default": "%geometry%"
                   },
                   "animations": {
-                    "default": "animation.%geometry%.idle",
+                    "default": "animation.%entity_id%.idle",
                     "look_at_target": "%look_at_target%"
+                   
                   },
                   "scripts": {
                     "animate": [