diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 65ebbfaa5..cca9cab1c 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -819,11 +819,10 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
     def get(self, request):
         report_modules = ReportModule.objects.restrict(request.user)
 
-        report_content_type = ContentType.objects.get(app_label='extras', model='report')
         jobs = {
             r.name: r
             for r in Job.objects.filter(
-                object_type=report_content_type,
+                object_type=ContentType.objects.get_by_natural_key('extras', 'reportmodule'),
                 status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
             ).order_by('name', '-created').distinct('name').defer('data')
         }
@@ -987,11 +986,10 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
     def get(self, request):
         script_modules = ScriptModule.objects.restrict(request.user)
 
-        script_content_type = ContentType.objects.get(app_label='extras', model='script')
         jobs = {
             r.name: r
             for r in Job.objects.filter(
-                object_type=script_content_type,
+                object_type=ContentType.objects.get_by_natural_key('extras', 'scriptmodule'),
                 status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
             ).order_by('name', '-created').distinct('name').defer('data')
         }
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 08d26aa2d..ea47b7886 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -50,7 +50,7 @@
             </thead>
             <tbody>
               {% for report_name, report in module.reports.items %}
-                {% with last_result=jobs|get_key:report.full_name %}
+                {% with last_result=jobs|get_key:report.name %}
                   <tr>
                     <td>
                       <a href="{% url 'extras:report' module=module.path name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">{{ report.name }}</a>
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 010444a3c..0f4907db6 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -48,7 +48,7 @@
             </thead>
             <tbody>
               {% for script_name, script_class in module.scripts.items %}
-                {% with last_result=jobs|get_key:script_class.full_name %}
+                {% with last_result=jobs|get_key:script_class.name %}
                   <tr>
                     <td>
                       <a href="{% url 'extras:script' module=module.path name=script_name %}" name="script.{{ script_name }}">{{ script_class.name }}</a>