diff --git a/ietf/doc/templatetags/tests_ietf_filters.py b/ietf/doc/templatetags/tests_ietf_filters.py
index e8eee9862..52d1c6cdf 100644
--- a/ietf/doc/templatetags/tests_ietf_filters.py
+++ b/ietf/doc/templatetags/tests_ietf_filters.py
@@ -8,7 +8,7 @@ from ietf.doc.factories import (
     CharterFactory,
     NewRevisionDocEventFactory,
 )
-from ietf.doc.models import State, DocEvent, Document
+from ietf.doc.models import DocEvent
 from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs, is_valid_url
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase
diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index 058d969bb..6f41f7b1e 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -33,7 +33,7 @@ def all_id_txt():
 
     rfcs = dict()
     for rfc in Document.objects.filter(type_id="rfc"):
-        draft = next(iter(doc.related_that("became_rfc")), None)
+        draft = next(iter(rfc.related_that("became_rfc")), None)
         rfcs[rfc.name] = draft.name if draft else rfc.name
 
     replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
@@ -116,7 +116,7 @@ def all_id2_txt():
 
     rfcs = dict()
     for rfc in Document.objects.filter(type_id="rfc"):
-        draft = next(iter(doc.related_that("became_rfc")), None)
+        draft = next(iter(rfc.related_that("became_rfc")), None)
         rfcs[rfc.name] = draft.name if draft else rfc.name
 
     replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
diff --git a/ietf/stats/views.py b/ietf/stats/views.py
index 0a137ac5a..64b914b85 100644
--- a/ietf/stats/views.py
+++ b/ietf/stats/views.py
@@ -285,7 +285,7 @@ def document_stats(request, stats_type=None):
                 bins = defaultdict(set)
 
                 for name, words in document_qs.values_list("name", "words"):
-                    bins[put_into_bin(words, bin_size)].add(canonical_name)
+                    bins[put_into_bin(words, bin_size)].add(name)
 
                 series_data = []
                 for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]):
@@ -309,20 +309,20 @@ def document_stats(request, stats_type=None):
                     submission_types[doc_name] = file_types
 
                 doc_names_with_missing_types = {}
-                for doc_name, rev in document_qs.values_list("name", "rev"):
+                for doc_name, doc_type, rev in document_qs.values_list("name", "type_id" "rev"):
                     types = submission_types.get(doc_name)
                     if types:
                         for dot_ext in types.split(","):
-                            bins[dot_ext.lstrip(".").upper()].add(canonical_name)
+                            bins[dot_ext.lstrip(".").upper()].add(doc_name)
 
                     else:
 
-                        if canonical_name.startswith("rfc"):
-                            filename = canonical_name
+                        if doc_type == "rfc":
+                            filename = doc_name
                         else:
-                            filename = canonical_name + "-" + rev
+                            filename = doc_name + "-" + rev
 
-                        doc_names_with_missing_types[filename] = canonical_name
+                        doc_names_with_missing_types[filename] = doc_name
 
                 # look up the remaining documents on disk
                 for filename in itertools.chain(os.listdir(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), os.listdir(settings.RFC_PATH)):
@@ -335,10 +335,10 @@ def document_stats(request, stats_type=None):
                     if not any(ext==allowlisted_ext for allowlisted_ext in settings.DOCUMENT_FORMAT_ALLOWLIST):
                         continue
 
-                    canonical_name = doc_names_with_missing_types.get(basename)
+                    name = doc_names_with_missing_types.get(basename)
 
-                    if canonical_name:
-                        bins[ext.upper()].add(canonical_name)
+                    if name:
+                        bins[ext.upper()].add(name)
 
                 series_data = []
                 for fmt, names in sorted(bins.items(), key=lambda t: t[0]):
@@ -355,7 +355,7 @@ def document_stats(request, stats_type=None):
                 bins = defaultdict(set)
 
                 for name, formal_language_name in document_qs.values_list("name", "formal_languages__name"):
-                    bins[formal_language_name or ""].add(canonical_name)
+                    bins[formal_language_name or ""].add(name)
 
                 series_data = []
                 for formal_language, names in sorted(bins.items(), key=lambda t: t[0]):
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index b054db5e9..806596e54 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -17,7 +17,7 @@ from django.utils.encoding import smart_bytes, force_str
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName,
+from ietf.doc.models import ( Document, State, StateType, DocEvent, DocRelationshipName,
     DocTagName, RelatedDocument )
 from ietf.doc.expire import move_draft_files_to_archive
 from ietf.doc.utils import add_state_change_event, prettify_std_name, update_action_holders