diff --git a/src/sage/categories/primer.py b/src/sage/categories/primer.py
index 84ab37f34b7..76c0e2ab000 100644
--- a/src/sage/categories/primer.py
+++ b/src/sage/categories/primer.py
@@ -525,12 +525,12 @@ class implements:
 
     sage: G = GL(2, ZZ)                                                                 # optional - sage.modules
     sage: type(G)                                                                       # optional - sage.modules
-    <class 'sage.groups.matrix_gps.linear_gap.LinearMatrixGroup_gap_with_category'>
+    <class 'sage.groups.matrix_gps.linear.LinearMatrixGroup_gap_with_category'>
 
 Here is a piece of the hierarchy of classes above it::
 
     sage: for cls in G.__class__.mro(): print(cls)                                      # optional - sage.modules
-    <class 'sage.groups.matrix_gps.linear_gap.LinearMatrixGroup_gap_with_category'>
+    <class 'sage.groups.matrix_gps.linear.LinearMatrixGroup_gap_with_category'>
     ...
     <class 'sage.categories.groups.Groups.parent_class'>
     <class 'sage.categories.monoids.Monoids.parent_class'>
diff --git a/src/sage/categories/sets_cat.py b/src/sage/categories/sets_cat.py
index 4c2f33e3bc8..069ebc5337c 100644
--- a/src/sage/categories/sets_cat.py
+++ b/src/sage/categories/sets_cat.py
@@ -2925,7 +2925,7 @@ def inject_shorthands(self, shorthands=None, verbose=True):
                     sage: e == S.e(), h == S.h(), m == S.m(), p == SQ.p(), s == SQ.s()  # optional - sage.combinat
                     (True, True, True, True, True)
                 """
-                from sage.misc.globals import inject_variable
+                from sage.misc.misc import inject_variable
                 if shorthands == 'all':
                     shorthands = getattr(self, '_shorthands_all', None)
                 if shorthands is None: