changed some enum names according to the OGPD schema