      choices = property(_get_choices, _set_choices)
  
      def metadata(self):
          data = super(ChoiceField, self).metadata()
          data['choices'] = [{'value': v, 'name': n} for v, n in self.choices]
          return data
  
      def validate(self, value):
          """
          Validates that the input is in self.choices.
 
</s> remove         s = ChoiceFieldModelSerializer(data={'choice' : ''})
 </s> add         s = ChoiceFieldModelSerializer(data={'choice': ''}) </s> remove         Test that the 'empty' value is correctly passed and used depending on the 'null' property on the model field.
 </s> add         Test that the 'empty' value is correctly passed and used depending on
        the 'null' property on the model field. </s> remove         s = ChoiceFieldModelSerializer(data={'choice' : 'wrong_value'})
 </s> add         s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) </s> remove         s = ChoiceFieldModelWithNullSerializer(data={'choice' : ''})
 </s> add         s = ChoiceFieldModelWithNullSerializer(data={'choice': ''})
        data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices]
      choices = property(_get_choices, _set_choices)
  
      def metadata(self):
          data = super(ChoiceField, self).metadata()
        data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices]
          return data
  
      def validate(self, value):
          """
          Validates that the input is in self.choices.
keep keep keep keep replace keep keep keep keep keep
 Add unittests for ChoiceField metadata.

Rename 'name' to 'display_name'. 
rest_framework/fields.py