finish moving to version-mangled namespace