Added short_name in strings