Rename enum related validators