Clean up internal names and documentation

1 files changed, 8 insertions, 8 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 15fe26ee..2f8108d1 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -208,24 +208,24 @@ class BaseSerializer(Field):
 
         return reverted_data
 
-    def clean_fields(self, data):
+    def validate_fields(self, attrs):
         """
         Run validate_<fieldname> methods on the serializer
         """
-        fields = self.get_fields(serialize=False, data=data, nested=self.opts.nested)
+        fields = self.get_fields(serialize=False, data=attrs, nested=self.opts.nested)
 
         for field_name, field in fields.items():
             try:
                 clean_method = getattr(self, 'validate_%s' % field_name, None)
                 if clean_method:
                     source = field.source or field_name
-                    data = clean_method(data, source)
+                    attrs = clean_method(attrs, source)
             except ValidationError as err:
                 self._errors[field_name] = self._errors.get(field_name, []) + list(err.messages)
 
-        return data
+        return attrs
 
-    def clean_all(self, attrs):
+    def validate_all(self, attrs):
         """
         Run the `validate` method on the serializer, if it exists
         """
@@ -270,10 +270,10 @@ class BaseSerializer(Field):
         self._errors = {}
         if data is not None:
             attrs = self.restore_fields(data)
-            attrs = self.clean_fields(attrs)
-            attrs = self.clean_all(attrs)
+            attrs = self.validate_fields(attrs)
+            attrs = self.validate_all(attrs)
         else:
-            self._errors['non_field_errors'] = 'No input provided'
+            self._errors['non_field_errors'] = ['No input provided']
 
         if not self._errors:
             return self.restore_object(attrs, instance=getattr(self, 'object', None))