finish fixing namespaces and locales