Standardize some conventions