Refactoring: Rename NameSpaces