Updating language, casing, etc. to be more uniform.