Changed enums from using codes to using the full value for readability.
Updating client methods to use new approach.