Rename content_type_identifier() and content_type_name()

netbox/extras/dashboard/widgets.py

@@ -18,7 +18,7 @@ from netbox.choices import ButtonColorChoices
 from utilities.permissions import get_permission_for_model
 from utilities.querydict import dict_to_querydict
 from utilities.templatetags.builtins.filters import render_markdown
-from utilities.utils import content_type_identifier, content_type_name
+from utilities.utils import object_type_identifier, object_type_name
 from utilities.views import get_viewname
 from .utils import register_widget
 
@@ -35,15 +35,15 @@ __all__ = (
 
 def get_object_type_choices():
     return [
-        (content_type_identifier(ct), content_type_name(ct))
-        for ct in ObjectType.objects.public().order_by('app_label', 'model')
+        (object_type_identifier(ot), object_type_name(ot))
+        for ot in ObjectType.objects.public().order_by('app_label', 'model')
     ]
 
 
 def get_bookmarks_object_type_choices():
     return [
-        (content_type_identifier(ct), content_type_name(ct))
-        for ct in ObjectType.objects.with_feature('bookmarks').order_by('app_label', 'model')
+        (object_type_identifier(ot), object_type_name(ot))
+        for ot in ObjectType.objects.with_feature('bookmarks').order_by('app_label', 'model')
     ]
 
 

netbox/extras/models/search.py

@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _
 from netbox.search.utils import get_indexer
 from netbox.registry import registry
 from utilities.fields import RestrictedGenericForeignKey
-from utilities.utils import content_type_identifier
+from utilities.utils import object_type_identifier
 from ..fields import CachedValueField
 
 __all__ = (