diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 3be66789ba7..4162f5d7c74 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -342,7 +342,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
        valid <structname>PGconn</structname> pointer is returned (though not
        yet representing a valid connection to the database).  Next
        call <literal>PQstatus(conn)</literal>.  If the result
-       is <symbol>CONNECTION_BAD</symbol>, the connection attempt has already
+       is <literal>CONNECTION_BAD</literal>, the connection attempt has already
        failed, typically because of invalid connection parameters.
       </para>
 
@@ -377,8 +377,8 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
 
       <para>
        At any time during connection, the status of the connection can be
-       checked by calling <xref linkend="libpq-PQstatus"/>. If this call returns <symbol>CONNECTION_BAD</symbol>, then the
-       connection procedure has failed; if the call returns <function>CONNECTION_OK</function>, then the
+       checked by calling <xref linkend="libpq-PQstatus"/>. If this call returns <literal>CONNECTION_BAD</literal>, then the
+       connection procedure has failed; if the call returns <literal>CONNECTION_OK</literal>, then the
        connection is ready.  Both of these states are equally detectable
        from the return value of <function>PQconnectPoll</function>, described above. Other states might also occur
        during (and only during) an asynchronous connection procedure. These
@@ -1922,7 +1922,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <term><literal>sslkeylogfile</literal></term>
       <listitem>
        <para>
-        This parameter specifies the location where <literal>libpq</literal>
+        This parameter specifies the location where <application>libpq</application>
         will log keys used in this SSL context.  This is useful for debugging
         <productname>PostgreSQL</productname> protocol interactions or client
         connections using network inspection tools like
@@ -1956,7 +1956,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         <literal>Enter PEM pass phrase:</literal>
         prompt that <productname>OpenSSL</productname> will emit by default
         when an encrypted client certificate key is provided to
-        <literal>libpq</literal>.
+        <application>libpq</application>.
        </para>
        <para>
         If the key is not encrypted this parameter is ignored. The parameter
@@ -6626,9 +6626,9 @@ PostgresPollingStatusType PQcancelPoll(PGcancelConn *cancelConn);
       <para>
        At any time during connection, the status of the connection can be
        checked by calling <xref linkend="libpq-PQcancelStatus"/>.
-       If this call returns <symbol>CONNECTION_BAD</symbol>, then
+       If this call returns <literal>CONNECTION_BAD</literal>, then
        the cancel procedure has failed; if the call returns
-       <function>CONNECTION_OK</function>, then cancel request was
+       <literal>CONNECTION_OK</literal>, then cancel request was
        successfully dispatched.
        Both of these states are equally detectable from the return value of
        <function>PQcancelPoll</function>, described above.
@@ -8283,7 +8283,7 @@ size_t PQresultMemorySize(const PGresult *res);
 
     <listitem>
      <para>
-      Return the version of <productname>libpq</productname> that is being used.
+      Return the version of <application>libpq</application> that is being used.
 <synopsis>
 int PQlibVersion(void);
 </synopsis>