fixing constant names in service client