Change enum type naming. Support *raw* button insert.