diff --git a/nimble/host/mesh/src/settings.c b/nimble/host/mesh/src/settings.c
index 30fbf5a..193cc0b 100644
--- a/nimble/host/mesh/src/settings.c
+++ b/nimble/host/mesh/src/settings.c
@@ -1239,7 +1239,7 @@
 		return;
 	}
 
-	snprintk(path, sizeof(path), "bt/mesh/RPL/%x", rpl->src);
+	snprintk(path, sizeof(path), "bt_mesh/RPL/%x", rpl->src);
 	err = settings_save_one(path, NULL);
 	if (err) {
 		BT_ERR("Failed to clear RPL");
@@ -1388,7 +1388,7 @@
 
 	BT_DBG("NetKeyIndex 0x%03x", net_idx);
 
-	snprintk(path, sizeof(path), "bt/mesh/NetKey/%x", net_idx);
+	snprintk(path, sizeof(path), "bt_mesh/NetKey/%x", net_idx);
 
 	memcpy(&key.val[0], sub->keys[0].net, 16);
 	memcpy(&key.val[1], sub->keys[1].net, 16);
@@ -1418,7 +1418,7 @@
 	char *str;
 	int err;
 
-	snprintk(path, sizeof(path), "bt/mesh/AppKey/%x", app_idx);
+	snprintk(path, sizeof(path), "bt_mesh/AppKey/%x", app_idx);
 
 	app = bt_mesh_app_key_get(app_idx);
 	if (!app) {
@@ -1532,7 +1532,7 @@
 	memcpy(val.uuid, node->uuid, 16);
 	memcpy(val.dev_key, node->dev_key, 16);
 
-	snprintk(path, sizeof(path), "bt/mesh/cdb/Node/%x", node->addr);
+	snprintk(path, sizeof(path), "bt_mesh/cdb/Node/%x", node->addr);
 
 	str = settings_str_from_bytes(&val, sizeof(val), buf, sizeof(buf));
 	if (!str) {
