fixed nomenclature
Brendan's changes