Standardize message naming