Moved to aliased namespaces for conflicts
Constant naming scheme (#4)