Standardize naming.