Update readme
Fix nomenclature per recent discussions