diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
index 64b5cfd..d1b6946 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Animation.java
@@ -87,7 +87,7 @@ public class Animation {
                 }
             }
 
-            newAnimations.add("animation." + modelId + "." + element.getKey(), element.getValue());
+            newAnimations.add("animation." + modelId + "." + element.getKey().replace(" ", "_"), element.getValue());
         }
         json.add("animations", newAnimations);
 
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java
index 8daff0e..d49ffd9 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java
@@ -51,7 +51,7 @@ public class AnimationController {
 
         Collections.sort(sorted);
         for (String id : sorted) {
-
+            id = id.replace(" ", "_");
             int n = (int) Math.pow(2, (i % 24));
             JsonObject controller = new JsonParser().parse(CONTROLLER_TEMPLATE.replace("%anim%", id).replace("%query%", "math.mod(math.floor(query.property('modelengine:anim" + i / 24 + "') / " + n + "), 2)")).getAsJsonObject();
             animationControllers.add("controller.animation." + animation.modelId + "." + id, controller);
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
index 9211da5..34d8f3e 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
@@ -112,6 +112,7 @@ public class Entity {
 
         if (animation != null) {
             for (String animation : animation.animationIds) {
+                animation = animation.replace(" ", "_");
                 String controller = "controller.animation." + modelId + "." + animation;
                 animate.add(animation + "_control");
                 jsonAnimations.addProperty(animation, "animation." + modelId + "." + animation);