Update namespaces for new L5 root namespace handling
Fix formatting