unified the naming scheme