diff --git a/README.md b/README.md
index f211ab2..b381fe0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To avoid `etckeeper` autocommits (daily or before package manager runs) set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 roles:
     - { role: etckeeper,                    tags: ['system', 'etckeeper'],
-        avoid_autocommits: true }
+        etckeeper_avoid_autocommits: true }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To send commit emails to root:
@@ -20,6 +20,6 @@ To send commit emails to root:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 roles:
     - { role: etckeeper,                    tags: ['system', 'etckeeper'],
-        avoid_autocommits: true,
+        etckeeper_avoid_autocommits: true,
         etckeeper_mailto: root }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/defaults/main.yml b/defaults/main.yml
index 33ac4be..bb6511a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-avoid_autocommits: false
+etckeeper_avoid_autocommits: false
diff --git a/templates/etckeeper.conf.j2 b/templates/etckeeper.conf.j2
index f195e20..ecfec0b 100644
--- a/templates/etckeeper.conf.j2
+++ b/templates/etckeeper.conf.j2
@@ -18,7 +18,7 @@ DARCS_COMMIT_OPTIONS="-a"
 
 # Uncomment to avoid etckeeper committing existing changes
 # to /etc automatically once per day.
-AVOID_DAILY_AUTOCOMMITS={{ '1' if avoid_autocommits else '0' }}
+AVOID_DAILY_AUTOCOMMITS={{ '1' if etckeeper_avoid_autocommits else '0' }}
 
 # Uncomment the following to avoid special file warning
 # (the option is enabled automatically by cronjob regardless).
@@ -27,7 +27,7 @@ AVOID_DAILY_AUTOCOMMITS={{ '1' if avoid_autocommits else '0' }}
 # Uncomment to avoid etckeeper committing existing changes to
 # /etc before installation. It will cancel the installation,
 # so you can commit the changes by hand.
-AVOID_COMMIT_BEFORE_INSTALL={{ '1' if avoid_autocommits else '0' }}
+AVOID_COMMIT_BEFORE_INSTALL={{ '1' if etckeeper_avoid_autocommits else '0' }}
 
 # The high-level package manager that's being used.
 # (apt, pacman-g2, yum, dnf, zypper etc)