diff --git a/reference/uodbc/functions/odbc-columnprivileges.xml b/reference/uodbc/functions/odbc-columnprivileges.xml
index 750d42ea80..4c6861c75c 100644
--- a/reference/uodbc/functions/odbc-columnprivileges.xml
+++ b/reference/uodbc/functions/odbc-columnprivileges.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_columnprivileges</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>column_name</parameter></methodparam>
   </methodsynopsis>
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner.
@@ -64,7 +64,7 @@
    </variablelist>
   </para>
   <para>
-   The <parameter>owner</parameter>, <parameter>table_name</parameter>, and
+   The <parameter>schema</parameter>, <parameter>table_name</parameter>, and
    <parameter>column_name</parameter> accept search patterns ('%' to match
    zero or more characters and '_' to match a single character).
   </para>
diff --git a/reference/uodbc/functions/odbc-columns.xml b/reference/uodbc/functions/odbc-columns.xml
index 94022590c8..d06dd007ae 100644
--- a/reference/uodbc/functions/odbc-columns.xml
+++ b/reference/uodbc/functions/odbc-columns.xml
@@ -10,7 +10,7 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_columns</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>catalog</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>table_name</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>column_name</parameter></methodparam>
@@ -30,7 +30,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
diff --git a/reference/uodbc/functions/odbc-primarykeys.xml b/reference/uodbc/functions/odbc-primarykeys.xml
index 6a9baddc08..5626ab832c 100644
--- a/reference/uodbc/functions/odbc-primarykeys.xml
+++ b/reference/uodbc/functions/odbc-primarykeys.xml
@@ -10,8 +10,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_primarykeys</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -30,14 +30,14 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
       </para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
       </para>
diff --git a/reference/uodbc/functions/odbc-procedurecolumns.xml b/reference/uodbc/functions/odbc-procedurecolumns.xml
index ff871ce2c4..5d0d36fcfa 100644
--- a/reference/uodbc/functions/odbc-procedurecolumns.xml
+++ b/reference/uodbc/functions/odbc-procedurecolumns.xml
@@ -15,8 +15,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_procedurecolumns</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>proc</parameter></methodparam>
    <methodparam><type>string</type><parameter>column</parameter></methodparam>
   </methodsynopsis>
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -44,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner.
diff --git a/reference/uodbc/functions/odbc-procedures.xml b/reference/uodbc/functions/odbc-procedures.xml
index dfc1f5c485..dde20895c6 100644
--- a/reference/uodbc/functions/odbc-procedures.xml
+++ b/reference/uodbc/functions/odbc-procedures.xml
@@ -15,8 +15,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_procedures</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner.
diff --git a/reference/uodbc/functions/odbc-specialcolumns.xml b/reference/uodbc/functions/odbc-specialcolumns.xml
index 10f23bb6b2..af01ce4bb5 100644
--- a/reference/uodbc/functions/odbc-specialcolumns.xml
+++ b/reference/uodbc/functions/odbc-specialcolumns.xml
@@ -12,7 +12,7 @@
    <type>resource</type><methodname>odbc_specialcolumns</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
    <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
    <methodparam><type>int</type><parameter>scope</parameter></methodparam>
    <methodparam><type>int</type><parameter>nullable</parameter></methodparam>
@@ -51,7 +51,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
diff --git a/reference/uodbc/functions/odbc-statistics.xml b/reference/uodbc/functions/odbc-statistics.xml
index e728211844..0ad165e162 100644
--- a/reference/uodbc/functions/odbc-statistics.xml
+++ b/reference/uodbc/functions/odbc-statistics.xml
@@ -11,8 +11,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_statistics</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
    <methodparam><type>int</type><parameter>unique</parameter></methodparam>
    <methodparam><type>int</type><parameter>accuracy</parameter></methodparam>
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner.
diff --git a/reference/uodbc/functions/odbc-tableprivileges.xml b/reference/uodbc/functions/odbc-tableprivileges.xml
index 3e0cdb6363..da22c66bdb 100644
--- a/reference/uodbc/functions/odbc-tableprivileges.xml
+++ b/reference/uodbc/functions/odbc-tableprivileges.xml
@@ -11,8 +11,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_tableprivileges</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -40,7 +40,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner. Accepts the following search patterns:
diff --git a/reference/uodbc/functions/odbc-tables.xml b/reference/uodbc/functions/odbc-tables.xml
index e98814392d..7bbcf40be6 100644
--- a/reference/uodbc/functions/odbc-tables.xml
+++ b/reference/uodbc/functions/odbc-tables.xml
@@ -11,8 +11,8 @@
   <methodsynopsis>
    <type>resource</type><methodname>odbc_tables</methodname>
    <methodparam><type>resource</type><parameter>connection_id</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>qualifier</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>owner</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>catalog</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>types</parameter></methodparam>
   </methodsynopsis>
@@ -22,14 +22,14 @@
   <para>
    To support enumeration of qualifiers, owners, and table types,
    the following special semantics for the
-   <parameter>qualifier</parameter>, <parameter>owner</parameter>,
+   <parameter>catalog</parameter>, <parameter>schema</parameter>,
    <parameter>name</parameter>, and
    <parameter>table_type</parameter> are available:
    <itemizedlist>
     <listitem>
      <simpara>
-      If <parameter>qualifier</parameter> is a single percent
-      character (%) and <parameter>owner</parameter> and
+      If <parameter>catalog</parameter> is a single percent
+      character (%) and <parameter>schema</parameter> and
       <parameter>name</parameter> are empty strings, then the result
       set contains a list of valid qualifiers for the data
       source. (All columns except the TABLE_QUALIFIER column contain
@@ -38,8 +38,8 @@
     </listitem>
     <listitem>
      <simpara>
-      If <parameter>owner</parameter> is a single percent character
-      (%) and <parameter>qualifier</parameter> and
+      If <parameter>schema</parameter> is a single percent character
+      (%) and <parameter>catalog</parameter> and
       <parameter>name</parameter> are empty strings, then the result
       set contains a list of valid owners for the data source. (All
       columns except the TABLE_OWNER column contain
@@ -49,8 +49,8 @@
     <listitem>
      <simpara>
       If <parameter>table_type</parameter> is a single percent
-      character (%) and <parameter>qualifier</parameter>,
-      <parameter>owner</parameter> and <parameter>name</parameter>
+      character (%) and <parameter>catalog</parameter>,
+      <parameter>schema</parameter> and <parameter>name</parameter>
       are empty strings, then the result set contains a list of
       valid table types for the data source. (All columns except the
       TABLE_TYPE column contain NULLs.)
@@ -71,7 +71,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>qualifier</parameter></term>
+     <term><parameter>catalog</parameter></term>
      <listitem>
       <para>
        The qualifier.
@@ -79,7 +79,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>owner</parameter></term>
+     <term><parameter>schema</parameter></term>
      <listitem>
       <para>
        The owner. Accepts search patterns ('%' to match zero or more