added centralized enum parsing to compensate for service/client mismatch in naming conventions, replaced occurrences of raw parsing to use new style