Regularize namespaces
Regularize namespaces