diff --git a/mayan/conf.py b/mayan/conf.py
index 1184d8393b..27a9a82a93 100644
--- a/mayan/conf.py
+++ b/mayan/conf.py
@@ -1,6 +1,6 @@
 """
 This module should be called settings.py but is named conf.py to avoid a
-class with the mayan/settings/* module
+clash with the mayan/settings/* module
 """
 from __future__ import unicode_literals
 
@@ -11,7 +11,7 @@ from smart_settings import Namespace
 namespace = Namespace(name='mayan', label=_('Mayan'))
 
 setting_celery_class = namespace.add_setting(
-    help_text=_('The class used to instanciate the main Celery app.'),
+    help_text=_('The class used to instantiate the main Celery app.'),
     global_name='MAYAN_CELERY_CLASS',
     default='celery.Celery'
 )