Merge "Replace display_name by name in scenario manager"