diff --git a/src/unxt/_src/quantity/__init__.py b/src/unxt/_src/quantity/__init__.py
index 20a15f83..ce07ff9e 100644
--- a/src/unxt/_src/quantity/__init__.py
+++ b/src/unxt/_src/quantity/__init__.py
@@ -13,5 +13,5 @@
 from .api import is_unit_convertible, uconvert, ustrip
 from .base import AbstractQuantity
 from .base_parametric import AbstractParametricQuantity
-from .core import Quantity
-from .fast import UncheckedQuantity
+from .quantity import Quantity
+from .unchecked import UncheckedQuantity
diff --git a/src/unxt/_src/quantity/compat.py b/src/unxt/_src/quantity/compat.py
index 6b958484..a396c773 100644
--- a/src/unxt/_src/quantity/compat.py
+++ b/src/unxt/_src/quantity/compat.py
@@ -6,8 +6,8 @@
 
 from .api import ustrip
 from .base import AbstractQuantity
-from .core import Quantity
-from .fast import UncheckedQuantity
+from .quantity import Quantity
+from .unchecked import UncheckedQuantity
 from unxt._src.dimensions import AbstractDimension
 from unxt._src.units.api import AbstractUnits
 
diff --git a/src/unxt/_src/quantity/core.py b/src/unxt/_src/quantity/quantity.py
similarity index 100%
rename from src/unxt/_src/quantity/core.py
rename to src/unxt/_src/quantity/quantity.py
diff --git a/src/unxt/_src/quantity/functional.py b/src/unxt/_src/quantity/register_api.py
similarity index 100%
rename from src/unxt/_src/quantity/functional.py
rename to src/unxt/_src/quantity/register_api.py
diff --git a/src/unxt/_src/quantity/register_dispatches.py b/src/unxt/_src/quantity/register_dispatches.py
index 222fcf2e..489247d1 100644
--- a/src/unxt/_src/quantity/register_dispatches.py
+++ b/src/unxt/_src/quantity/register_dispatches.py
@@ -13,7 +13,7 @@
 
 from .api import ustrip
 from .base import AbstractQuantity
-from .core import Quantity
+from .quantity import Quantity
 
 # -----------------------------------------------
 
diff --git a/src/unxt/_src/quantity/register_primitives.py b/src/unxt/_src/quantity/register_primitives.py
index aa47c93e..5f25a501 100644
--- a/src/unxt/_src/quantity/register_primitives.py
+++ b/src/unxt/_src/quantity/register_primitives.py
@@ -28,7 +28,7 @@
 from .api import is_unit_convertible, uconvert, ustrip
 from .base import AbstractQuantity
 from .base_parametric import AbstractParametricQuantity
-from .core import Quantity
+from .quantity import Quantity
 from unxt._src.units import unit, unit_of
 from unxt._src.utils import promote_dtypes_if_needed
 
diff --git a/src/unxt/_src/quantity/fast.py b/src/unxt/_src/quantity/unchecked.py
similarity index 100%
rename from src/unxt/_src/quantity/fast.py
rename to src/unxt/_src/quantity/unchecked.py
diff --git a/src/unxt/quantity.py b/src/unxt/quantity.py
index e6b53f3c..5ac52acf 100644
--- a/src/unxt/quantity.py
+++ b/src/unxt/quantity.py
@@ -15,12 +15,17 @@
 from ._src.quantity.api import is_unit_convertible, uconvert, ustrip
 from ._src.quantity.base import AbstractQuantity
 from ._src.quantity.base_parametric import AbstractParametricQuantity
-from ._src.quantity.core import Quantity
-from ._src.quantity.fast import UncheckedQuantity
+from ._src.quantity.quantity import Quantity
+from ._src.quantity.unchecked import UncheckedQuantity
 
 # isort: split
 # Register dispatches and conversions
-from ._src.quantity import compat, functional, register_dispatches, register_primitives
+from ._src.quantity import (
+    compat,
+    register_api,
+    register_dispatches,
+    register_primitives,
+)
 
 __all__: list[str] = [
     # Core
@@ -39,4 +44,4 @@
 
 
 # Clean up namespace
-del compat, functional, register_dispatches, register_primitives
+del compat, register_api, register_dispatches, register_primitives