Finish renaming namespace