added friendly enum names, split symbol type enum