diff --git a/README.rst b/README.rst
index b48b3018ae22823a6be562959c1956c153a63d29..d9a3ca116ea5ffec707390abe98e04835a5a45a8 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ Role Variables
 --------------
 ::
 
-    git_directory: /srv/git #The directory to be created and used for all git repositories served.
+    cgit_directory: /srv/git #The directory to be created and used for all git repositories served.
 
 Dependencies
 ------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 3508c039210acd45f51bb1b27acd6675a5769c9d..b9cbc05f272cd224d824cb9b4b31f5811bf4b243 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 # defaults file for ansible-cgit
-git_directory: /srv/git
+
+cgit_directory: /srv/git
diff --git a/tasks/main.yml b/tasks/main.yml
index 3ffec812ed19a89ddcf00d8beff7fbb44c4e6cb2..fae2ec5540be7630aab9c78fffccc8824a2689bc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -43,7 +43,7 @@
 
 - name: Create git repostories directory
   file:
-      path: '{{ git_directory }}'
+      path: '{{ cgit_directory }}'
       owner: root
       group: root
       mode: '0777'
@@ -65,7 +65,7 @@
       regexp: '{{ item.regexp|default(omit) }}'
       insertbefore: '{{ item.insertbefore|default(omit) }}'
   with_items:
-      - line: 'scan-path={{ git_directory }}'
+      - line: 'scan-path={{ cgit_directory }}'
         regexp: 'scan-path='
       - line: 'css=/cgit/css/cgit.css'
         regexp: '^css='
diff --git a/templates/cgit.j2 b/templates/cgit.j2
index aa8ef8a706b614800f7660972caea1525077a06d..524849fd2318c16536f0bf4aae61a22da19d9e73 100644
--- a/templates/cgit.j2
+++ b/templates/cgit.j2
@@ -1,3 +1,3 @@
 #!/bin/sh -e
-cd {{ git_directory|dirname }}
-tar -cf /var/backups/git.tar.gz {{ git_directory|basename }}
+cd {{ cgit_directory|dirname }}
+tar -cf /var/backups/git.tar.gz {{ cgit_directory|basename }}