Improved the naming of error values in the case where they're java enums, since those already have meaningful names we can use.