diff --git a/doc/api_ref/pkcs11.rst b/doc/api_ref/pkcs11.rst
index d70fdfe744..72574df6b0 100644
--- a/doc/api_ref/pkcs11.rst
+++ b/doc/api_ref/pkcs11.rst
@@ -17,7 +17,7 @@ or HSM specific code for each device they want to support.
    .. note::
 
      The Botan PKCS#11 interface is implemented against version v3.2 of the standard.
-     Versions 2.40 upto 3.2 are supported, but the 3.2 headers are shipped with Botan.
+     Versions 2.40 upto 3.2 are supported, but only the 3.2 headers are shipped with Botan.
 
 Botan wraps the C PKCS#11 API to provide a C++ PKCS#11 interface. This is done
 in two levels of abstraction: a low level API (see :ref:`pkcs11_low_level`) and
diff --git a/src/lib/prov/pkcs11/p11.cpp b/src/lib/prov/pkcs11/p11.cpp
index e471e90a1e..6a5a36c3ad 100644
--- a/src/lib/prov/pkcs11/p11.cpp
+++ b/src/lib/prov/pkcs11/p11.cpp
@@ -2,7 +2,7 @@
 * PKCS#11
 * (C) 2016 Daniel Neus, Sirrix AG
 * (C) 2016 Philipp Weber, Sirrix AG
-* (C) 2025 Fabian Albert, Rohde & Schwarz Cybersecurity
+* (C) 2025 Fabian Albert, Rohde & Schwarz Cybersecurity GmbH
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h
index 8deece9bed..5adb35b0b1 100644
--- a/src/lib/prov/pkcs11/p11.h
+++ b/src/lib/prov/pkcs11/p11.h
@@ -2,7 +2,7 @@
 * PKCS #11
 * (C) 2016 Daniel Neus, Sirrix AG
 * (C) 2016 Philipp Weber, Sirrix AG
-* (C) 2025 Fabian Albert, Rohde & Schwarz Cybersecurity
+* (C) 2025 Fabian Albert, Rohde & Schwarz Cybersecurity GmbH
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
@@ -47,8 +47,9 @@
    #pragma pack(pop, cryptoki)
 #endif
 
-static_assert(CRYPTOKI_VERSION_MAJOR == 3 && CRYPTOKI_VERSION_MINOR == 2,
-              "The Botan PKCS#11 module was implemented against PKCS#11 v3.2. Please use the correct PKCS#11 headers.");
+static_assert(
+   CRYPTOKI_VERSION_MAJOR == 3 && CRYPTOKI_VERSION_MINOR == 2,
+   "The Botan PKCS #11 module was implemented against PKCS #11 v3.2. Please use the correct PKCS #11 headers.");
 
 namespace Botan {
 
@@ -1307,7 +1308,7 @@ class BOTAN_PUBLIC_API(2, 0) LowLevel {
        *  1. If interface_list_ptr is NULL_PTR, then all that C_GetInterfaceList
        *     does is return (in *count_ptr) the number of interfaces, without
        *     actually returning a list of interfaces. The contents of *count_ptr
-       *     on entry to C_GetInterfaceList has no meaning in this case, and the
+       *     on entry to C_GetInterfaceList have no meaning in this case, and the
        *     call returns the value CKR_OK.
        *  2. If pIntrerfaceList is not NULL_PTR, then *count_ptr MUST contain the
        *     size (in terms of CK_INTERFACE elements) of the buffer pointed to
diff --git a/src/lib/prov/pkcs11/p11_interface.cpp b/src/lib/prov/pkcs11/p11_interface.cpp
index f3143a594d..7affb75b36 100644
--- a/src/lib/prov/pkcs11/p11_interface.cpp
+++ b/src/lib/prov/pkcs11/p11_interface.cpp
@@ -1,7 +1,7 @@
 /*
 * PKCS #11 Interface Wrapper Implementation
 * (C) 2025 Jack Lloyd
-*     2025 Fabian Albert - Rohde & Schwarz Cybersecurity
+*     2025 Fabian Albert - Rohde & Schwarz Cybersecurity GmbH
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */