Incorporate Drews feedback about terminal_name_extra