diff --git a/product_docs/docs/pgd/5.9/connection-manager/overview.mdx b/product_docs/docs/pgd/5.9/connection-manager/overview.mdx
index 02028f34a7..45f0029645 100644
--- a/product_docs/docs/pgd/5.9/connection-manager/overview.mdx
+++ b/product_docs/docs/pgd/5.9/connection-manager/overview.mdx
@@ -47,7 +47,7 @@ Use the following steps to move from PGD Proxy to Connection Manager:
         END LOOP;
     END;
     $$;
-    SELECT wait_slot_confirm_lsn(NULL, NULL);
+    SELECT bdr.wait_slot_confirm_lsn(NULL, NULL);
     ```
    !!!Note
 
diff --git a/product_docs/docs/pgd/6.1/upgrades/manual_overview.mdx b/product_docs/docs/pgd/6.1/upgrades/manual_overview.mdx
index 0b2dd407f2..f10757fcd3 100644
--- a/product_docs/docs/pgd/6.1/upgrades/manual_overview.mdx
+++ b/product_docs/docs/pgd/6.1/upgrades/manual_overview.mdx
@@ -240,7 +240,7 @@ that the upgraded node is working as expected.
 
 Use the following steps to move from PGD Proxy to Connection Manager:
 
-1.  From one of the PGD 5.9 nodes, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
+1.  From one of the PGD 5.9 nodes, as a database superuser, and while connected to the PGD-enabled database, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
 
 -   ```sql
     DO $$
@@ -256,7 +256,7 @@ Use the following steps to move from PGD Proxy to Connection Manager:
         END LOOP;
     END;
     $$;
-    SELECT wait_slot_confirm_lsn(NULL, NULL);
+    SELECT bdr.wait_slot_confirm_lsn(NULL, NULL);
     ```
 -   !!!Note
 
diff --git a/product_docs/docs/pgd/6.1/upgrades/upgrading_major_rolling.mdx b/product_docs/docs/pgd/6.1/upgrades/upgrading_major_rolling.mdx
index dd689d6654..209f1d2edc 100644
--- a/product_docs/docs/pgd/6.1/upgrades/upgrading_major_rolling.mdx
+++ b/product_docs/docs/pgd/6.1/upgrades/upgrading_major_rolling.mdx
@@ -262,7 +262,7 @@ BEGIN
     END LOOP;
 END;
 $$; 
-SELECT wait_slot_confirm_lsn(NULL,NULL);
+SELECT bdr.wait_slot_confirm_lsn(NULL,NULL);
 ```
 ### Enable routing
 Enable node group routing as per your global or local routing requirement. For local routing enable it on subgroups, for global routing enable it on the top group.
diff --git a/product_docs/docs/pgd/6.2/lifecycle/upgrades/manual_overview.mdx b/product_docs/docs/pgd/6.2/lifecycle/upgrades/manual_overview.mdx
index 643d468c91..bb00acdd9a 100644
--- a/product_docs/docs/pgd/6.2/lifecycle/upgrades/manual_overview.mdx
+++ b/product_docs/docs/pgd/6.2/lifecycle/upgrades/manual_overview.mdx
@@ -243,7 +243,7 @@ that the upgraded node is working as expected.
 
 Use the following steps to move from PGD Proxy to Connection Manager:
 
-1.  From one of the PGD 5.9 nodes, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
+1.  From one of the PGD 5.9 nodes, as a database superuser, and while connected to the PGD-enabled database, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
 
 -   ```sql
     DO $$
@@ -259,7 +259,7 @@ Use the following steps to move from PGD Proxy to Connection Manager:
         END LOOP;
     END;
     $$;
-    SELECT wait_slot_confirm_lsn(NULL, NULL);
+    SELECT bdr.wait_slot_confirm_lsn(NULL, NULL);
     ```
 -   !!!Note
 
diff --git a/product_docs/docs/pgd/6.2/lifecycle/upgrades/upgrading_major_rolling.mdx b/product_docs/docs/pgd/6.2/lifecycle/upgrades/upgrading_major_rolling.mdx
index 3039ab0390..55f657fe3f 100644
--- a/product_docs/docs/pgd/6.2/lifecycle/upgrades/upgrading_major_rolling.mdx
+++ b/product_docs/docs/pgd/6.2/lifecycle/upgrades/upgrading_major_rolling.mdx
@@ -272,7 +272,7 @@ BEGIN
     END LOOP;
 END;
 $$; 
-SELECT wait_slot_confirm_lsn(NULL,NULL);
+SELECT bdr.wait_slot_confirm_lsn(NULL,NULL);
 ```
 ### Enable routing
 Enable node group routing as per your global or local routing requirement. For local routing enable it on subgroups, for global routing enable it on the top group.
diff --git a/product_docs/docs/pgd/6.3/lifecycle/upgrades/manual_overview.mdx b/product_docs/docs/pgd/6.3/lifecycle/upgrades/manual_overview.mdx
index 643d468c91..bb00acdd9a 100644
--- a/product_docs/docs/pgd/6.3/lifecycle/upgrades/manual_overview.mdx
+++ b/product_docs/docs/pgd/6.3/lifecycle/upgrades/manual_overview.mdx
@@ -243,7 +243,7 @@ that the upgraded node is working as expected.
 
 Use the following steps to move from PGD Proxy to Connection Manager:
 
-1.  From one of the PGD 5.9 nodes, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
+1.  From one of the PGD 5.9 nodes, as a database superuser, and while connected to the PGD-enabled database, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
 
 -   ```sql
     DO $$
@@ -259,7 +259,7 @@ Use the following steps to move from PGD Proxy to Connection Manager:
         END LOOP;
     END;
     $$;
-    SELECT wait_slot_confirm_lsn(NULL, NULL);
+    SELECT bdr.wait_slot_confirm_lsn(NULL, NULL);
     ```
 -   !!!Note
 
diff --git a/product_docs/docs/pgd/6.3/lifecycle/upgrades/upgrading_major_rolling.mdx b/product_docs/docs/pgd/6.3/lifecycle/upgrades/upgrading_major_rolling.mdx
index 3039ab0390..55f657fe3f 100644
--- a/product_docs/docs/pgd/6.3/lifecycle/upgrades/upgrading_major_rolling.mdx
+++ b/product_docs/docs/pgd/6.3/lifecycle/upgrades/upgrading_major_rolling.mdx
@@ -272,7 +272,7 @@ BEGIN
     END LOOP;
 END;
 $$; 
-SELECT wait_slot_confirm_lsn(NULL,NULL);
+SELECT bdr.wait_slot_confirm_lsn(NULL,NULL);
 ```
 ### Enable routing
 Enable node group routing as per your global or local routing requirement. For local routing enable it on subgroups, for global routing enable it on the top group.
diff --git a/product_docs/docs/pgd/6.4/lifecycle/upgrades/manual_overview.mdx b/product_docs/docs/pgd/6.4/lifecycle/upgrades/manual_overview.mdx
index 643d468c91..bb00acdd9a 100644
--- a/product_docs/docs/pgd/6.4/lifecycle/upgrades/manual_overview.mdx
+++ b/product_docs/docs/pgd/6.4/lifecycle/upgrades/manual_overview.mdx
@@ -243,7 +243,7 @@ that the upgraded node is working as expected.
 
 Use the following steps to move from PGD Proxy to Connection Manager:
 
-1.  From one of the PGD 5.9 nodes, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
+1.  From one of the PGD 5.9 nodes, as a database superuser, and while connected to the PGD-enabled database, run the following query to ensure that SCRAM hashes of all user passwords are the same across all nodes:
 
 -   ```sql
     DO $$
@@ -259,7 +259,7 @@ Use the following steps to move from PGD Proxy to Connection Manager:
         END LOOP;
     END;
     $$;
-    SELECT wait_slot_confirm_lsn(NULL, NULL);
+    SELECT bdr.wait_slot_confirm_lsn(NULL, NULL);
     ```
 -   !!!Note
 
diff --git a/product_docs/docs/pgd/6.4/lifecycle/upgrades/upgrading_major_rolling.mdx b/product_docs/docs/pgd/6.4/lifecycle/upgrades/upgrading_major_rolling.mdx
index 3039ab0390..55f657fe3f 100644
--- a/product_docs/docs/pgd/6.4/lifecycle/upgrades/upgrading_major_rolling.mdx
+++ b/product_docs/docs/pgd/6.4/lifecycle/upgrades/upgrading_major_rolling.mdx
@@ -272,7 +272,7 @@ BEGIN
     END LOOP;
 END;
 $$; 
-SELECT wait_slot_confirm_lsn(NULL,NULL);
+SELECT bdr.wait_slot_confirm_lsn(NULL,NULL);
 ```
 ### Enable routing
 Enable node group routing as per your global or local routing requirement. For local routing enable it on subgroups, for global routing enable it on the top group.