Now handles several language aliases