Rename enum types