diff --git a/common/src/main/java/ctbrec/AbstractModel.java b/common/src/main/java/ctbrec/AbstractModel.java
index 700a529b..e7d70b1f 100644
--- a/common/src/main/java/ctbrec/AbstractModel.java
+++ b/common/src/main/java/ctbrec/AbstractModel.java
@@ -27,6 +27,7 @@ public abstract class AbstractModel implements Model {
 
     private String url;
     private String name;
+    private String sanitizedName;
     private String displayName;
     private String preview;
     private String description;
@@ -65,6 +66,7 @@ public abstract class AbstractModel implements Model {
     @Override
     public void setName(String name) {
         this.name = name;
+        this.sanitizedName = Optional.ofNullable(getName()).orElse("").replaceAll("[^a-zA-Z0-9.-]", "_");
     }
 
     @Override
@@ -83,8 +85,7 @@ public abstract class AbstractModel implements Model {
 
     @Override
     public String getSanitizedNamed() {
-        String sanitizedName = Optional.ofNullable(getName()).orElse("");
-        return sanitizedName.replaceAll("[^a-zA-Z0-9.-]", "_");
+        return sanitizedName;
     }
 
     @Override