Better support for multilingual
Uppercase language name