diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c57512c..25433e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -208,8 +208,8 @@
         ```
     -   host names
 
-        For host names (long or short, e.g. "bmc1" or "bmc1.ibm.com"), use a
-        suffix of _host_name.
+        For host names (long or short, e.g. "bmc1" or "bmc1.example.com"), use
+        a suffix of _host_name.
 
         Examples:
         ```
@@ -495,8 +495,8 @@
         ```
     -   host names
 
-        For host names (long or short, e.g. "bmc1" or "bmc1.ibm.com"), use a
-        suffix of _host_name.
+        For host names (long or short, e.g. "bmc1" or "bmc1.example.com"), use
+        a suffix of _host_name.
 
         Examples:
         ```
diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index 948cedb..e041c05 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -226,7 +226,7 @@
 
     Description of argument(s):
     image_version  The version from the image's manifest file
-                   (e.g. "IBM-witherspoon-redbud-ibm-OP9_v1.17_1.68").
+                   (e.g. "v2.2-253-g00050f1").
     timeout        How long, in minutes, to keep trying to find the
                    image on the BMC. Default is 3 minutes.
     """
diff --git a/lib/ipmi_utils.py b/lib/ipmi_utils.py
index 460b224..085ca2a 100644
--- a/lib/ipmi_utils.py
+++ b/lib/ipmi_utils.py
@@ -329,14 +329,14 @@
 
     FRU Device Description : cpu0 (ID 1)
      Board Mfg Date        : Sun Dec 31 18:00:00 1995
-     Board Mfg             : IBM
+     Board Mfg             : <Manufacturer Name>
      Board Product         : PROCESSOR MODULE
      Board Serial          : YA1934315964
      Board Part Number     : 02CY209
 
     FRU Device Description : cpu1 (ID 2)
      Board Mfg Date        : Sun Dec 31 18:00:00 1995
-     Board Mfg             : IBM
+     Board Mfg             : <Manufacturer Name>
      Board Product         : PROCESSOR MODULE
      Board Serial          : YA1934315965
      Board Part Number     : 02CY209
@@ -351,14 +351,14 @@
       fru_obj[1]:
         [fru_device_description]:  cpu0 (ID 1)
         [board_mfg_date]:          Sun Dec 31 18:00:00 1995
-        [board_mfg]:               IBM
+        [board_mfg]:               <Manufacturer Name>
         [board_product]:           PROCESSOR MODULE
         [board_serial]:            YA1934315964
         [board_part_number]:       02CY209
       fru_obj[2]:
         [fru_device_description]:  cpu1 (ID 2)
         [board_mfg_date]:          Sun Dec 31 18:00:00 1995
-        [board_mfg]:               IBM
+        [board_mfg]:               <Manufacturer Name>
         [board_product]:           PROCESSOR MODULE
         [board_serial]:            YA1934315965
         [board_part_number]:       02CY209
diff --git a/tests/ipmi/test_general_ipmi.robot b/tests/ipmi/test_general_ipmi.robot
index cfbc33d..117a1e0 100644
--- a/tests/ipmi/test_general_ipmi.robot
+++ b/tests/ipmi/test_general_ipmi.robot
@@ -480,7 +480,7 @@
     # Convert minor firmware version from BCD format to integer. i.e. 01 to 1
     ${ipmi_fw_minor_version}=  Convert To Integer  ${ipmi_fw_minor_version}
 
-    # Get BMC version from BMC CLI i.e. 2.1 from "ibm-v2.1-338-r1-0-gbcd7765"
+    # Get BMC version from BMC CLI i.e. 2.2 from "v2.2-253-g00050f1"
     ${bmc_version_full}=  Get BMC Version
     ${bmc_version}=
     ...  Remove String Using Regexp  ${bmc_version_full}  ^[^0-9]+  [^0-9\.].*
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 4692088..1f075c4 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -40,7 +40,7 @@
     # {
     #     "BuildDate": "",
     #     "FieldReplaceable": 0,
-    #     "Manufacturer": "IBM",
+    #     "Manufacturer": "<Manufacturer Name>",
     #     "Model": "",
     #     "PartNumber": "01DH051",
     #     "Present": 1,
@@ -62,7 +62,7 @@
     # {
     #     "BuildDate": "",
     #     "FieldReplaceable": 0,
-    #     "Manufacturer": "IBM",
+    #     "Manufacturer": "<Manufacturer Name>",
     #     "Model": "",
     #     "PartNumber": "01DH051",
     #     "Present": 1,
@@ -146,7 +146,7 @@
     #    "PrettyName": "PROCESSOR MODULE",
     #    "PartNumber": "01HL322",
     #    "Present": 1,
-    #    "Manufacturer": "IBM"
+    #    "Manufacturer": "<Manufacturer Name>"
     # },
     # The CPU properties "Present" should be boolean 1.