Modified enum to match naming scheme