diff --git a/mayan/apps/motd/api_views.py b/mayan/apps/motd/api_views.py
index 30a82ae3f6..10b21b41af 100644
--- a/mayan/apps/motd/api_views.py
+++ b/mayan/apps/motd/api_views.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-from rest_framework import viewsets
-
 from mayan.apps.rest_api.viewsets import MayanAPIModelViewSet
 
 from .models import Message
@@ -12,7 +10,7 @@ from .permissions import (
 from .serializers import MessageSerializer
 
 
-class APIMessageViewSet(MayanAPIModelViewSet):
+class MessageAPIViewSet(MayanAPIModelViewSet):
     """
     create:
     Create a new message.
diff --git a/mayan/apps/motd/urls.py b/mayan/apps/motd/urls.py
index 24f26246d6..450713a4ee 100644
--- a/mayan/apps/motd/urls.py
+++ b/mayan/apps/motd/urls.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.conf.urls import url
 
-from .api_views import APIMessageViewSet
+from .api_views import MessageAPIViewSet
 from .views import (
     MessageCreateView, MessageDeleteView, MessageEditView, MessageListView
 )
@@ -27,5 +27,5 @@ urlpatterns = [
 ]
 
 api_router_entries = (
-    {'prefix': r'messages', 'viewset': APIMessageViewSet, 'basename': 'message'},
+    {'prefix': r'messages', 'viewset': MessageAPIViewSet, 'basename': 'message'},
 )