Moved to aliased namespaces for conflicts