diff --git a/djadmin2/actions.py b/djadmin2/actions.py
index ffab8a4..6718b81 100644
--- a/djadmin2/actions.py
+++ b/djadmin2/actions.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy, ungettext, pgettext_lazy
 from django.utils.translation import ugettext as _
 
 from . import permissions, utils
-from .viewmixins import AdminModel2Mixin
+from .viewmixins import Admin2ModelMixin
 
 
 def get_description(action):
@@ -22,7 +22,7 @@ def get_description(action):
         return capfirst(action.__name__.replace('_', ' '))
 
 
-class BaseListAction(AdminModel2Mixin, TemplateView):
+class BaseListAction(Admin2ModelMixin, TemplateView):
 
     permission_classes = (permissions.IsStaffPermission,)
 
@@ -55,7 +55,7 @@ class BaseListAction(AdminModel2Mixin, TemplateView):
         super(BaseListAction, self).__init__(*args, **kwargs)
 
     def get_queryset(self):
-        """ Replaced `get_queryset` from `AdminModel2Mixin`"""
+        """ Replaced `get_queryset` from `Admin2ModelMixin`"""
         return self.queryset
 
     def description(self):
diff --git a/djadmin2/viewmixins.py b/djadmin2/viewmixins.py
index 09ef357..cf7888e 100644
--- a/djadmin2/viewmixins.py
+++ b/djadmin2/viewmixins.py
@@ -116,11 +116,11 @@ class Admin2Mixin(PermissionMixin):
         return super(Admin2Mixin, self).dispatch(request, *args, **kwargs)
 
 
-class AdminModel2Mixin(Admin2Mixin):
+class Admin2ModelMixin(Admin2Mixin):
     model_admin = None
 
     def get_context_data(self, **kwargs):
-        context = super(AdminModel2Mixin, self).get_context_data(**kwargs)
+        context = super(Admin2ModelMixin, self).get_context_data(**kwargs)
         model = self.get_model()
         model_meta = model_options(model)
         app_verbose_names = self.model_admin.admin.app_verbose_names
diff --git a/djadmin2/views.py b/djadmin2/views.py
index 3f3867c..7bc3292 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -26,7 +26,7 @@ import extra_views
 
 from . import permissions, utils
 from .forms import AdminAuthenticationForm
-from .viewmixins import Admin2Mixin, AdminModel2Mixin, Admin2ModelFormMixin
+from .viewmixins import Admin2Mixin, Admin2ModelMixin, Admin2ModelFormMixin
 from .filters import build_list_filter, build_date_filter
 from .models import LogEntry
 
@@ -102,7 +102,7 @@ class AppIndexView(Admin2Mixin, generic.TemplateView):
         return data
 
 
-class ModelListView(AdminModel2Mixin, generic.ListView):
+class ModelListView(Admin2ModelMixin, generic.ListView):
     """Context Variables
 
     :is_paginated: If the page is paginated (page has a next button)
@@ -347,7 +347,7 @@ class ModelListView(AdminModel2Mixin, generic.ListView):
         return self.model_admin.search_fields
 
 
-class ModelDetailView(AdminModel2Mixin, generic.DetailView):
+class ModelDetailView(Admin2ModelMixin, generic.DetailView):
     """Context Variables
 
     :model: Type of object you are editing
@@ -365,7 +365,7 @@ class ModelDetailView(AdminModel2Mixin, generic.DetailView):
         permissions.ModelViewPermission)
 
 
-class ModelEditFormView(AdminModel2Mixin, Admin2ModelFormMixin,
+class ModelEditFormView(Admin2ModelMixin, Admin2ModelFormMixin,
                         extra_views.UpdateWithInlinesView):
     """Context Variables
 
@@ -401,7 +401,7 @@ class ModelEditFormView(AdminModel2Mixin, Admin2ModelFormMixin,
         return response
 
 
-class ModelAddFormView(AdminModel2Mixin, Admin2ModelFormMixin,
+class ModelAddFormView(Admin2ModelMixin, Admin2ModelFormMixin,
                        extra_views.CreateWithInlinesView):
     """Context Variables
 
@@ -437,7 +437,7 @@ class ModelAddFormView(AdminModel2Mixin, Admin2ModelFormMixin,
         return response
 
 
-class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
+class ModelDeleteView(Admin2ModelMixin, generic.DeleteView):
     """Context Variables
 
     :model: Type of object you are editing
@@ -481,7 +481,7 @@ class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
         return super(ModelDeleteView, self).delete(request, *args, **kwargs)
 
 
-class ModelHistoryView(AdminModel2Mixin, generic.ListView):
+class ModelHistoryView(Admin2ModelMixin, generic.ListView):
     """Context Variables
 
     :model: Type of object you are editing