Refactor Mapping namespaces