diff --git a/DESCRIPTION b/DESCRIPTION
index 1626998..e7451e9 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -33,7 +33,7 @@ Config/Needs/website:
     r-dbi/dbitemplate
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3.9000
 Config/autostyle/scope: line_breaks
 Config/autostyle/strict: false
 Collate: 
diff --git a/man/AdbiConnection-class.Rd b/man/AdbiConnection-class.Rd
index 704180c..fc3ceb2 100644
--- a/man/AdbiConnection-class.Rd
+++ b/man/AdbiConnection-class.Rd
@@ -186,7 +186,7 @@ with \code{\link[DBI:dbDataType]{DBI::dbDataType()}}).}
 \description{
 AdbiConnection objects are created by passing \code{\link[=adbi]{adbi()}} as first
 argument to \code{\link[DBI:dbConnect]{DBI::dbConnect()}}. They are a superclass of the
-\linkS4class{DBIConnection} class. The "Usage" section lists the class methods
+\link[DBI:DBIConnection-class]{DBI::DBIConnection} class. The "Usage" section lists the class methods
 overridden by \pkg{adbi}.
 }
 \seealso{
diff --git a/man/AdbiDriver-class.Rd b/man/AdbiDriver-class.Rd
index f1df275..f224190 100644
--- a/man/AdbiDriver-class.Rd
+++ b/man/AdbiDriver-class.Rd
@@ -35,7 +35,7 @@ or \linkS4class{DBIConnection}}
 \description{
 AdbiDriver objects are created by \code{\link[=adbi]{adbi()}}, and used to select the
 correct method in \code{\link[=dbConnect]{dbConnect()}}. They are a superclass of the
-\linkS4class{DBIDriver} class, and used purely for dispatch.
+\link[DBI:DBIDriver-class]{DBI::DBIDriver} class, and used purely for dispatch.
 The "Usage" section lists the class methods overridden by \pkg{adbi}.
 }
 \keyword{internal}
diff --git a/man/AdbiResult-class.Rd b/man/AdbiResult-class.Rd
index 180daaf..c259d92 100644
--- a/man/AdbiResult-class.Rd
+++ b/man/AdbiResult-class.Rd
@@ -68,7 +68,7 @@ or a \linkS4class{DBIResult}}
 \description{
 AdbiResult objects are created by \code{\link[DBI:dbSendQuery]{DBI::dbSendQuery()}} or
 \code{\link[DBI:dbSendStatement]{DBI::dbSendStatement()}}, and encapsulate the result of an SQL statement
-(either \code{SELECT} or not). They are a superclass of the \linkS4class{DBIResult}
+(either \code{SELECT} or not). They are a superclass of the \link[DBI:DBIResult-class]{DBI::DBIResult}
 class. The "Usage" section lists the class methods overridden by
 \pkg{adbi}.
 }
diff --git a/man/AdbiResultArrow-class.Rd b/man/AdbiResultArrow-class.Rd
index 36bfeb8..1f9847a 100644
--- a/man/AdbiResultArrow-class.Rd
+++ b/man/AdbiResultArrow-class.Rd
@@ -78,7 +78,7 @@ or a \linkS4class{DBIResult}}
 \description{
 AdbiResultArrow objects are created by \code{\link[DBI:dbSendQueryArrow]{DBI::dbSendQueryArrow()}}, and
 encapsulate the result of an SQL query (a \code{SELECT} statement). They are a
-superclass of the \linkS4class{DBIResultArrow} class. The "Usage" section lists
+superclass of the \link[DBI:DBIResultArrow-class]{DBI::DBIResultArrow} class. The "Usage" section lists
 the class methods overridden by \pkg{adbi}.
 }
 \seealso{
diff --git a/man/dbConnect.Rd b/man/dbConnect.Rd
index 13763ff..793a34d 100644
--- a/man/dbConnect.Rd
+++ b/man/dbConnect.Rd
@@ -38,8 +38,8 @@ otherwise}
 }
 \value{
 A connection object (S4 class \code{AdbiCOnnection}, inheriting from
-\linkS4class{DBIConnection}) is returned by \code{\link[=dbConnect]{dbConnect()}}, while
-\code{\link[=dbDisconnect]{dbDisconnect()}} returns \code{TRUE} invisibly.
+\link[DBI:DBIConnection-class]{DBI::DBIConnection}) is returned by \code{\link[=dbConnect]{dbConnect()}}, while
+\code{\link[DBI:dbDisconnect]{DBI::dbDisconnect()}} returns \code{TRUE} invisibly.
 }
 \description{
 In order to open a database connection, \code{\link[DBI:dbConnect]{DBI::dbConnect()}} dispatches on a
diff --git a/man/dbSendQuery.Rd b/man/dbSendQuery.Rd
index 294b433..83d7139 100644
--- a/man/dbSendQuery.Rd
+++ b/man/dbSendQuery.Rd
@@ -46,7 +46,7 @@
 
 \item{...}{Other parameters passed on to methods.}
 
-\item{params}{Optional query parameters (forwarded to \code{\link[=dbBind]{dbBind()}})}
+\item{params}{Optional query parameters (forwarded to \code{\link[DBI:dbBind]{DBI::dbBind()}})}
 
 \item{immediate}{Passing a value \code{TRUE} is intended for statements containing
 no placeholders and \code{FALSE} otherwise. The default value \code{NULL} will
@@ -57,11 +57,11 @@ statement)}
 default is chosen according to the connection setting}
 }
 \value{
-An S4 class \code{AdbiResult} (inheriting from \linkS4class{DBIResult}).
+An S4 class \code{AdbiResult} (inheriting from \link[DBI:DBIResult-class]{DBI::DBIResult}).
 }
 \description{
 Creating result sets using \code{\link[=dbSendQuery]{dbSendQuery()}} (and by extension using
-\code{\link[=dbGetQuery]{dbGetQuery()}}) mostly follows DBI specification. One way where adbi
+\code{\link[DBI:dbGetQuery]{DBI::dbGetQuery()}}) mostly follows DBI specification. One way where adbi
 deviates from DBI mechanisms is how the \code{bigint} setting is not only per
 connection, but the per-connection setting can be overridden on a result
 set basis. As default, the connection setting is applied, but passing one