diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py
index 7b31fc4e..9ffcbe38 100755
--- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py
+++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py
@@ -1393,7 +1393,7 @@ def create_host_services(token, host_name):
     api_cmd_headers = dict()
     api_cmd_headers['wrs-header'] = 'true'
     api_cmd_headers['Content-Type'] = "application/json"
-    # The create is a WRS extension, which is not supported in Pike
+    # The create is a StarlingX extension, which is not supported in Pike
     api_cmd_headers['X-OpenStack-Nova-API-Version'] = NOVA_API_VERSION_NEWTON
 
     api_cmd_payload = dict()
diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py
index 1c07e486..418a742e 100755
--- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py
+++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py
@@ -1413,7 +1413,7 @@ class TestSwPatchStrategy:
 
         apply_phase = strategy.apply_phase.as_dict()
 
-        # US106924  Perform no-reboot parallel compute patches without any
+        # Perform no-reboot parallel compute patches without any
         # grouping by aggregates or determining which hosts have VMs
         # max_parallel_compute_hosts is 3 (for 4 hosts) resulting in 2 stages
         expected_results = {
diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/utils.py b/nfv/nfv-tests/nfv_unit_tests/tests/utils.py
index 56138329..99e5e0c7 100644
--- a/nfv/nfv-tests/nfv_unit_tests/tests/utils.py
+++ b/nfv/nfv-tests/nfv_unit_tests/tests/utils.py
@@ -1,9 +1,7 @@
 #
 # Copyright (c) 2018 Wind River Systems, Inc.
 #
-# The right to copy, distribute, modify, or otherwise make use
-# of this software may be licensed only pursuant to the terms
-# of an applicable Wind River license agreement.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 from nfv_vim import nfvi
diff --git a/nfv/nfv-vim/nfv_vim/event_log/_instance.py b/nfv/nfv-vim/nfv_vim/event_log/_instance.py
index a26bb143..1f1297c2 100755
--- a/nfv/nfv-vim/nfv_vim/event_log/_instance.py
+++ b/nfv/nfv-vim/nfv_vim/event_log/_instance.py
@@ -2254,7 +2254,7 @@ def instance_manage_events(instance, enabling=False):
             # notifications we get from nova do not include the flavor details.
             # When we switch to use the versioned notifications, they will
             # include the flavor. However, I have verified that the original
-            # reason for this clause (CGTS-4099) no longer needs this code -
+            # reason for this clause no longer needs this code -
             # nova will explicitly fail a resize if the disk size in the new
             # flavor is smaller than the old flavor (instead of silently
             # failing). I am leaving this code here in case there are some