[REFACTORING] updated namespaces