Fixed invalid string names,
plus alphabetical order now