diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index cb8bf7965cd..e88dd7a4b9b 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -5941,7 +5941,7 @@ SELECT ... FROM GRAPH_TABLE (myshop
 
   <para>
    For more details on the syntax for creating property graphs, see <link
-   linkend="sql-create-property-graph"><command>CREATE PROPERTY
+   linkend="sql-createpropertygraph"><command>CREATE PROPERTY
    GRAPH</command></link>.  More details about the graph query syntax is in
    <xref linkend="queries-graph"/>.
   </para>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index fd338ab1540..d58b16977cd 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1426,7 +1426,7 @@ postgres=# SELECT pg_current_wal_insert_lsn();
     The <acronym>LSN</acronym> obtained from the primary is then communicated
     to the standby server. This can be managed at the application level or
     via the connection pooler.  On the standby, the application issues the
-    <xref linkend="sql-wait-for"/> command to block further processing until
+    <xref linkend="sql-waitfor"/> command to block further processing until
     the standby's WAL replay process reaches (or exceeds) the specified
     <acronym>LSN</acronym>.
 
diff --git a/doc/src/sgml/ref/alter_property_graph.sgml b/doc/src/sgml/ref/alter_property_graph.sgml
index d2768a4644a..ecf3cff66db 100644
--- a/doc/src/sgml/ref/alter_property_graph.sgml
+++ b/doc/src/sgml/ref/alter_property_graph.sgml
@@ -3,8 +3,8 @@ doc/src/sgml/ref/alter_property_graph.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="sql-alter-property-graph">
- <indexterm zone="sql-alter-property-graph">
+<refentry id="sql-alterpropertygraph">
+ <indexterm zone="sql-alterpropertygraph">
   <primary>ALTER PROPERTY GRAPH</primary>
  </indexterm>
 
@@ -66,7 +66,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] <replaceable class="parameter">name</replacea
      <listitem>
       <para>
        This form adds new vertex or edge tables to the property graph, using the
-       same syntax as <link linkend="sql-create-property-graph"><command>CREATE
+       same syntax as <link linkend="sql-createpropertygraph"><command>CREATE
        PROPERTY GRAPH</command></link>.
       </para>
      </listitem>
@@ -89,7 +89,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] <replaceable class="parameter">name</replacea
       <para>
        This form adds a new label to an existing vertex or edge table, using
        the same syntax as <link
-       linkend="sql-create-property-graph"><command>CREATE PROPERTY
+       linkend="sql-createpropertygraph"><command>CREATE PROPERTY
        GRAPH</command></link>.
       </para>
      </listitem>
@@ -196,7 +196,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] <replaceable class="parameter">name</replacea
     <term><replaceable class="parameter">edge_table_definition</replaceable></term>
     <listitem>
      <para>
-      See <link linkend="sql-create-property-graph"><command>CREATE PROPERTY
+      See <link linkend="sql-createpropertygraph"><command>CREATE PROPERTY
       GRAPH</command></link>.
      </para>
     </listitem>
@@ -221,7 +221,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] <replaceable class="parameter">name</replacea
     <term><replaceable class="parameter">expression</replaceable></term>
     <listitem>
      <para>
-      See <link linkend="sql-create-property-graph"><command>CREATE PROPERTY
+      See <link linkend="sql-createpropertygraph"><command>CREATE PROPERTY
       GRAPH</command></link>.
      </para>
     </listitem>
@@ -261,7 +261,7 @@ ALTER PROPERTY GRAPH [ IF EXISTS ] <replaceable class="parameter">name</replacea
 
   <para>
    The consistency checks on a property graph described at <xref
-   linkend="sql-create-property-graph-notes"/> must be maintained by
+   linkend="sql-createpropertygraph-notes"/> must be maintained by
    <command>ALTER PROPERTY GRAPH</command> operations.  In some cases, it
    might be necessary to make multiple alterations in a single command to
    satisfy the checks.
@@ -294,8 +294,8 @@ ALTER PROPERTY GRAPH g1 RENAME TO g2;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-create-property-graph"/></member>
-   <member><xref linkend="sql-drop-property-graph"/></member>
+   <member><xref linkend="sql-createpropertygraph"/></member>
+   <member><xref linkend="sql-droppropertygraph"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_property_graph.sgml b/doc/src/sgml/ref/create_property_graph.sgml
index 8078de2b1b2..2eb9fd89d2c 100644
--- a/doc/src/sgml/ref/create_property_graph.sgml
+++ b/doc/src/sgml/ref/create_property_graph.sgml
@@ -3,8 +3,8 @@ doc/src/sgml/ref/create_property_graph.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="sql-create-property-graph">
- <indexterm zone="sql-create-property-graph">
+<refentry id="sql-createpropertygraph">
+ <indexterm zone="sql-createpropertygraph">
   <primary>CREATE PROPERTY GRAPH</primary>
  </indexterm>
 
@@ -191,7 +191,7 @@ CREATE [ TEMP | TEMPORARY ] PROPERTY GRAPH <replaceable class="parameter">name</
   </variablelist>
  </refsect1>
 
- <refsect1 id="sql-create-property-graph-notes">
+ <refsect1 id="sql-createpropertygraph-notes">
   <title>Notes</title>
 
   <para>
@@ -311,8 +311,8 @@ CREATE PROPERTY GRAPH g1
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alter-property-graph"/></member>
-   <member><xref linkend="sql-drop-property-graph"/></member>
+   <member><xref linkend="sql-alterpropertygraph"/></member>
+   <member><xref linkend="sql-droppropertygraph"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_property_graph.sgml b/doc/src/sgml/ref/drop_property_graph.sgml
index e16de5507b1..5a91579a0e3 100644
--- a/doc/src/sgml/ref/drop_property_graph.sgml
+++ b/doc/src/sgml/ref/drop_property_graph.sgml
@@ -3,8 +3,8 @@ doc/src/sgml/ref/drop_property_graph.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="sql-drop-property-graph">
- <indexterm zone="sql-drop-property-graph">
+<refentry id="sql-droppropertygraph">
+ <indexterm zone="sql-droppropertygraph">
   <primary>DROP PROPERTY GRAPH</primary>
  </indexterm>
 
@@ -104,8 +104,8 @@ DROP PROPERTY GRAPH g1;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-create-property-graph"/></member>
-   <member><xref linkend="sql-alter-property-graph"/></member>
+   <member><xref linkend="sql-createpropertygraph"/></member>
+   <member><xref linkend="sql-alterpropertygraph"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index e7072691669..68fb4911769 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -600,7 +600,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
        <para>
         <replaceable class="parameter">graph_name</replaceable> is the name
         (optionally schema-qualified) of an existing property graph (defined
-        with <xref linkend="sql-create-property-graph"/>).
+        with <xref linkend="sql-createpropertygraph"/>).
        </para>
 
        <para>
diff --git a/doc/src/sgml/ref/wait_for.sgml b/doc/src/sgml/ref/wait_for.sgml
index 6f0744fd2c5..04ca9400426 100644
--- a/doc/src/sgml/ref/wait_for.sgml
+++ b/doc/src/sgml/ref/wait_for.sgml
@@ -3,8 +3,8 @@ doc/src/sgml/ref/wait_for.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="sql-wait-for">
- <indexterm zone="sql-wait-for">
+<refentry id="sql-waitfor">
+ <indexterm zone="sql-waitfor">
   <primary>WAIT FOR</primary>
  </indexterm>