diff --git a/fabfile/__init__.py b/fabfile/__init__.py
index 40f2c894ff..c93b6962b7 100644
--- a/fabfile/__init__.py
+++ b/fabfile/__init__.py
@@ -58,4 +58,4 @@ def uninstall():
 
     if env.drop_database:
         database.drop_database()
-        database.drop_username()
+        database.drop_user()
diff --git a/fabfile/databases/__init__.py b/fabfile/databases/__init__.py
index 8afccd8032..bb1a03d636 100644
--- a/fabfile/databases/__init__.py
+++ b/fabfile/databases/__init__.py
@@ -31,12 +31,12 @@ def drop_database():
 
 
 @task
-def drop_username():
+def drop_user():
     """
-    Drop Mayan EDMS's username
+    Drop Mayan EDMS's user
     """
     setup_environment()
-    print(green('Droping Mayan EDMS username', bold=True))
+    print(green('Droping Mayan EDMS user', bold=True))
 
     if env.database_manager == DB_MYSQL:
-        mysql.drop_username()
+        mysql.drop_user()
diff --git a/fabfile/databases/mysql.py b/fabfile/databases/mysql.py
index 7a41f9f5f0..3c3e72c129 100644
--- a/fabfile/databases/mysql.py
+++ b/fabfile/databases/mysql.py
@@ -21,9 +21,9 @@ def drop_database():
         run('echo "DROP DATABASE %(database_name)s;" |  mysql -u root --password=%(database_manager_admin_password)s' % env)
 
 
-def drop_username():
+def drop_user():
     """
-    Drop MySQL's Mayan EDMS's username
+    Drop MySQL's Mayan EDMS's user
     """
     with settings(warn_only=True):
         run('echo "DROP USER \'%(database_username)s\'@\'%(database_host)s\';" |  mysql -u root --password=%(database_manager_admin_password)s' % env)