diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py
index 072cb75c..22d3d084 100644
--- a/{{cookiecutter.repo_name}}/config/settings/common.py
+++ b/{{cookiecutter.repo_name}}/config/settings/common.py
@@ -257,7 +257,7 @@ LOGGING = {
 }
 {% if cookiecutter.use_celery == "y" %}
 ########## CELERY
-INSTALLED_APPS += ('{{cookiecutter.repo_name}}.taskman.celery.CeleryConfig',)
+INSTALLED_APPS += ('{{cookiecutter.repo_name}}.taskapp.celery.CeleryConfig',)
 # if you are not using the django database broker (e.g. rabbitmq, redis, memcached), you can remove the next line.
 INSTALLED_APPS += ('kombu.transport.django',)
 BROKER_URL = env("CELERY_BROKER_URL", default='django://')
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskman/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskman/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskman/celery.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/celery.py
similarity index 83%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskman/celery.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/celery.py
index cd238af8..33cda5c6 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskman/celery.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/celery.py
@@ -14,7 +14,7 @@ app = Celery('{{cookiecutter.repo_name}}')
 
 
 class CeleryConfig(AppConfig):
-    name = '{{cookiecutter.repo_name}}.taskman'
+    name = '{{cookiecutter.repo_name}}.taskapp'
     verbose_name = 'Celery Config'
 
     def ready(self):
@@ -28,5 +28,6 @@ class CeleryConfig(AppConfig):
 def debug_task(self):
     print('Request: {0!r}'.format(self.request))
 {% else %}
-# use this as a starting point for your project with celery.
+# Use this as a starting point for your project with celery.
+# If you are not using celery, you can remove this app
 {% endif %}
\ No newline at end of file