replaced internal_name with short_name on FE