Converted FieldName enum to class with constants
Fields commands and events updated
Changes after update