Tweak some namespaces