Rename enum values to avoid repeat the enum name