diff --git a/src/lib-sieve/storage/dict/sieve-dict-script.c b/src/lib-sieve/storage/dict/sieve-dict-script.c
index bcafd4a512b0e78a51a58f32d8a93805e791c9bc..4868254ef21355f6a088170d88b56a0c5f281f7c 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-script.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-script.c
@@ -209,19 +209,19 @@ sieve_dict_script_binary_dump_metadata(struct sieve_script *script ATTR_UNUSED,
 }
 
 static const char *
-sieve_dict_script_get_binpath(struct sieve_dict_script *dscript)
+sieve_dict_script_get_bin_path(struct sieve_dict_script *dscript)
 {
 	struct sieve_script *script = &dscript->script;
 	struct sieve_storage *storage = script->storage;
 
-	if (dscript->binpath == NULL) {
+	if (dscript->bin_path == NULL) {
 		if (storage->bin_path == NULL)
 			return NULL;
-		dscript->binpath = p_strconcat(
+		dscript->bin_path = p_strconcat(
 			script->pool, storage->bin_path, "/",
 			sieve_binfile_from_name(script->name), NULL);
 	}
-	return dscript->binpath;
+	return dscript->bin_path;
 }
 
 static int
@@ -232,10 +232,10 @@ sieve_dict_script_binary_load(struct sieve_script *script,
 	struct sieve_dict_script *dscript =
 		container_of(script, struct sieve_dict_script, script);
 
-	if (sieve_dict_script_get_binpath(dscript) == NULL)
+	if (sieve_dict_script_get_bin_path(dscript) == NULL)
 		return -1;
 
-	return sieve_binary_open(script->storage->svinst, dscript->binpath,
+	return sieve_binary_open(script->storage->svinst, dscript->bin_path,
 				 script, sbin_r, error_code_r);
 }
 
@@ -247,12 +247,12 @@ sieve_dict_script_binary_save(struct sieve_script *script,
 	struct sieve_dict_script *dscript =
 		container_of(script, struct sieve_dict_script, script);
 
-	if (sieve_dict_script_get_binpath(dscript) == NULL)
+	if (sieve_dict_script_get_bin_path(dscript) == NULL)
 		return 0;
 	if (sieve_storage_setup_bin_path(script->storage, 0700) < 0)
 		return -1;
 
-	return sieve_binary_save(sbin, dscript->binpath, update, 0600,
+	return sieve_binary_save(sbin, dscript->bin_path, update, 0600,
 				 error_code_r);
 }
 
diff --git a/src/lib-sieve/storage/dict/sieve-dict-storage.h b/src/lib-sieve/storage/dict/sieve-dict-storage.h
index 255f0f1e2781de4cc2cacc4c72421e06d3e3cdc4..4e72d6a3fd549a70737eb0b9325cbcc2eaf74813 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-storage.h
+++ b/src/lib-sieve/storage/dict/sieve-dict-storage.h
@@ -44,7 +44,7 @@ struct sieve_dict_script {
 	const char *data_id;
 	const char *data;
 
-	const char *binpath;
+	const char *bin_path;
 };
 
 struct sieve_dict_script *