all: replace enum field name xxx_ with xxx

all: replace enum field name xxx_ with xxx #536