Fixing incorrect message names, using same message name order in files across languages