[BUGFIX] Reverted the use of Namespaces.