diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py
index 531db9f063..82af27c0ec 100644
--- a/mayan/apps/cabinets/views.py
+++ b/mayan/apps/cabinets/views.py
@@ -236,7 +236,7 @@ class DocumentAddToCabinetView(MultipleObjectFormActionView):
     model = Document
     object_permission = permission_cabinet_add_document
     pk_url_kwarg = 'document_pk'
-    success_message = _(
+    success_message_singular = _(
         'Add to cabinet request performed on %(count)d document'
     )
     success_message_plural = _(
@@ -326,7 +326,7 @@ class DocumentRemoveFromCabinetView(MultipleObjectFormActionView):
     model = Document
     object_permission = permission_cabinet_remove_document
     pk_url_kwarg = 'document_pk'
-    success_message = _(
+    success_message_singular = _(
         'Remove from cabinet request performed on %(count)d document'
     )
     success_message_plural = _(
diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py
index b336cd9a4f..d329d190d4 100644
--- a/mayan/apps/checkouts/views.py
+++ b/mayan/apps/checkouts/views.py
@@ -27,7 +27,7 @@ class DocumentCheckinView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_document_check_in
     pk_url_kwarg = 'document_id'
-    success_message = '%(count)d document checked in.'
+    success_message_singular = '%(count)d document checked in.'
     success_message_plural = '%(count)d documents checked in.'
 
     def get_extra_context(self):
@@ -76,7 +76,7 @@ class DocumentCheckoutView(MultipleObjectFormActionView):
     model = Document
     object_permission = permission_document_checkout
     pk_url_kwarg = 'document_id'
-    success_message = '%(count)d document checked out.'
+    success_message_singular = '%(count)d document checked out.'
     success_message_plural = '%(count)d documents checked out.'
 
     def get_extra_context(self):
diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py
index 341b65ff87..8fc7d49883 100644
--- a/mayan/apps/document_parsing/views.py
+++ b/mayan/apps/document_parsing/views.py
@@ -105,7 +105,7 @@ class DocumentParsingErrorsListView(SingleObjectListView):
 class DocumentSubmitView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_parse_document
-    success_message = _(
+    success_message_singular = _(
         '%(count)d document added to the parsing queue'
     )
     success_message_plural = _(
diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py
index 8bd379be14..8b225294bb 100644
--- a/mayan/apps/documents/views/document_views.py
+++ b/mayan/apps/documents/views/document_views.py
@@ -70,7 +70,7 @@ class DocumentChangeTypeView(MultipleObjectFormActionView):
     model = Document
     object_permission = permission_document_properties_edit
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         'Document type change request performed on %(count)d document'
     )
     success_message_plural = _(
@@ -379,7 +379,7 @@ class DocumentUpdatePageCountView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_document_tools
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         '%(count)d document queued for page count recalculation'
     )
     success_message_plural = _(
@@ -431,7 +431,7 @@ class DocumentTransformationsClearView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_transformation_delete
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         'Transformation clear request processed for %(count)d document'
     )
     success_message_plural = _(
@@ -660,7 +660,7 @@ class FavoriteDocumentListView(DocumentListView):
 class FavoriteAddView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_document_view
-    success_message = _(
+    success_message_singular = _(
         '%(count)d document added to favorites.'
     )
     success_message_plural = _(
@@ -690,7 +690,7 @@ class FavoriteRemoveView(MultipleObjectConfirmActionView):
     error_message = _('Document "%(instance)s" is not in favorites.')
     model = Document
     object_permission = permission_document_view
-    success_message = _(
+    success_message_singular = _(
         '%(count)d document removed from favorites.'
     )
     success_message_plural = _(
diff --git a/mayan/apps/documents/views/trashed_document_views.py b/mayan/apps/documents/views/trashed_document_views.py
index c00414a73f..ba91c44ddd 100644
--- a/mayan/apps/documents/views/trashed_document_views.py
+++ b/mayan/apps/documents/views/trashed_document_views.py
@@ -33,7 +33,7 @@ class DocumentTrashView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_document_trash
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         '%(count)d document moved to the trash.'
     )
     success_message_plural = _(
@@ -81,7 +81,7 @@ class TrashedDocumentDeleteView(MultipleObjectConfirmActionView):
     model = TrashedDocument
     object_permission = permission_trashed_document_delete
     pk_url_kwarg = 'trashed_document_id'
-    success_message = _(
+    success_message_singular = _(
         '%(count)d trashed document deleted.'
     )
     success_message_plural = _(
@@ -138,7 +138,7 @@ class TrashedDocumentRestoreView(MultipleObjectConfirmActionView):
     model = TrashedDocument
     object_permission = permission_trashed_document_restore
     pk_url_kwarg = 'trashed_document_id'
-    success_message = _(
+    success_message_singular = _(
         '%(count)d trashed document restored.'
     )
     success_message_plural = _(
diff --git a/mayan/apps/file_metadata/views.py b/mayan/apps/file_metadata/views.py
index 879ad5ba34..bee608df7f 100644
--- a/mayan/apps/file_metadata/views.py
+++ b/mayan/apps/file_metadata/views.py
@@ -79,7 +79,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_file_metadata_submit
     pk_url_kwarg = 'document_id'
-    success_message = '%(count)d document submitted to the file metadata queue.'
+    success_message_singular = '%(count)d document submitted to the file metadata queue.'
     success_message_plural = '%(count)d documents submitted to the file metadata queue.'
 
     def get_extra_context(self):
diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py
index 6ad40a274f..7c7fd0019b 100644
--- a/mayan/apps/mailer/views.py
+++ b/mayan/apps/mailer/views.py
@@ -40,7 +40,7 @@ class MailDocumentView(MultipleObjectFormActionView):
     model = Document
     object_permission = permission_mailing_send_document
     pk_url_kwarg = 'document_id'
-    success_message = _('%(count)d document queued for email delivery')
+    success_message_singular = _('%(count)d document queued for email delivery')
     success_message_plural = _(
         '%(count)d documents queued for email delivery'
     )
@@ -99,7 +99,7 @@ class MailDocumentView(MultipleObjectFormActionView):
 class MailDocumentLinkView(MailDocumentView):
     as_attachment = False
     object_permission = permission_mailing_link
-    success_message = _('%(count)d document link queued for email delivery')
+    success_message_singular = _('%(count)d document link queued for email delivery')
     success_message_plural = _(
         '%(count)d document links queued for email delivery'
     )
diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index ab5533b993..7ac30a5fc6 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -70,7 +70,7 @@ class DocumentMetadataAddView(DocumentMetadataSameTypeMixin, MultipleObjectFormA
     model = Document
     object_permission = permission_metadata_add
     pk_url_kwarg = 'document_id'
-    success_message = _('Metadata add request performed on %(count)d document')
+    success_message_singular = _('Metadata add request performed on %(count)d document')
     success_message_plural = _(
         'Metadata add request performed on %(count)d documents'
     )
@@ -202,7 +202,7 @@ class DocumentMetadataEditView(DocumentMetadataSameTypeMixin, MultipleObjectForm
     model = Document
     object_permission = permission_metadata_edit
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         'Metadata edit request performed on %(count)d document'
     )
     success_message_plural = _(
@@ -379,7 +379,7 @@ class DocumentMetadataRemoveView(DocumentMetadataSameTypeMixin, MultipleObjectFo
     model = Document
     object_permission = permission_metadata_remove
     pk_url_kwarg = 'document_id'
-    success_message = _(
+    success_message_singular = _(
         'Metadata remove request performed on %(count)d document'
     )
     success_message_plural = _(
diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py
index 0f45a27b35..83ab4b6ca7 100644
--- a/mayan/apps/ocr/views.py
+++ b/mayan/apps/ocr/views.py
@@ -105,7 +105,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView):
     model = Document
     object_permission = permission_ocr_document
     pk_url_kwarg = 'document_id'
-    success_message = '%(count)d document submitted to the OCR queue.'
+    success_message_singular = '%(count)d document submitted to the OCR queue.'
     success_message_plural = '%(count)d documents submitted to the OCR queue.'
 
     def get_extra_context(self):