Fixed review comments to move namespaces