diff --git a/README.md b/README.md
index 9256fb4..2ee8f1c 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ and $SNAP_COMMON locations:
 
     /var/snap/keystone/common/etc/
     ├── keystone
-    │   └── conf.d
+    │   └── keystone.conf.d
     │       └── keystone-snap.conf
     ├── nginx
     │   ├── snap
@@ -48,7 +48,7 @@ area. The default keystone configuration can be overridden as follows:
 
     /var/snap/keystone/common/etc/
     ├── keystone
-    │   ├── conf.d
+    │   ├── keystone.conf.d
     │   │   ├── keystone-snap.conf
     │   │   ├── database.conf
     │   │   └── rabbitmq.conf
@@ -67,7 +67,7 @@ area. The default keystone configuration can be overridden as follows:
         └── keystone.ini
 
 The keystone configuration can be overridden or augmented by writing
-configuration snippets to files in the conf.d directory.
+configuration snippets to files in the keystone.conf.d directory.
 
 Alternatively, keystone configuration can be overridden by adding a full
 keystone.conf file to the keystone/ directory. If overriding in this way, you'll
diff --git a/snap/etc/keystone/keystone.conf b/snap/etc/keystone/keystone.conf
index 33d0c73..61c9c27 100644
--- a/snap/etc/keystone/keystone.conf
+++ b/snap/etc/keystone/keystone.conf
@@ -1,3 +1,3 @@
-# Snap distribution defaults - do not change, override in $SNAP_COMMON/etc/keystone/conf.d
+# Snap distribution defaults - do not change
 [database]
 max_retries = -1
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 4439fa5..25c7798 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -5,7 +5,7 @@ setup:
   dirs:
     - "{snap_common}/etc"
     - "{snap_common}/etc/keystone"
-    - "{snap_common}/etc/keystone/conf.d"
+    - "{snap_common}/etc/keystone/keystone.conf.d"
     - "{snap_common}/etc/nginx"
     - "{snap_common}/etc/nginx/sites-enabled"
     - "{snap_common}/etc/nginx/snap"
@@ -19,7 +19,7 @@ setup:
     - "{snap_common}/run"
   templates:
     keystone-nginx.conf.j2: "{snap_common}/etc/nginx/snap/sites-enabled/keystone.conf"
-    keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
+    keystone-snap.conf.j2: "{snap_common}/etc/keystone/keystone.conf.d/keystone-snap.conf"
     nginx.conf.j2: "{snap_common}/etc/nginx/snap/nginx.conf"
   rchown:
     "{snap_common}/fernet-keys": "snap-keystone:snap-keystone"
@@ -35,7 +35,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/keystone/keystone.conf"
     config-dirs:
-      - "{snap_common}/etc/keystone/conf.d"
+      - "{snap_common}/etc/keystone/keystone.conf.d"
     run-as:
       snap-keystone: [snap-keystone]
   keystone-uwsgi:
@@ -48,7 +48,7 @@ entry_points:
     config-files-override:
       - "{snap_common}/etc/keystone/keystone.conf"
     config-dirs:
-      - "{snap_common}/etc/keystone/conf.d"
+      - "{snap_common}/etc/keystone/keystone.conf.d"
     log-file: "{snap_common}/log/keystone.log"
     templates:
       admin.ini.j2: "{snap_common}/etc/uwsgi/snap/admin.ini"