diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 8bf20dab1..fb66a8722 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 <protocol>
   <name>Greenbone Management Protocol</name>
   <abbreviation>GMP</abbreviation>
-  <summary>The "management" protocol of the Open Vulnerability Assessment System</summary>
+  <summary>The management protocol of the Greenbone Vulnerability Manager</summary>
   <version>@GMP_VERSION@</version>
 
   <!-- Types. -->
@@ -11177,7 +11177,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               </target>
             </targets>
             <public_key>
-              ssh-rsa AAAAB3...Z64IcQ== Key generated by OpenVAS Manager
+              ssh-rsa AAAAB3...Z64IcQ== Key generated by GVM
             </public_key>
           </credential>
         </get_credentials_response>
@@ -22800,7 +22800,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   </command>
   <command>
     <name>get_version</name>
-    <summary>Get the OpenVAS Manager Protocol version</summary>
+    <summary>Get the Greenbone Management Protocol version</summary>
     <pattern></pattern>
     <response>
       <pattern>
@@ -23385,10 +23385,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <help_response status="200" status_text="OK">
           <schema format="XML" extension="xml" content_type="text/xml">
             <protocol>
-              <name>OpenVAS Management Protocol</name>
+              <name>Greenbone Management Protocol</name>
               <abbreviation>GMP</abbreviation>
-              <summary>The "management" protocol of the Open Vulnerability Assessment System</summary>
-              <version>1.0</version>
+              <summary>The management protocol of the Greenbone Vulnerability Manager</summary>
+              <version>@GMP_VERSION@</version>
+              <truncated>...</truncated>
               <type>
                 <name>base64</name>
                 <summary>Base64 encoded data</summary>
@@ -23398,72 +23399,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               <command>
                 <name>authenticate</name>
                 <summary>Authenticate with the manager</summary>
-                <description>
-                  <p>
-                    The client uses the authenticate command to authenticate with the
-                    Manager.
-                  </p>
-                  <p>
-                    The client normally executes this command at the beginning of each
-                    connection.  The only commands permitted before authentication are
-                    get_version and commands.
-                  </p>
-                </description>
-                <pattern>
-                  <e>credentials</e>
-                </pattern>
-                <ele>
-                  <name>credentials</name>
-                  <pattern>
-                    <e>username</e>
-                    <e>password</e>
-                  </pattern>
-                  <ele>
-                    <name>username</name>
-                    <summary>The login name of the user</summary>
-                    <pattern>
-                      text
-                    </pattern>
-                  </ele>
-                  <ele>
-                    <name>password</name>
-                    <summary>The user's password</summary>
-                    <pattern>
-                      text
-                    </pattern>
-                  </ele>
-                </ele>
-                <response>
-                  <pattern>
-                    <attrib>
-                      <name>status</name>
-                      <type>status</type>
-                      <required>1</required>
-                    </attrib>
-                    <attrib>
-                      <name>status_text</name>
-                      <type>text</type>
-                      <required>1</required>
-                    </attrib>
-                  </pattern>
-                </response>
-                <example>
-                  <summary>Authenticate with a good password</summary>
-                  <request>
-                    <authenticate>
-                      <credentials>
-                        <username>sally</username>
-                        <password>secret</password>
-                      </credentials>
-                    </authenticate>
-                  </request>
-                  <response>
-                    <authenticate_response status="200" status_text="OK">
-                      <role>User</role>
-                      <timezone>UTC</timezone>
-                    </authenticate_response>
-                  </response>
-                </example>
                 <truncated>...</truncated>
               </command>
               <truncated>...</truncated>
@@ -25846,11 +25781,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   </command>
   <command>
     <name>modify_user</name>
-    <summary>Modify a user</summary>
+    <summary>Modify an existing user</summary>
     <description>
       <p>
-        The client uses the "modify_user" command to modify an user account
-        on the OpenVAS server.
+        The client uses the modify_user command to change an existing user.
       </p>
     </description>
     <pattern>