Refactor node type with enum and link type name