Finalized namespace-renaming