Use singular values for case_type keys