updated names in model v6 to be more consistent and changed pathgen accordingly