corrected nomenclature
Added todo for fix later