diff --git a/src/servala/core/crd.py b/src/servala/core/crd.py
index bf22bcc..1c2bcef 100644
--- a/src/servala/core/crd.py
+++ b/src/servala/core/crd.py
@@ -51,7 +51,7 @@ def deslugify(title):
     if "_" in title:
         title.replace("_", " ")
         return title.title()
-    return re.sub(r"(?<!^)(?=[A-Z])", "_", title)
+    return re.sub(r"(?<!^)(?=[A-Z])", " ", title).capitalize()
 
 
 def get_django_field(
@@ -85,6 +85,8 @@ def get_django_field(
             max_length = field_schema.get("max_length") or 255
             if pattern := field_schema.get("pattern"):
                 kwargs["validators"].append(RegexValidator(regex=pattern))
+            if choices := field_schema.get("enum"):
+                kwargs["choices"] = ((choice, choice) for choice in choices)
             return models.CharField(max_length=max_length, **kwargs)
     elif field_type == "integer":
         return models.IntegerField(**kwargs)