diff --git a/src/galax/potential/__init__.py b/src/galax/potential/__init__.py
index f50951cb..6705eeb5 100644
--- a/src/galax/potential/__init__.py
+++ b/src/galax/potential/__init__.py
@@ -11,44 +11,8 @@
     "AbstractCompositePotential",
     # composite
     "CompositePotential",
-    # builtin
-    "LongMuraliBarPotential",
-    "MonariEtAl2016BarPotential",
-    "KuzminPotential",
-    "MiyamotoNagaiPotential",
-    "MN3ExponentialPotential",
-    "MN3Sech2Potential",
-    "HarmonicOscillatorPotential",
-    "HenonHeilesPotential",
-    "SatohPotential",
-    "LMJ09LogarithmicPotential",
-    "LogarithmicPotential",
-    "AbstractMultipolePotential",
-    "MultipoleInnerPotential",
-    "MultipoleOuterPotential",
-    "MultipolePotential",
-    "LeeSutoTriaxialNFWPotential",
-    "NFWPotential",
-    "TriaxialNFWPotential",
-    "Vogelsberger08TriaxialNFWPotential",
-    "NullPotential",
-    "BurkertPotential",
-    "HernquistPotential",
-    "IsochronePotential",
-    "JaffePotential",
-    "KeplerPotential",
-    "PlummerPotential",
-    "PowerLawCutoffPotential",
-    "StoneOstriker15Potential",
-    "TriaxialHernquistPotential",
-    "HardCutoffNFWPotential",
-    "gNFWPotential",
     # Pre-composited
     "AbstractPreCompositedPotential",
-    "BovyMWPotential2014",
-    "LM10Potential",
-    "MilkyWayPotential",
-    "MilkyWayPotential2022",
     # xfm
     "AbstractTransformedPotential",
     "FlattenedInThePotential",
@@ -94,43 +58,8 @@
         AbstractPreCompositedPotential,
     )
     from ._src.base_single import AbstractSinglePotential
-    from ._src.builtin import (
-        AbstractMultipolePotential,
-        BovyMWPotential2014,
-        BurkertPotential,
-        HardCutoffNFWPotential,
-        HarmonicOscillatorPotential,
-        HenonHeilesPotential,
-        HernquistPotential,
-        IsochronePotential,
-        JaffePotential,
-        KeplerPotential,
-        KuzminPotential,
-        LeeSutoTriaxialNFWPotential,
-        LM10Potential,
-        LMJ09LogarithmicPotential,
-        LogarithmicPotential,
-        LongMuraliBarPotential,
-        MilkyWayPotential,
-        MilkyWayPotential2022,
-        MiyamotoNagaiPotential,
-        MN3ExponentialPotential,
-        MN3Sech2Potential,
-        MonariEtAl2016BarPotential,
-        MultipoleInnerPotential,
-        MultipoleOuterPotential,
-        MultipolePotential,
-        NFWPotential,
-        NullPotential,
-        PlummerPotential,
-        PowerLawCutoffPotential,
-        SatohPotential,
-        StoneOstriker15Potential,
-        TriaxialHernquistPotential,
-        TriaxialNFWPotential,
-        Vogelsberger08TriaxialNFWPotential,
-        gNFWPotential,
-    )
+    from ._src.builtin import *
+    from ._src.builtin import __all__ as _builtin_all
     from ._src.composite import CompositePotential
     from ._src.xfm import (
         AbstractTransformedPotential,
@@ -144,6 +73,7 @@
     # isort: split
     from ._src import register_funcs
 
+__all__ = __all__ + list(_builtin_all)
 
 # Cleanup
 del install_import_hook, RUNTIME_TYPECHECKER, register_funcs
diff --git a/src/galax/potential/_src/builtin/__init__.py b/src/galax/potential/_src/builtin/__init__.py
index bd3108d7..93bbb25a 100644
--- a/src/galax/potential/_src/builtin/__init__.py
+++ b/src/galax/potential/_src/builtin/__init__.py
@@ -6,41 +6,41 @@
 """
 
 __all__ = [
-    "LongMuraliBarPotential",
-    "MonariEtAl2016BarPotential",
-    "KuzminPotential",
-    "MiyamotoNagaiPotential",
-    "MN3ExponentialPotential",
-    "MN3Sech2Potential",
+    "AbstractMultipolePotential",
+    "BovyMWPotential2014",
+    "BurkertPotential",
+    "HardCutoffNFWPotential",
     "HarmonicOscillatorPotential",
     "HenonHeilesPotential",
-    "SatohPotential",
+    "HernquistPotential",
+    "IsochronePotential",
+    "JaffePotential",
+    "KeplerPotential",
+    "KuzminPotential",
+    "LM10Potential",
     "LMJ09LogarithmicPotential",
+    "LeeSutoTriaxialNFWPotential",
     "LogarithmicPotential",
-    "AbstractMultipolePotential",
+    "LongMuraliBarPotential",
+    "MN3ExponentialPotential",
+    "MN3Sech2Potential",
+    "MilkyWayPotential",
+    "MilkyWayPotential2022",
+    "MiyamotoNagaiPotential",
+    "MonariEtAl2016BarPotential",
     "MultipoleInnerPotential",
     "MultipoleOuterPotential",
     "MultipolePotential",
-    "LeeSutoTriaxialNFWPotential",
     "NFWPotential",
-    "TriaxialNFWPotential",
-    "Vogelsberger08TriaxialNFWPotential",
-    "gNFWPotential",
     "NullPotential",
-    "BovyMWPotential2014",
-    "LM10Potential",
-    "MilkyWayPotential",
-    "MilkyWayPotential2022",
-    "BurkertPotential",
-    "HernquistPotential",
-    "IsochronePotential",
-    "JaffePotential",
-    "KeplerPotential",
     "PlummerPotential",
     "PowerLawCutoffPotential",
+    "SatohPotential",
     "StoneOstriker15Potential",
     "TriaxialHernquistPotential",
-    "HardCutoffNFWPotential",
+    "TriaxialNFWPotential",
+    "Vogelsberger08TriaxialNFWPotential",
+    "gNFWPotential",
 ]
 
 from .burkert import BurkertPotential