Another pass at making the language consistent
Final pass for language change