diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 0b29311dbc..bf661b8a96 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -343,7 +343,7 @@ class GroupAdmin(admin.ModelAdmin):
     filter_horizontal = ('permissions',)
 
 class UserAdmin(admin.ModelAdmin):
-    fields = (
+    fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
         (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py
index dea40cb602..6658c9486a 100644
--- a/django/contrib/comments/models.py
+++ b/django/contrib/comments/models.py
@@ -281,7 +281,7 @@ class ModeratorDeletion(models.Model):
 from django.contrib import admin
 
 class CommentAdmin(admin.ModelAdmin):
-    fields = (
+    fieldsets = (
         (None, {'fields': ('content_type', 'object_id', 'site')}),
         ('Content', {'fields': ('user', 'headline', 'comment')}),
         ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
@@ -294,7 +294,7 @@ class CommentAdmin(admin.ModelAdmin):
     raw_id_fields = ('user',)
 
 class FreeCommentAdmin(admin.ModelAdmin):
-    fields = (
+    fieldsets = (
         (None, {'fields': ('content_type', 'object_id', 'site')}),
         ('Content', {'fields': ('person_name', 'comment')}),
         ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index be75a22818..f2be360ff3 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -33,7 +33,7 @@ class FlatPage(models.Model):
 from django.contrib import admin
 
 class FlatPageAdmin(admin.ModelAdmin):
-    fields = (
+    fieldsets = (
         (None, {'fields': ('url', 'title', 'content', 'sites')}),
         ('Advanced options', {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
     )