diff --git a/layerindex/admin.py b/layerindex/admin.py
index 4a89062..7e93674 100644
--- a/layerindex/admin.py
+++ b/layerindex/admin.py
@@ -89,7 +89,7 @@ class LayerUpdateAdmin(admin.ModelAdmin):
 class RecipeAdmin(admin.ModelAdmin):
     search_fields = ['filename', 'pn']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = [fieldname for fieldname in Recipe._meta.get_all_field_names() if fieldname not in  ['recipefiledependency', 'classicrecipe', 'packageconfig']]
+    readonly_fields = [f.name for f in Recipe._meta.get_fields() if f.name not in ['recipefiledependency', 'classicrecipe', 'packageconfig']]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
@@ -110,7 +110,7 @@ class DynamicBuildDepAdmin(admin.ModelAdmin):
 class ClassicRecipeAdmin(admin.ModelAdmin):
     search_fields = ['filename', 'pn']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = [fieldname for fieldname in Recipe._meta.get_all_field_names() if fieldname not in ['recipefiledependency', 'packageconfig']]
+    readonly_fields = [f.name for f in ClassicRecipe._meta.get_fields() if f.name not in ['recipefiledependency', 'packageconfig']]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
@@ -119,7 +119,7 @@ class ClassicRecipeAdmin(admin.ModelAdmin):
 class MachineAdmin(admin.ModelAdmin):
     search_fields = ['name']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = Machine._meta.get_all_field_names()
+    readonly_fields = [f.name for f in Machine._meta.get_fields()]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
@@ -128,7 +128,7 @@ class MachineAdmin(admin.ModelAdmin):
 class DistroAdmin(admin.ModelAdmin):
     search_fields = ['name']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = Distro._meta.get_all_field_names()
+    readonly_fields = [f.name for f in Distro._meta.get_fields()]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
@@ -138,7 +138,7 @@ class DistroAdmin(admin.ModelAdmin):
 class BBAppendAdmin(admin.ModelAdmin):
     search_fields = ['filename']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = BBAppend._meta.get_all_field_names()
+    readonly_fields = [f.name for f in BBAppend._meta.get_fields()]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
@@ -147,7 +147,7 @@ class BBAppendAdmin(admin.ModelAdmin):
 class BBClassAdmin(admin.ModelAdmin):
     search_fields = ['name']
     list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
-    readonly_fields = BBClass._meta.get_all_field_names()
+    readonly_fields = [f.name for f in BBClass._meta.get_fields()]
     def has_add_permission(self, request, obj=None):
         return False
     def has_delete_permission(self, request, obj=None):
diff --git a/layerindex/querysethelper.py b/layerindex/querysethelper.py
index 4e7cac5..5a856ee 100644
--- a/layerindex/querysethelper.py
+++ b/layerindex/querysethelper.py
@@ -71,7 +71,7 @@ def _validate_input(input, model):
             return None, invalid + str(input_list)
 
         # Check we are looking for a valid field
-        valid_fields = model._meta.get_all_field_names()
+        valid_fields = [f.name for f in model._meta.get_fields()]
         for field in input_list[0].split(VALUE_SEPARATOR):
             if not functools.reduce(lambda x, y: x or y, map(lambda x: field.startswith(x), [ x for x in valid_fields ])):
                 return None, (field, [ x for x in valid_fields ])