Fix nomenclatures (closes #3 also)