Nomenclature issue #28 fixed