refactored nomenclator to type