diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index 6be0bb6..172574d 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -191,20 +191,11 @@ include("basis/abstract.jl")
 include("basis/subs.jl")  # Symbolic substitution (includes minimal simplify from SymDiff.jl)
 include("basis/vandermonde.jl")
 
-# NOTE: Lagrange basis files create types like "Tri3 <: AbstractBasis"
-# These conflict with new "Tri3 <: AbstractTopology" types!
-# TODO (Phase 2): Rename basis types to avoid conflicts (Tri3Basis, Quad4Basis, etc.)
-# For now, we comment out to allow topology/integration to load properly.
-# Old code that uses these basis types will need updating.
-#
-# include("basis/lagrange_generator.jl")
-# include("basis/lagrange_segments.jl")
-# include("basis/lagrange_quadrangles.jl")
-# include("basis/lagrange_triangles.jl")
-# include("basis/lagrange_tetrahedrons.jl")
-# include("basis/lagrange_hexahedrons.jl")
-# include("basis/lagrange_wedges.jl")
-# include("basis/lagrange_pyramids.jl")
+# Lagrange basis functions - auto-generated file contains all basis types
+# Types have "Basis" suffix to avoid conflicts with topology types
+# E.g., Tri3Basis, Quad4Basis, etc. (not Tri3, Quad4 which are topology types)
+include("basis/lagrange_generator.jl")
+include("basis/lagrange_generated.jl")  # Auto-generated by scripts/generate_lagrange_basis.jl
 
 include("basis/nurbs.jl")
 include("basis/nurbs_segment.jl")