ENH: Refactoring to NameSpace keywords