diff --git a/gvm/protocols/gmp/requests/next/_agents.py b/gvm/protocols/gmp/requests/next/_agents.py
index 9cba99a9..816d46b7 100644
--- a/gvm/protocols/gmp/requests/next/_agents.py
+++ b/gvm/protocols/gmp/requests/next/_agents.py
@@ -224,7 +224,7 @@ def modify_agents(
                 function=cls.modify_agents.__name__, argument="agent_ids"
             )
 
-        cmd = XmlCommand("modify_agents")
+        cmd = XmlCommand("modify_agent")
         xml_agents = cmd.add_element("agents")
 
         for agent_id in agent_ids:
@@ -256,7 +256,7 @@ def delete_agents(cls, agent_ids: list[EntityID]) -> Request:
                 function=cls.delete_agents.__name__, argument="agent_ids"
             )
 
-        cmd = XmlCommand("delete_agents")
+        cmd = XmlCommand("delete_agent")
         xml_agents = cmd.add_element("agents")
 
         for agent_id in agent_ids:
diff --git a/tests/protocols/gmpnext/entities/agents/test_delete_agents.py b/tests/protocols/gmpnext/entities/agents/test_delete_agents.py
index c829de88..c18bc7e9 100644
--- a/tests/protocols/gmpnext/entities/agents/test_delete_agents.py
+++ b/tests/protocols/gmpnext/entities/agents/test_delete_agents.py
@@ -10,9 +10,9 @@ def test_delete_agents(self):
         self.gmp.delete_agents(agent_ids=["agent-123", "agent-456"])
 
         self.connection.send.has_been_called_with(
-            b"<delete_agents>"
+            b"<delete_agent>"
             b'<agents><agent id="agent-123"/><agent id="agent-456"/></agents>'
-            b"</delete_agents>"
+            b"</delete_agent>"
         )
 
     def test_delete_agents_without_ids(self):
diff --git a/tests/protocols/gmpnext/entities/agents/test_modify_agents.py b/tests/protocols/gmpnext/entities/agents/test_modify_agents.py
index 673a1241..290b78b0 100644
--- a/tests/protocols/gmpnext/entities/agents/test_modify_agents.py
+++ b/tests/protocols/gmpnext/entities/agents/test_modify_agents.py
@@ -10,9 +10,9 @@ def test_modify_agents_basic(self):
         self.gmp.modify_agents(agent_ids=["agent-123"])
 
         self.connection.send.has_been_called_with(
-            b"<modify_agents>"
+            b"<modify_agent>"
             b'<agents><agent id="agent-123"/></agents>'
-            b"</modify_agents>"
+            b"</modify_agent>"
         )
 
     def test_modify_agents_with_authorized_only(self):
@@ -21,10 +21,10 @@ def test_modify_agents_with_authorized_only(self):
         )
 
         self.connection.send.has_been_called_with(
-            b"<modify_agents>"
+            b"<modify_agent>"
             b'<agents><agent id="agent-123"/><agent id="agent-456"/></agents>'
             b"<authorized>1</authorized>"
-            b"</modify_agents>"
+            b"</modify_agent>"
         )
 
     def test_modify_agents_with_full_config_and_comment(self):
@@ -53,7 +53,7 @@ def test_modify_agents_with_full_config_and_comment(self):
         )
 
         self.connection.send.has_been_called_with(
-            b"<modify_agents>"
+            b"<modify_agent>"
             b'<agents><agent id="agent-123"/><agent id="agent-456"/></agents>'
             b"<authorized>1</authorized>"
             b"<config>"
@@ -78,7 +78,7 @@ def test_modify_agents_with_full_config_and_comment(self):
             b"</heartbeat>"
             b"</config>"
             b"<comment>Updated agents</comment>"
-            b"</modify_agents>"
+            b"</modify_agent>"
         )
 
     def test_modify_agents_with_full_config_with_missing_element(self):