Started refactoring Nomenclature key-values