Standardize naming