Moved language shortname to be language identifier, added suffix appending (for language overwrites)