Renamed NameSpace
Renamaggedon (Renaming and refactoring)