fixed Namespace + rebuild