Tweak namespaces for consistency