diff --git a/README.md b/README.md
index dc69c20..a1cb62c 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ If the `tarsnapper.tarsnap.run_on` variable is set to anything other than
 
 [git-annex][19] is installed for file syncing. A systemd service unit for the
 git-annex assistant is enabled and started by default. To prevent this, remove
-the `git-annex` variable from the config.
+the `gitannex` variable from the config.
 
 NetworkManager dispatchers are installed to stop the service when connecting to
 untrusted networks. This helps to avoid having network tasks that may leak
@@ -201,7 +201,7 @@ any network.  Conversely, the git-annex assistant is started by default,
 stopped *before* connecting to an untrusted network, and immediately started
 after disconnecting from any network.
 
-If the `git-annex.stopped_on` variable is set to anything other than
+If the `gitannex.stopped_on` variable is set to anything other than
 `untrusted`, the NetworkManager dispatchers will not be installed, resulting in
 the git-annex assistant service not being stopped on untrusted networks.
 
diff --git a/group_vars/all b/group_vars/all
index 1f9cb6d..880ea6c 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -79,5 +79,5 @@ tarsnapper:
     frequency: 1h
     run_on: trusted
 
-git-annex:
+gitannex:
     stopped_on: untrusted
diff --git a/roles/git-annex/tasks/main.yml b/roles/git-annex/tasks/main.yml
index 0388029..29e3090 100644
--- a/roles/git-annex/tasks/main.yml
+++ b/roles/git-annex/tasks/main.yml
@@ -9,12 +9,12 @@
 
 - name: Enable and start git-annex assistant service
   service: name="git-annex@{{ user.name }}.service" enabled=yes state=started
-  when: git-annex is defined
+  when: gitannex is defined
 
 - name: Push dispatcher to disable git-annex assistant on untrusted networks
   template: src=gitannex_disabler.sh.j2 dest=/etc/NetworkManager/dispatcher.d/pre-up.d/10gitannex_disabler mode=0755
-  when: git-annex.stopped_on == "untrusted"
+  when: gitannex.stopped_on == "untrusted"
 
 - name: Push dispatcher to activate git-annex assistant on network disconnect
   template: src=gitannex_enabler.sh.j2 dest=/etc/NetworkManager/dispatcher.d/10gitannex mode=0755
-  when: git-annex.stopped_on == "untrusted"
+  when: gitannex.stopped_on == "untrusted"