diff --git a/src/managesieve/cmd-getscript.c b/src/managesieve/cmd-getscript.c
index 17f1093904e456f55138771b804c2441e0323df7..f3c63cc77d615525d474f6809f35163c233d329c 100644
--- a/src/managesieve/cmd-getscript.c
+++ b/src/managesieve/cmd-getscript.c
@@ -104,7 +104,7 @@ bool cmd_getscript(struct client_command_context *cmd)
 	struct client *client = cmd->client;
 	struct cmd_getscript_context *ctx;
 	const char *scriptname;
-	enum sieve_error error;
+	enum sieve_error error_code;
 
 	/* <scriptname> */
 	if (!client_read_string_args(cmd, TRUE, 1, &scriptname))
@@ -127,9 +127,9 @@ bool cmd_getscript(struct client_command_context *cmd)
 	}
 
 	if (sieve_script_get_stream(ctx->script, &ctx->script_stream,
-				    &error) < 0) {
-		if (error == SIEVE_ERROR_NOT_FOUND) {
-			sieve_storage_set_error(client->storage, error,
+				    &error_code) < 0) {
+		if (error_code == SIEVE_ERROR_NOT_FOUND) {
+			sieve_storage_set_error(client->storage, error_code,
 						"Script does not exist.");
 		}
 		ctx->failed = TRUE;
diff --git a/src/managesieve/cmd-putscript.c b/src/managesieve/cmd-putscript.c
index 374d37c721daf129ed75eab78b2dcb5d8a714689..fe2c2a9c3ea48542eb18e0362f0b76d60d47094f 100644
--- a/src/managesieve/cmd-putscript.c
+++ b/src/managesieve/cmd-putscript.c
@@ -181,7 +181,7 @@ cmd_putscript_finish_script(struct cmd_putscript_context *ctx,
 		SIEVE_COMPILE_FLAG_NOGLOBAL | SIEVE_COMPILE_FLAG_UPLOADED;
 	struct sieve_binary *sbin;
 	bool success = TRUE;
-	enum sieve_error error;
+	enum sieve_error error_code;
 	string_t *errors;
 
 	/* Mark this as an activation when we are replacing the
@@ -196,13 +196,14 @@ cmd_putscript_finish_script(struct cmd_putscript_context *ctx,
 		client->set->managesieve_max_compile_errors);
 
 	/* Compile */
-	sbin = sieve_compile_script(script, ehandler, cpflags, &error);
+	sbin = sieve_compile_script(script, ehandler, cpflags, &error_code);
 	if (sbin == NULL) {
 		const char *errormsg = NULL, *action;
 
-		if (error != SIEVE_ERROR_NOT_VALID) {
-			errormsg = sieve_script_get_last_error(script, &error);
-			if (error == SIEVE_ERROR_NONE)
+		if (error_code != SIEVE_ERROR_NOT_VALID) {
+			errormsg = sieve_script_get_last_error(
+				script, &error_code);
+			if (error_code == SIEVE_ERROR_NONE)
 				errormsg = NULL;
 		}
 
diff --git a/src/managesieve/cmd-setactive.c b/src/managesieve/cmd-setactive.c
index 8c3b44b7192ab19287477487b8de6849691a5658..a086977fe43197dcb73ca61ba8f38128b4a14c52 100644
--- a/src/managesieve/cmd-setactive.c
+++ b/src/managesieve/cmd-setactive.c
@@ -42,7 +42,7 @@ cmd_setactive_activate(struct client_command_context *cmd,
 			SIEVE_COMPILE_FLAG_NOGLOBAL |
 			SIEVE_COMPILE_FLAG_ACTIVATED;
 		struct sieve_binary *sbin;
-		enum sieve_error error;
+		enum sieve_error error_code;
 
 		/* Prepare error handler */
 		errors = str_new(default_pool, 1024);
@@ -51,12 +51,13 @@ cmd_setactive_activate(struct client_command_context *cmd,
 			client->set->managesieve_max_compile_errors);
 
 		/* Compile */
-		sbin = sieve_compile_script(script, ehandler, cpflags, &error);
+		sbin = sieve_compile_script(script, ehandler, cpflags,
+					    &error_code);
 		if (sbin == NULL) {
-			if (error != SIEVE_ERROR_NOT_VALID) {
+			if (error_code != SIEVE_ERROR_NOT_VALID) {
 				errormsg = sieve_script_get_last_error(
-					script, &error);
-				if (error == SIEVE_ERROR_NONE)
+					script, &error_code);
+				if (error_code == SIEVE_ERROR_NONE)
 					errormsg = NULL;
 			}
 			success = FALSE;
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index da18f690fb020252a2e995a3dd4628b9180b2f00..47bd0dd3c3fafdacabc3bfae56bd1c54e235b051 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -66,16 +66,16 @@ client_get_storage(struct sieve_instance *svinst, struct event *event,
 		   struct mail_user *user, int fd_out)
 {
 	struct sieve_storage *storage;
-	enum sieve_error error;
+	enum sieve_error error_code;
 	const char *errormsg, *byemsg;
 
 	/* Open personal script storage */
 
 	storage = sieve_storage_create_main(svinst, user,
 					    SIEVE_STORAGE_FLAG_READWRITE,
-					    &error);
+					    &error_code);
 	if (storage == NULL) {
-		switch (error) {
+		switch (error_code) {
 		case SIEVE_ERROR_NOT_POSSIBLE:
 			byemsg = "BYE \"Sieve processing is disabled for this user.\"\r\n";
 			errormsg = "Failed to open Sieve storage: "