Change database value type constants to singular.