Fix things broken by late rename

Note to self:

Always unload namespaces and test again after renaming.