Consistency in language naming pt1

Checked up to line 669 so far, will continue tomorrow