diff --git a/docs/mibs/PYSNMP-MIB.txt b/docs/mibs/PYSNMP-MIB.txt
index 2e20ea84f..13ad0793b 100644
--- a/docs/mibs/PYSNMP-MIB.txt
+++ b/docs/mibs/PYSNMP-MIB.txt
@@ -10,7 +10,7 @@ IMPORTS
 pysnmp MODULE-IDENTITY
     LAST-UPDATED "201704140000Z"
     ORGANIZATION "The PySNMP Project"
-    CONTACT-INFO "E-mail: Lex Li <support@lextudio.com>
+    CONTACT-INFO "E-mail: LeXtudio Inc. <support@lextudio.com>
                   GitHub: https://github.com/lextudio/pysnmp"
     DESCRIPTION
 	"PySNMP top-level MIB tree infrastructure"
diff --git a/docs/mibs/PYSNMP-SOURCE-MIB.txt b/docs/mibs/PYSNMP-SOURCE-MIB.txt
index 0349b1eae..ed82596b1 100644
--- a/docs/mibs/PYSNMP-SOURCE-MIB.txt
+++ b/docs/mibs/PYSNMP-SOURCE-MIB.txt
@@ -14,7 +14,7 @@ IMPORTS
 pysnmpSourceMIB MODULE-IDENTITY
     LAST-UPDATED "201704140000Z"
     ORGANIZATION "The PySNMP Project"
-    CONTACT-INFO "E-mail: Lex Li <support@lextudio.com>
+    CONTACT-INFO "E-mail: LeXtudio Inc. <support@lextudio.com>
                   GitHub: https://github.com/lextudio/pysnmp"
     DESCRIPTION
         "This MIB module defines implementation specific objects
diff --git a/docs/mibs/PYSNMP-USM-MIB.txt b/docs/mibs/PYSNMP-USM-MIB.txt
index 8394b0721..05fe6225e 100644
--- a/docs/mibs/PYSNMP-USM-MIB.txt
+++ b/docs/mibs/PYSNMP-USM-MIB.txt
@@ -16,12 +16,12 @@ IMPORTS
 pysnmpUsmMIB MODULE-IDENTITY
     LAST-UPDATED "201704140000Z"
     ORGANIZATION "The PySNMP Project"
-    CONTACT-INFO "E-mail: Lex Li <support@lextudio.com>
+    CONTACT-INFO "E-mail: LeXtudio Inc. <support@lextudio.com>
                   GitHub: https://github.com/lextudio/pysnmp"
     DESCRIPTION
         "This MIB module defines objects specific to User
          Security Model (USM) implementation at PySNMP."
-    REVISION    "202211120000Z" 
+    REVISION    "202211120000Z"
     DESCRIPTION "Updated contact"
     REVISION    "201908300000Z"
     DESCRIPTION "Added USM key types"
@@ -88,7 +88,7 @@ pysnmpUsmSecretTable OBJECT-TYPE
     MAX-ACCESS   not-accessible
     STATUS       current
     DESCRIPTION
-        "The table of USM users passphrases configured in the SNMP 
+        "The table of USM users passphrases configured in the SNMP
          engine's Local Configuration Datastore (LCD)."
     ::= { pysnmpUsmMIBObjects 2 }
 
@@ -151,7 +151,7 @@ pysnmpUsmKeyTable OBJECT-TYPE
     MAX-ACCESS   not-accessible
     STATUS       current
     DESCRIPTION
-        "The table of USM users localized keys configured in the 
+        "The table of USM users localized keys configured in the
          SNMP engine's Local Configuration Datastore (LCD)."
     ::= { pysnmpUsmMIBObjects 3 }
 
diff --git a/pysnmp/smi/mibs/PYSNMP-MIB.py b/pysnmp/smi/mibs/PYSNMP-MIB.py
index d94e41406..1600bff5f 100644
--- a/pysnmp/smi/mibs/PYSNMP-MIB.py
+++ b/pysnmp/smi/mibs/PYSNMP-MIB.py
@@ -87,8 +87,8 @@
 if mibBuilder.loadTexts:
     pysnmp.setOrganization("The PySNMP Project")
 if mibBuilder.loadTexts:
-    pysnmp.setContactInfo(
-        "E-mail: Lex Li <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
+    pysnmp.set_contact_info(
+        "E-mail: LeXtudio Inc. <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
     )
 if mibBuilder.loadTexts:
     pysnmp.setDescription("PySNMP top-level MIB tree infrastructure")
diff --git a/pysnmp/smi/mibs/PYSNMP-SOURCE-MIB.py b/pysnmp/smi/mibs/PYSNMP-SOURCE-MIB.py
index 62c681c3f..8ba5dbf3a 100644
--- a/pysnmp/smi/mibs/PYSNMP-SOURCE-MIB.py
+++ b/pysnmp/smi/mibs/PYSNMP-SOURCE-MIB.py
@@ -89,8 +89,8 @@
 if mibBuilder.loadTexts:
     pysnmpSourceMIB.setOrganization("The PySNMP Project")
 if mibBuilder.loadTexts:
-    pysnmpSourceMIB.setContactInfo(
-        "E-mail: Lex Li <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
+    pysnmpSourceMIB.set_contact_info(
+        "E-mail: LeXtudio Inc. <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
     )
 if mibBuilder.loadTexts:
     pysnmpSourceMIB.setDescription(
diff --git a/pysnmp/smi/mibs/PYSNMP-USM-MIB.py b/pysnmp/smi/mibs/PYSNMP-USM-MIB.py
index ef80df2ef..eb7c346b6 100644
--- a/pysnmp/smi/mibs/PYSNMP-USM-MIB.py
+++ b/pysnmp/smi/mibs/PYSNMP-USM-MIB.py
@@ -88,8 +88,8 @@
 if mibBuilder.loadTexts:
     pysnmpUsmMIB.setOrganization("The PySNMP Project")
 if mibBuilder.loadTexts:
-    pysnmpUsmMIB.setContactInfo(
-        "E-mail: Lex Li <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
+    pysnmpUsmMIB.set_contact_info(
+        "E-mail: LeXtudio Inc. <support@lextudio.com> GitHub: https://github.com/lextudio/pysnmp"
     )
 if mibBuilder.loadTexts:
     pysnmpUsmMIB.setDescription(