diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index 21c9722990..0b4687bcf3 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -29,7 +29,7 @@ class SortedDictFromList(SortedDict):
 class DeclarativeFieldsMetaclass(type):
     "Metaclass that converts Field attributes to a dictionary called 'fields'."
     def __new__(cls, name, bases, attrs):
-        fields = [(name, attrs.pop(name)) for name, obj in attrs.items() if isinstance(obj, Field)]
+        fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
         fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
         attrs['fields'] = SortedDictFromList(fields)
         return type.__new__(cls, name, bases, attrs)
diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index 3b252fb5a9..ad77d5795e 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/tests/regressiontests/forms/tests.py
@@ -1551,7 +1551,7 @@ False
 >>> p.clean_data
 Traceback (most recent call last):
 ...
-AttributeError: 'birthday' object has no attribute 'clean_data'
+AttributeError: 'Person' object has no attribute 'clean_data'
 >>> print p
 <tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr>
 <tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr>
@@ -1585,7 +1585,7 @@ False
 >>> p.clean_data
 Traceback (most recent call last):
 ...
-AttributeError: 'birthday' object has no attribute 'clean_data'
+AttributeError: 'Person' object has no attribute 'clean_data'
 >>> print p
 <tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr>
 <tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr>
@@ -1627,7 +1627,7 @@ u'<ul class="errorlist"><li>first_name<ul class="errorlist"><li>This field is re
 >>> p.clean_data
 Traceback (most recent call last):
 ...
-AttributeError: 'birthday' object has no attribute 'clean_data'
+AttributeError: 'Person' object has no attribute 'clean_data'
 >>> p['first_name'].errors
 [u'This field is required.']
 >>> p['first_name'].errors.as_ul()