diff --git a/src/managesieve/cmd-deletescript.c b/src/managesieve/cmd-deletescript.c
index b4de76f8a6759558bece6bb2f6c3565c7ab99097..a8be5c93b9776ce2b6060213c14e89b8cf54b886 100644
--- a/src/managesieve/cmd-deletescript.c
+++ b/src/managesieve/cmd-deletescript.c
@@ -21,7 +21,7 @@ bool cmd_deletescript(struct client_command_context *cmd)
 	if (!client_read_string_args(cmd, TRUE, 1, &scriptname))
 		return FALSE;
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
+	event_add_str(cmd->event, "script_name", scriptname);
 
 	script = sieve_storage_open_script(storage, scriptname, NULL);
 	if (script == NULL || sieve_script_delete(script, FALSE) < 0) {
diff --git a/src/managesieve/cmd-getscript.c b/src/managesieve/cmd-getscript.c
index 064465d58ecd7c359cf80a78eca4bb0d12fa06e0..700fede6d918f147481dd7b13c60425304486cb1 100644
--- a/src/managesieve/cmd-getscript.c
+++ b/src/managesieve/cmd-getscript.c
@@ -112,7 +112,7 @@ bool cmd_getscript(struct client_command_context *cmd)
 	if (!client_read_string_args(cmd, TRUE, 1, &scriptname))
 		return FALSE;
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
+	event_add_str(cmd->event, "script_name", scriptname);
 
 	ctx = p_new(cmd->pool, struct cmd_getscript_context, 1);
 	ctx->cmd = cmd;
diff --git a/src/managesieve/cmd-havespace.c b/src/managesieve/cmd-havespace.c
index 454172d19d8845fe197bff5cac5d6bbea481f0e3..468a9234525da01da1b55e581a6ab44b5823fb41 100644
--- a/src/managesieve/cmd-havespace.c
+++ b/src/managesieve/cmd-havespace.c
@@ -44,8 +44,8 @@ bool cmd_havespace(struct client_command_context *cmd)
 		return TRUE;
 	}
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
-	event_add_int(cmd->event, "managesieve_script_size", size);
+	event_add_str(cmd->event, "script_name", scriptname);
+	event_add_int(cmd->event, "script_size", size);
 
 	if (!managesieve_quota_check_all(cmd, scriptname, size))
 		return TRUE;
diff --git a/src/managesieve/cmd-putscript.c b/src/managesieve/cmd-putscript.c
index 43a9af55d0816f6059109471293a371c77fc5dc2..62b8371bb597a71a8a69e107c4a58133790b7c26 100644
--- a/src/managesieve/cmd-putscript.c
+++ b/src/managesieve/cmd-putscript.c
@@ -564,7 +564,7 @@ bool cmd_putscript(struct client_command_context *cmd)
 	if (!client_read_string_args(cmd, FALSE, 1, &scriptname))
 		return FALSE;
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
+	event_add_str(cmd->event, "script_name", scriptname);
 
 	return cmd_putscript_start(cmd, scriptname);
 }
diff --git a/src/managesieve/cmd-renamescript.c b/src/managesieve/cmd-renamescript.c
index c15bc3f75b31bb357fb142fe71e994cac2d5c2b0..d6641e7e9fa53993127f7f5569fa02baca4df744 100644
--- a/src/managesieve/cmd-renamescript.c
+++ b/src/managesieve/cmd-renamescript.c
@@ -22,8 +22,8 @@ bool cmd_renamescript(struct client_command_context *cmd)
 	if (!client_read_string_args(cmd, TRUE, 2, &scriptname, &newname))
 		return FALSE;
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
-	event_add_str(cmd->event, "managesieve_script_new_name", newname);
+	event_add_str(cmd->event, "script_name", scriptname);
+	event_add_str(cmd->event, "script_new_name", newname);
 
 	script = sieve_storage_open_script(storage, scriptname, NULL);
 	if (script == NULL) {
diff --git a/src/managesieve/cmd-setactive.c b/src/managesieve/cmd-setactive.c
index 92fee72ff3fd739d01be50b045a41b7b3cac4523..72012bf874d13224db08baadcc4e039d101a7840 100644
--- a/src/managesieve/cmd-setactive.c
+++ b/src/managesieve/cmd-setactive.c
@@ -24,7 +24,7 @@ cmd_setactive_activate(struct client_command_context *cmd,
 	bool success = TRUE;
 	int ret;
 
-	event_add_str(cmd->event, "managesieve_script_name", scriptname);
+	event_add_str(cmd->event, "script_name", scriptname);
 
 	script = sieve_storage_open_script(storage, scriptname, NULL);
 	if (script == NULL) {
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index af476c5590a05e8f5d40c59d5d50c61a81a3c72a..e310c85d8caac1351ed563042695e608863b8683 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -507,8 +507,7 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count,
 		managesieve_write_args(str, *args_r);
 		cmd->args = p_strdup(cmd->pool, str_c(str));
 
-		event_add_str(cmd->event, "managesieve_command_args",
-			      cmd->args);
+		event_add_str(cmd->event, "cmd_args", cmd->args);
 
 		/* all parameters read successfully */
 		return TRUE;
@@ -685,8 +684,7 @@ static bool client_handle_input(struct client_command_context *cmd)
 	} else {
 		i_assert(!client->disconnected);
 
-		event_add_str(cmd->event, "managesieve_command_name",
-			      t_str_ucase(cmd->name));
+		event_add_str(cmd->event, "cmd_name", t_str_ucase(cmd->name));
 		client_handle_input(cmd);
 	}