code nomenclature

several fixes in code nomenclature. fixes #12