diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 3b2ba963c7cde62152e0868414a19a197b9f6cb6..eacc43661a17443e8fb74ff5c2bff955995c8f4e 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -567,7 +567,7 @@ const char *sieve_script_binary_get_prefix(struct sieve_script *script)
 	struct sieve_storage *storage = script->storage;
 
 	if (storage->bin_path != NULL &&
-	    sieve_storage_setup_bindir(storage, 0700) >= 0)
+	    sieve_storage_setup_bin_path(storage, 0700) >= 0)
 		return t_strconcat(storage->bin_path, "/", script->name, NULL);
 	if (script->v.binary_get_prefix == NULL)
 		return NULL;
diff --git a/src/lib-sieve/sieve-storage-private.h b/src/lib-sieve/sieve-storage-private.h
index e7b48f9698f12b2c75d58fe54839b118bc1c8622..3a27df28e67dbc38b51770f26cf688e7782c59d6 100644
--- a/src/lib-sieve/sieve-storage-private.h
+++ b/src/lib-sieve/sieve-storage-private.h
@@ -129,7 +129,7 @@ int sieve_storage_alloc(struct sieve_instance *svinst, struct event *event,
 			const char *data, enum sieve_storage_flags flags,
 			bool main, struct sieve_storage **storage_r);
 
-int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode);
+int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode);
 
 /*
  * Active script
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 35b7fd17799507c4ab4cd3d8664d901f35aa24a4..934f86f115565cf2e4244e5daa1b6b2838070e87 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -614,7 +614,7 @@ void sieve_storage_unref(struct sieve_storage **_storage)
 	pool_unref(&storage->pool);
 }
 
-int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode)
+int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode)
 {
 	const char *bin_path = storage->bin_path;
 	struct stat st;
diff --git a/src/lib-sieve/storage/dict/sieve-dict-script.c b/src/lib-sieve/storage/dict/sieve-dict-script.c
index c7e55eef53dbdf8fdd47de8326f2b6674fab31fe..bcafd4a512b0e78a51a58f32d8a93805e791c9bc 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-script.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-script.c
@@ -249,7 +249,7 @@ sieve_dict_script_binary_save(struct sieve_script *script,
 
 	if (sieve_dict_script_get_binpath(dscript) == NULL)
 		return 0;
-	if (sieve_storage_setup_bindir(script->storage, 0700) < 0)
+	if (sieve_storage_setup_bin_path(script->storage, 0700) < 0)
 		return -1;
 
 	return sieve_binary_save(sbin, dscript->binpath, update, 0600,
diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c
index 37342e82b6620854b948d2a68c73ff8ff3f5df5d..a3ce84df2016678ae73699c692565905ff99d238 100644
--- a/src/lib-sieve/storage/file/sieve-file-script.c
+++ b/src/lib-sieve/storage/file/sieve-file-script.c
@@ -555,7 +555,7 @@ sieve_file_script_binary_save(struct sieve_script *script,
 		container_of(script, struct sieve_file_script, script);
 
 	if (storage->bin_path != NULL &&
-	    sieve_storage_setup_bindir(storage, 0700) < 0)
+	    sieve_storage_setup_bin_path(storage, 0700) < 0)
 		return -1;
 
 	return sieve_binary_save(
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-script.c b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
index 585ce04d6d8bf0ace36697190012b025bf13fe7a..52e6b610762d7a34475b07aa9395cca0bfb7e452 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-script.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
@@ -272,7 +272,7 @@ sieve_ldap_script_binary_save(struct sieve_script *script,
 
 	if (sieve_ldap_script_get_binpath(lscript) == NULL)
 		return 0;
-	if (sieve_storage_setup_bindir(script->storage, 0700) < 0)
+	if (sieve_storage_setup_bin_path(script->storage, 0700) < 0)
 		return -1;
 
 	return sieve_binary_save(sbin, lscript->binpath, update, 0600,