Reworked NameSpaces