Unified the naming convention