Rename the service state constants.

Fixes #5964