Much needed nomenclature overhaul and pruning which members belong where.