Nomenclature logic improved