change some nomenclature
3 files changed