Changes Nomenclature, Fixes Grouplist.