diff --git a/cranelift/docs/metaref.rst b/cranelift/docs/metaref.rst
index a073ed5ad8..31e4ffc9b5 100644
--- a/cranelift/docs/metaref.rst
+++ b/cranelift/docs/metaref.rst
@@ -102,7 +102,7 @@ instances that refer to a *type variable* instead of a concrete value type.
 Polymorphism only works for SSA value operands. Other operands have a fixed
 operand kind.
 
-.. autoclass:: cretonne.typevar.TypeVar
+.. autoclass:: cdsl.typevar.TypeVar
     :members:
 
 If multiple operands refer to the same type variable they will be required to
diff --git a/lib/cretonne/meta/cretonne/test_typevar.py b/lib/cretonne/meta/cdsl/test_typevar.py
similarity index 100%
rename from lib/cretonne/meta/cretonne/test_typevar.py
rename to lib/cretonne/meta/cdsl/test_typevar.py
diff --git a/lib/cretonne/meta/cretonne/typevar.py b/lib/cretonne/meta/cdsl/typevar.py
similarity index 100%
rename from lib/cretonne/meta/cretonne/typevar.py
rename to lib/cretonne/meta/cdsl/typevar.py
diff --git a/lib/cretonne/meta/cretonne/__init__.py b/lib/cretonne/meta/cretonne/__init__.py
index 2429136143..1753200f70 100644
--- a/lib/cretonne/meta/cretonne/__init__.py
+++ b/lib/cretonne/meta/cretonne/__init__.py
@@ -23,7 +23,7 @@ except ImportError:
     TYPE_CHECKING = False
 
 if TYPE_CHECKING:
-    from .typevar import TypeVar  # noqa
+    from cdsl.typevar import TypeVar  # noqa
 
 
 # Defining instructions.
diff --git a/lib/cretonne/meta/cretonne/base.py b/lib/cretonne/meta/cretonne/base.py
index 6ecbdcf86d..c648633ed9 100644
--- a/lib/cretonne/meta/cretonne/base.py
+++ b/lib/cretonne/meta/cretonne/base.py
@@ -6,8 +6,8 @@ support.
 """
 from __future__ import absolute_import
 from cdsl.operands import VARIABLE_ARGS
+from cdsl.typevar import TypeVar
 from . import Operand, Instruction, InstructionGroup
-from .typevar import TypeVar
 from base.types import i8, f32, f64, b1
 from base.immediates import imm64, uimm8, ieee32, ieee64, immvector
 from base.immediates import intcc, floatcc