update enum namings to match naming conventions;