Some fixes for better i18n support

* Use `getGroupDisplayName()` to get Group name
* Use `getDisplayName()` to get Storage Location name