Activities: Improve use of lang files, lang entry naming