diff --git a/CONFIG b/CONFIG
index 6215a4345..b55d284fb 100644
--- a/CONFIG
+++ b/CONFIG
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #  Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
diff --git a/Makefile b/Makefile
index 53b90f332..24957f22f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  Copyright (c) 2020, Mellanox Corporation.
 #  All rights reserved.
 #
diff --git a/app/Makefile b/app/Makefile
index a38f59b79..87b1fc7fe 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 58482c1ab..ebc11ae06 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index 496e57cfb..e413ac28f 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile
index 601920fe8..a5f73fb2a 100644
--- a/app/iscsi_top/Makefile
+++ b/app/iscsi_top/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/iscsi_top/iscsi_top.c b/app/iscsi_top/iscsi_top.c
index b78b309c6..c216f9857 100644
--- a/app/iscsi_top/iscsi_top.c
+++ b/app/iscsi_top/iscsi_top.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 2fe47b296..c0f48e773 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/nvmf_tgt/nvmf_main.c b/app/nvmf_tgt/nvmf_main.c
index 4ae8e80b0..24cc11449 100644
--- a/app/nvmf_tgt/nvmf_main.c
+++ b/app/nvmf_tgt/nvmf_main.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/spdk_dd/Makefile b/app/spdk_dd/Makefile
index 6e0e07754..d4e92c1e7 100644
--- a/app/spdk_dd/Makefile
+++ b/app/spdk_dd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/spdk_dd/spdk_dd.c b/app/spdk_dd/spdk_dd.c
index 5fe2857a5..317f58d0c 100644
--- a/app/spdk_dd/spdk_dd.c
+++ b/app/spdk_dd/spdk_dd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/spdk_lspci/Makefile b/app/spdk_lspci/Makefile
index c18bf1ea6..ed10b6550 100644
--- a/app/spdk_lspci/Makefile
+++ b/app/spdk_lspci/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/spdk_lspci/spdk_lspci.c b/app/spdk_lspci/spdk_lspci.c
index a4c0c3d33..7dfb72af7 100644
--- a/app/spdk_lspci/spdk_lspci.c
+++ b/app/spdk_lspci/spdk_lspci.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
index eade65000..bf8bb21dc 100644
--- a/app/spdk_tgt/Makefile
+++ b/app/spdk_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2018 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/spdk_tgt/spdk_tgt.c b/app/spdk_tgt/spdk_tgt.c
index 6cdfa088c..0f00beac1 100644
--- a/app/spdk_tgt/spdk_tgt.c
+++ b/app/spdk_tgt/spdk_tgt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/spdk_top/Makefile b/app/spdk_top/Makefile
index e9d77a7f5..a851139e2 100644
--- a/app/spdk_top/Makefile
+++ b/app/spdk_top/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/spdk_top/spdk_top.c b/app/spdk_top/spdk_top.c
index 2859899e7..e12d8bb25 100644
--- a/app/spdk_top/spdk_top.c
+++ b/app/spdk_top/spdk_top.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/trace/Makefile b/app/trace/Makefile
index 65d75ca9f..3239fbb03 100644
--- a/app/trace/Makefile
+++ b/app/trace/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/trace/trace.cpp b/app/trace/trace.cpp
index 0216b94e8..e9cbf22bc 100644
--- a/app/trace/trace.cpp
+++ b/app/trace/trace.cpp
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/trace_record/Makefile b/app/trace_record/Makefile
index 718ea3eba..50cb83d64 100644
--- a/app/trace_record/Makefile
+++ b/app/trace_record/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/trace_record/trace_record.c b/app/trace_record/trace_record.c
index 52cb1de0b..aade3e877 100644
--- a/app/trace_record/trace_record.c
+++ b/app/trace_record/trace_record.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 934b464f8..571f0e088 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c
index 421d0f6cc..992ba29a6 100644
--- a/app/vhost/vhost.c
+++ b/app/vhost/vhost.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/doc/Makefile b/doc/Makefile
index ec3f396d9..2d4191026 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,3 +1,8 @@
+#  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2015 Intel Corporation.
+#  All rights reserved.
+#
+
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
diff --git a/docker/build_base/Dockerfile b/docker/build_base/Dockerfile
index b184f4b27..9aa5e0219 100644
--- a/docker/build_base/Dockerfile
+++ b/docker/build_base/Dockerfile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (c) Intel Corporation
+# Copyright (C) 2021 Intel Corporation
+#
 
 FROM fedora:35 AS base
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index f3206229e..4793f993e 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (c) Intel Corporation
+# Copyright (C) 2021 Intel Corporation
+#
+
 version: "3.8"
 services:
   build_base:
diff --git a/docker/spdk-app/Dockerfile b/docker/spdk-app/Dockerfile
index ac54cbd50..4fc0e9939 100644
--- a/docker/spdk-app/Dockerfile
+++ b/docker/spdk-app/Dockerfile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (c) Intel Corporation
+# Copyright (C) 2021 Intel Corporation
+#
 
 FROM spdk
 
diff --git a/docker/traffic-generator/Dockerfile b/docker/traffic-generator/Dockerfile
index ac54cbd50..4fc0e9939 100644
--- a/docker/traffic-generator/Dockerfile
+++ b/docker/traffic-generator/Dockerfile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (c) Intel Corporation
+# Copyright (C) 2021 Intel Corporation
+#
 
 FROM spdk
 
diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile
index d7a37975e..7b2a45c87 100644
--- a/dpdkbuild/Makefile
+++ b/dpdkbuild/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #  Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
diff --git a/examples/Makefile b/examples/Makefile
index 970dc9878..55835364b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/accel/Makefile b/examples/accel/Makefile
index 6771d7c7e..68e3ee6ad 100644
--- a/examples/accel/Makefile
+++ b/examples/accel/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/accel/perf/Makefile b/examples/accel/perf/Makefile
index 20a95dc83..8f8d219ce 100644
--- a/examples/accel/perf/Makefile
+++ b/examples/accel/perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/accel/perf/accel_perf.c b/examples/accel/perf/accel_perf.c
index 171b90345..190002e40 100644
--- a/examples/accel/perf/accel_perf.c
+++ b/examples/accel/perf/accel_perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/bdev/Makefile b/examples/bdev/Makefile
index 5006b2269..f8070660d 100644
--- a/examples/bdev/Makefile
+++ b/examples/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile
index e9beedc74..9872073bc 100644
--- a/examples/bdev/fio_plugin/Makefile
+++ b/examples/bdev/fio_plugin/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  Copyright (c) 2015-2016, Micron Technology, Inc.
 #  All rights reserved.
 #
diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c
index 8d2f5ed99..ed12c7ec6 100644
--- a/examples/bdev/fio_plugin/fio_plugin.c
+++ b/examples/bdev/fio_plugin/fio_plugin.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile
index cd0140669..ab5c0b5f6 100644
--- a/examples/bdev/hello_world/Makefile
+++ b/examples/bdev/hello_world/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2018 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
diff --git a/examples/bdev/hello_world/hello_bdev.c b/examples/bdev/hello_world/hello_bdev.c
index df16b6f5b..aa9ea4f74 100644
--- a/examples/bdev/hello_world/hello_bdev.c
+++ b/examples/bdev/hello_world/hello_bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/blob/Makefile b/examples/blob/Makefile
index e00332e3f..3f7cdb091 100644
--- a/examples/blob/Makefile
+++ b/examples/blob/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile
index 443421373..2de310d73 100644
--- a/examples/blob/cli/Makefile
+++ b/examples/blob/cli/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2017 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
diff --git a/examples/blob/cli/blobcli.c b/examples/blob/cli/blobcli.c
index 316e49f78..473baacae 100644
--- a/examples/blob/cli/blobcli.c
+++ b/examples/blob/cli/blobcli.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile
index b967e40fa..15074ae71 100644
--- a/examples/blob/hello_world/Makefile
+++ b/examples/blob/hello_world/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2017 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
diff --git a/examples/blob/hello_world/hello_blob.c b/examples/blob/hello_world/hello_blob.c
index cb37116a9..8a237c094 100644
--- a/examples/blob/hello_world/hello_blob.c
+++ b/examples/blob/hello_world/hello_blob.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/idxd/Makefile b/examples/idxd/Makefile
index 6771d7c7e..68e3ee6ad 100644
--- a/examples/idxd/Makefile
+++ b/examples/idxd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/idxd/perf/Makefile b/examples/idxd/perf/Makefile
index 83fae4bcf..b34dd85b8 100644
--- a/examples/idxd/perf/Makefile
+++ b/examples/idxd/perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/idxd/perf/perf.c b/examples/idxd/perf/perf.c
index c48e7888a..ee1db7799 100644
--- a/examples/idxd/perf/perf.c
+++ b/examples/idxd/perf/perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/interrupt_tgt/Makefile b/examples/interrupt_tgt/Makefile
index c04975f68..834dbce18 100644
--- a/examples/interrupt_tgt/Makefile
+++ b/examples/interrupt_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/interrupt_tgt/interrupt_tgt.c b/examples/interrupt_tgt/interrupt_tgt.c
index 69be7fc7e..d7fe9b1ed 100644
--- a/examples/interrupt_tgt/interrupt_tgt.c
+++ b/examples/interrupt_tgt/interrupt_tgt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile
index d345def92..56ed6cb73 100644
--- a/examples/ioat/Makefile
+++ b/examples/ioat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile
index 23ba33afd..0db5ea2b9 100644
--- a/examples/ioat/perf/Makefile
+++ b/examples/ioat/perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/ioat/perf/perf.c b/examples/ioat/perf/perf.c
index bf88319ed..cee2b6929 100644
--- a/examples/ioat/perf/perf.c
+++ b/examples/ioat/perf/perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile
index eb465a85c..027c0ae70 100644
--- a/examples/ioat/verify/Makefile
+++ b/examples/ioat/verify/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/ioat/verify/verify.c b/examples/ioat/verify/verify.c
index 33212f434..e6b4d87fd 100644
--- a/examples/ioat/verify/verify.c
+++ b/examples/ioat/verify/verify.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/Makefile b/examples/nvme/Makefile
index 0703c0222..46486a971 100644
--- a/examples/nvme/Makefile
+++ b/examples/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/abort/Makefile b/examples/nvme/abort/Makefile
index e64adbd72..b50dc9312 100644
--- a/examples/nvme/abort/Makefile
+++ b/examples/nvme/abort/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/abort/abort.c b/examples/nvme/abort/abort.c
index 70ae76b91..f3b7407b1 100644
--- a/examples/nvme/abort/abort.c
+++ b/examples/nvme/abort/abort.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/arbitration/Makefile b/examples/nvme/arbitration/Makefile
index 5f1bcea45..aa24050c7 100644
--- a/examples/nvme/arbitration/Makefile
+++ b/examples/nvme/arbitration/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/arbitration/arbitration.c b/examples/nvme/arbitration/arbitration.c
index 6afdfa9e8..a2bffe7c2 100644
--- a/examples/nvme/arbitration/arbitration.c
+++ b/examples/nvme/arbitration/arbitration.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/cmb_copy/Makefile b/examples/nvme/cmb_copy/Makefile
index b1b8f1adf..93025f6bd 100644
--- a/examples/nvme/cmb_copy/Makefile
+++ b/examples/nvme/cmb_copy/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2019 Intel Corporation.
 #  Copyright (c) Eideticom Inc
 #  All rights reserved.
 #
diff --git a/examples/nvme/cmb_copy/cmb_copy.c b/examples/nvme/cmb_copy/cmb_copy.c
index 51ea5617b..f315c4dd2 100644
--- a/examples/nvme/cmb_copy/cmb_copy.c
+++ b/examples/nvme/cmb_copy/cmb_copy.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) Eideticom Inc.
  *   All rights reserved.
  */
diff --git a/examples/nvme/discovery_aer/Makefile b/examples/nvme/discovery_aer/Makefile
index 034bdad4f..151bd705f 100644
--- a/examples/nvme/discovery_aer/Makefile
+++ b/examples/nvme/discovery_aer/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/discovery_aer/discovery_aer.c b/examples/nvme/discovery_aer/discovery_aer.c
index c41f4eb08..b0ecaf09f 100644
--- a/examples/nvme/discovery_aer/discovery_aer.c
+++ b/examples/nvme/discovery_aer/discovery_aer.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile
index ffe9c601b..9322f49a7 100644
--- a/examples/nvme/fio_plugin/Makefile
+++ b/examples/nvme/fio_plugin/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  Copyright (c) 2015-2016, Micron Technology, Inc.
 #  All rights reserved.
 #
diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c
index 69791c1bd..12d553460 100644
--- a/examples/nvme/fio_plugin/fio_plugin.c
+++ b/examples/nvme/fio_plugin/fio_plugin.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/examples/nvme/hello_world/Makefile b/examples/nvme/hello_world/Makefile
index aa67b0b80..ebbfca269 100644
--- a/examples/nvme/hello_world/Makefile
+++ b/examples/nvme/hello_world/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/hello_world/hello_world.c b/examples/nvme/hello_world/hello_world.c
index 7e544ee58..650c618c7 100644
--- a/examples/nvme/hello_world/hello_world.c
+++ b/examples/nvme/hello_world/hello_world.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/hotplug/Makefile b/examples/nvme/hotplug/Makefile
index 52de59f71..2a2bbe023 100644
--- a/examples/nvme/hotplug/Makefile
+++ b/examples/nvme/hotplug/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/hotplug/hotplug.c b/examples/nvme/hotplug/hotplug.c
index 9ee9600ca..d30237d4d 100644
--- a/examples/nvme/hotplug/hotplug.c
+++ b/examples/nvme/hotplug/hotplug.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile
index ffc24e931..92847f8be 100644
--- a/examples/nvme/identify/Makefile
+++ b/examples/nvme/identify/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c
index f533ed0c9..5682a7e64 100644
--- a/examples/nvme/identify/identify.c
+++ b/examples/nvme/identify/identify.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile
index 4bff750f9..33439a271 100644
--- a/examples/nvme/nvme_manage/Makefile
+++ b/examples/nvme/nvme_manage/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c
index bc26ae26e..74267c470 100644
--- a/examples/nvme/nvme_manage/nvme_manage.c
+++ b/examples/nvme/nvme_manage/nvme_manage.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile
index b3d409d88..30f9b6f7c 100644
--- a/examples/nvme/perf/Makefile
+++ b/examples/nvme/perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c
index 41e77b86b..e5a04376f 100644
--- a/examples/nvme/perf/perf.c
+++ b/examples/nvme/perf/perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  *
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
diff --git a/examples/nvme/reconnect/Makefile b/examples/nvme/reconnect/Makefile
index c5ef56c35..93897eec1 100644
--- a/examples/nvme/reconnect/Makefile
+++ b/examples/nvme/reconnect/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvme/reconnect/reconnect.c b/examples/nvme/reconnect/reconnect.c
index 77327fe7e..ddfd9d837 100644
--- a/examples/nvme/reconnect/reconnect.c
+++ b/examples/nvme/reconnect/reconnect.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  *
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
diff --git a/examples/nvmf/Makefile b/examples/nvmf/Makefile
index 73cabcbc2..53483c5e5 100644
--- a/examples/nvmf/Makefile
+++ b/examples/nvmf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/nvmf/nvmf/Makefile b/examples/nvmf/nvmf/Makefile
index 14fa589e6..512a4aa94 100644
--- a/examples/nvmf/nvmf/Makefile
+++ b/examples/nvmf/nvmf/Makefile
@@ -1,8 +1,9 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  Copyright (c) 2015-2016, Micron Technology, Inc.
 #  All rights reserved.
 #
+
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
diff --git a/examples/nvmf/nvmf/nvmf.c b/examples/nvmf/nvmf/nvmf.c
index 559808eaa..5fff0232b 100644
--- a/examples/nvmf/nvmf/nvmf.c
+++ b/examples/nvmf/nvmf/nvmf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/sock/Makefile b/examples/sock/Makefile
index d9e5e03ab..d98ff56af 100644
--- a/examples/sock/Makefile
+++ b/examples/sock/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/sock/hello_world/Makefile b/examples/sock/hello_world/Makefile
index dde97ee74..39b73d18b 100644
--- a/examples/sock/hello_world/Makefile
+++ b/examples/sock/hello_world/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2018 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
diff --git a/examples/sock/hello_world/hello_sock.c b/examples/sock/hello_world/hello_sock.c
index 23672ca23..19d42bb3e 100644
--- a/examples/sock/hello_world/hello_sock.c
+++ b/examples/sock/hello_world/hello_sock.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/util/Makefile b/examples/util/Makefile
index 0c7125398..99cefcdc0 100644
--- a/examples/util/Makefile
+++ b/examples/util/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/util/zipf/Makefile b/examples/util/zipf/Makefile
index 14ec98474..1f66b717e 100644
--- a/examples/util/zipf/Makefile
+++ b/examples/util/zipf/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2019 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
diff --git a/examples/util/zipf/zipf.c b/examples/util/zipf/zipf.c
index a0611d784..ed277409b 100644
--- a/examples/util/zipf/zipf.c
+++ b/examples/util/zipf/zipf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/vmd/Makefile b/examples/vmd/Makefile
index 306d08917..3bb73031b 100644
--- a/examples/vmd/Makefile
+++ b/examples/vmd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/vmd/led/Makefile b/examples/vmd/led/Makefile
index d0b8e650f..853880d06 100644
--- a/examples/vmd/led/Makefile
+++ b/examples/vmd/led/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/vmd/led/led.c b/examples/vmd/led/led.c
index da62b5f79..4d4bc1d96 100644
--- a/examples/vmd/led/led.c
+++ b/examples/vmd/led/led.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/examples/vmd/lsvmd/Makefile b/examples/vmd/lsvmd/Makefile
index b6901b554..4562976d0 100644
--- a/examples/vmd/lsvmd/Makefile
+++ b/examples/vmd/lsvmd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/examples/vmd/lsvmd/lsvmd.c b/examples/vmd/lsvmd/lsvmd.c
index 0eb21cd17..5605f31d7 100644
--- a/examples/vmd/lsvmd/lsvmd.c
+++ b/examples/vmd/lsvmd/lsvmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/go/spdk.go b/go/spdk.go
index 537deb772..3e0d3a026 100644
--- a/go/spdk.go
+++ b/go/spdk.go
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/Makefile b/include/Makefile
index 00f0b4630..acfc1b315 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/include/spdk/accel.h b/include/spdk/accel.h
index 1423c8f2f..b4367ad46 100644
--- a/include/spdk/accel.h
+++ b/include/spdk/accel.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/assert.h b/include/spdk/assert.h
index 24a34289a..4c140c84c 100644
--- a/include/spdk/assert.h
+++ b/include/spdk/assert.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/barrier.h b/include/spdk/barrier.h
index feba514d2..17fb05ba6 100644
--- a/include/spdk/barrier.h
+++ b/include/spdk/barrier.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   Copyright (c) 2017, IBM Corporation.
  *   All rights reserved.
  */
diff --git a/include/spdk/base64.h b/include/spdk/base64.h
index 9bc272e88..899589c4c 100644
--- a/include/spdk/base64.h
+++ b/include/spdk/base64.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/bdev.h b/include/spdk/bdev.h
index ebf491036..002b4bb84 100644
--- a/include/spdk/bdev.h
+++ b/include/spdk/bdev.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/bdev_module.h b/include/spdk/bdev_module.h
index e0f572f06..6dc39483e 100644
--- a/include/spdk/bdev_module.h
+++ b/include/spdk/bdev_module.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/bdev_zone.h b/include/spdk/bdev_zone.h
index eddf85968..b7368aa17 100644
--- a/include/spdk/bdev_zone.h
+++ b/include/spdk/bdev_zone.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/bit_array.h b/include/spdk/bit_array.h
index 11d0c67f3..b0fed89b0 100644
--- a/include/spdk/bit_array.h
+++ b/include/spdk/bit_array.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/bit_pool.h b/include/spdk/bit_pool.h
index 49ef50c50..1a038a5ab 100644
--- a/include/spdk/bit_pool.h
+++ b/include/spdk/bit_pool.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/blob.h b/include/spdk/blob.h
index 545f5b81c..d496560bb 100644
--- a/include/spdk/blob.h
+++ b/include/spdk/blob.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/blob_bdev.h b/include/spdk/blob_bdev.h
index 74c78b797..657ef065c 100644
--- a/include/spdk/blob_bdev.h
+++ b/include/spdk/blob_bdev.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/blobfs.h b/include/spdk/blobfs.h
index f97970d77..88767e417 100644
--- a/include/spdk/blobfs.h
+++ b/include/spdk/blobfs.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/blobfs_bdev.h b/include/spdk/blobfs_bdev.h
index c9c967b88..ab37fd6ad 100644
--- a/include/spdk/blobfs_bdev.h
+++ b/include/spdk/blobfs_bdev.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/conf.h b/include/spdk/conf.h
index 0d18ff41a..fb8da40cf 100644
--- a/include/spdk/conf.h
+++ b/include/spdk/conf.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/cpuset.h b/include/spdk/cpuset.h
index 8fc7fcc7c..fce402845 100644
--- a/include/spdk/cpuset.h
+++ b/include/spdk/cpuset.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/crc16.h b/include/spdk/crc16.h
index 5915ff5a5..157c4c4b4 100644
--- a/include/spdk/crc16.h
+++ b/include/spdk/crc16.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/crc32.h b/include/spdk/crc32.h
index a30c48ce2..04f81bd0b 100644
--- a/include/spdk/crc32.h
+++ b/include/spdk/crc32.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/dif.h b/include/spdk/dif.h
index 3b5a85ea1..5da881822 100644
--- a/include/spdk/dif.h
+++ b/include/spdk/dif.h
@@ -1,5 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/endian.h b/include/spdk/endian.h
index 669c5d708..63f746c58 100644
--- a/include/spdk/endian.h
+++ b/include/spdk/endian.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/env.h b/include/spdk/env.h
index 5c7b2f9da..bd4578e93 100644
--- a/include/spdk/env.h
+++ b/include/spdk/env.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   Copyright (c) NetApp, Inc.
  *   All rights reserved.
  */
diff --git a/include/spdk/env_dpdk.h b/include/spdk/env_dpdk.h
index 49b48c782..23f0d74d6 100644
--- a/include/spdk/env_dpdk.h
+++ b/include/spdk/env_dpdk.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/event.h b/include/spdk/event.h
index 5f03d9df1..1772c3561 100644
--- a/include/spdk/event.h
+++ b/include/spdk/event.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.  All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation.  All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk/fd.h b/include/spdk/fd.h
index 20d4b1bb5..2cb92b01b 100644
--- a/include/spdk/fd.h
+++ b/include/spdk/fd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/fd_group.h b/include/spdk/fd_group.h
index 6cad7e6dd..b4dbd1d9f 100644
--- a/include/spdk/fd_group.h
+++ b/include/spdk/fd_group.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/file.h b/include/spdk/file.h
index 6296bee73..e95ec8793 100644
--- a/include/spdk/file.h
+++ b/include/spdk/file.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/ftl.h b/include/spdk/ftl.h
index c721a0a44..82b4b9dc1 100644
--- a/include/spdk/ftl.h
+++ b/include/spdk/ftl.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/gpt_spec.h b/include/spdk/gpt_spec.h
index 1d62ad980..5ad896a11 100644
--- a/include/spdk/gpt_spec.h
+++ b/include/spdk/gpt_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/hexlify.h b/include/spdk/hexlify.h
index ed454fdbd..9061fb3db 100644
--- a/include/spdk/hexlify.h
+++ b/include/spdk/hexlify.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/histogram_data.h b/include/spdk/histogram_data.h
index 413f2f213..e004dc9f0 100644
--- a/include/spdk/histogram_data.h
+++ b/include/spdk/histogram_data.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/idxd.h b/include/spdk/idxd.h
index 7f836a574..0ddee8bbb 100644
--- a/include/spdk/idxd.h
+++ b/include/spdk/idxd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/idxd_spec.h b/include/spdk/idxd_spec.h
index 22d702dd9..d9360c4df 100644
--- a/include/spdk/idxd_spec.h
+++ b/include/spdk/idxd_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/init.h b/include/spdk/init.h
index ff4ec549c..3bba8651a 100644
--- a/include/spdk/init.h
+++ b/include/spdk/init.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.  All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation.  All rights reserved.
  */
 
 /**
diff --git a/include/spdk/ioat.h b/include/spdk/ioat.h
index 298e9cd0f..7bdf19406 100644
--- a/include/spdk/ioat.h
+++ b/include/spdk/ioat.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/ioat_spec.h b/include/spdk/ioat_spec.h
index 453fd17f8..6b08f4fb5 100644
--- a/include/spdk/ioat_spec.h
+++ b/include/spdk/ioat_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/iscsi_spec.h b/include/spdk/iscsi_spec.h
index c9c78fa84..5d4a63f52 100644
--- a/include/spdk/iscsi_spec.h
+++ b/include/spdk/iscsi_spec.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/json.h b/include/spdk/json.h
index a3b8d9985..0db6fc9cf 100644
--- a/include/spdk/json.h
+++ b/include/spdk/json.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/jsonrpc.h b/include/spdk/jsonrpc.h
index 937f8cc61..b1cc79297 100644
--- a/include/spdk/jsonrpc.h
+++ b/include/spdk/jsonrpc.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/likely.h b/include/spdk/likely.h
index 07cdab8e1..6d92f43bd 100644
--- a/include/spdk/likely.h
+++ b/include/spdk/likely.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/log.h b/include/spdk/log.h
index cfe84b143..a306ad71b 100644
--- a/include/spdk/log.h
+++ b/include/spdk/log.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/lvol.h b/include/spdk/lvol.h
index ef28c0e42..b21f0d712 100644
--- a/include/spdk/lvol.h
+++ b/include/spdk/lvol.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/memory.h b/include/spdk/memory.h
index 7d67b4a7e..fcaf8f562 100644
--- a/include/spdk/memory.h
+++ b/include/spdk/memory.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/mmio.h b/include/spdk/mmio.h
index be00442cb..c9a2748ee 100644
--- a/include/spdk/mmio.h
+++ b/include/spdk/mmio.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nbd.h b/include/spdk/nbd.h
index 52ae1916c..312e877a5 100644
--- a/include/spdk/nbd.h
+++ b/include/spdk/nbd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/notify.h b/include/spdk/notify.h
index e1a20748e..fce5bc19b 100644
--- a/include/spdk/notify.h
+++ b/include/spdk/notify.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h
index cbc93caba..dce8f96a3 100644
--- a/include/spdk/nvme.h
+++ b/include/spdk/nvme.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/nvme_intel.h b/include/spdk/nvme_intel.h
index 5a0ca027f..486c0b28a 100644
--- a/include/spdk/nvme_intel.h
+++ b/include/spdk/nvme_intel.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvme_ocssd.h b/include/spdk/nvme_ocssd.h
index 9f93de13d..67ab4cc51 100644
--- a/include/spdk/nvme_ocssd.h
+++ b/include/spdk/nvme_ocssd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvme_ocssd_spec.h b/include/spdk/nvme_ocssd_spec.h
index 5150240a4..9c23fa717 100644
--- a/include/spdk/nvme_ocssd_spec.h
+++ b/include/spdk/nvme_ocssd_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h
index d23a6cfc4..55d7eb53a 100644
--- a/include/spdk/nvme_spec.h
+++ b/include/spdk/nvme_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h
index 6b82ea176..545c88423 100644
--- a/include/spdk/nvmf.h
+++ b/include/spdk/nvmf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/nvmf_cmd.h b/include/spdk/nvmf_cmd.h
index 3dd3fbff7..1d2a7a89f 100644
--- a/include/spdk/nvmf_cmd.h
+++ b/include/spdk/nvmf_cmd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvmf_fc_spec.h b/include/spdk/nvmf_fc_spec.h
index da2708eb7..cd1b566f1 100644
--- a/include/spdk/nvmf_fc_spec.h
+++ b/include/spdk/nvmf_fc_spec.h
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2019 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  */
diff --git a/include/spdk/nvmf_spec.h b/include/spdk/nvmf_spec.h
index bbb676056..1e05daa15 100644
--- a/include/spdk/nvmf_spec.h
+++ b/include/spdk/nvmf_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h
index 8550cd5e5..ef041cc43 100644
--- a/include/spdk/nvmf_transport.h
+++ b/include/spdk/nvmf_transport.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk/opal.h b/include/spdk/opal.h
index a85952125..ce4ee707b 100644
--- a/include/spdk/opal.h
+++ b/include/spdk/opal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/opal_spec.h b/include/spdk/opal_spec.h
index 050797f1d..06b267015 100644
--- a/include/spdk/opal_spec.h
+++ b/include/spdk/opal_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/pci_ids.h b/include/spdk/pci_ids.h
index 80e52fd9c..207a2217b 100644
--- a/include/spdk/pci_ids.h
+++ b/include/spdk/pci_ids.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/pipe.h b/include/spdk/pipe.h
index 5d59cd172..3de8bcd79 100644
--- a/include/spdk/pipe.h
+++ b/include/spdk/pipe.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  */
 
 /** \file
diff --git a/include/spdk/queue.h b/include/spdk/queue.h
index 6a097b59b..6eae8c1fd 100644
--- a/include/spdk/queue.h
+++ b/include/spdk/queue.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/queue_extras.h b/include/spdk/queue_extras.h
index f52529e7e..841a54140 100644
--- a/include/spdk/queue_extras.h
+++ b/include/spdk/queue_extras.h
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 1991, 1993
+ * Copyright (C) 2015 Intel Corporation.
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/spdk/reduce.h b/include/spdk/reduce.h
index 52d1140ed..ee818ac8c 100644
--- a/include/spdk/reduce.h
+++ b/include/spdk/reduce.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/rpc.h b/include/spdk/rpc.h
index 1d7c300fd..7b0a5b27f 100644
--- a/include/spdk/rpc.h
+++ b/include/spdk/rpc.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk/scheduler.h b/include/spdk/scheduler.h
index ea4cc4cf9..ba7d2ec28 100644
--- a/include/spdk/scheduler.h
+++ b/include/spdk/scheduler.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/scsi.h b/include/spdk/scsi.h
index e01b2b53d..05edcc031 100644
--- a/include/spdk/scsi.h
+++ b/include/spdk/scsi.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/scsi_spec.h b/include/spdk/scsi_spec.h
index ce465b353..571c98c35 100644
--- a/include/spdk/scsi_spec.h
+++ b/include/spdk/scsi_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/sock.h b/include/spdk/sock.h
index 81bd823d4..79789176c 100644
--- a/include/spdk/sock.h
+++ b/include/spdk/sock.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk/stdinc.h b/include/spdk/stdinc.h
index 5e6bb9213..7a3f0e6a1 100644
--- a/include/spdk/stdinc.h
+++ b/include/spdk/stdinc.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/string.h b/include/spdk/string.h
index 97eb65136..355a3f451 100644
--- a/include/spdk/string.h
+++ b/include/spdk/string.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/thread.h b/include/spdk/thread.h
index aabe84687..121d93f84 100644
--- a/include/spdk/thread.h
+++ b/include/spdk/thread.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/trace.h b/include/spdk/trace.h
index b8e20f164..d42216e68 100644
--- a/include/spdk/trace.h
+++ b/include/spdk/trace.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/trace_parser.h b/include/spdk/trace_parser.h
index c5cd119af..15e264aab 100644
--- a/include/spdk/trace_parser.h
+++ b/include/spdk/trace_parser.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 /**
diff --git a/include/spdk/util.h b/include/spdk/util.h
index 93e0260b5..5a7a6dfac 100644
--- a/include/spdk/util.h
+++ b/include/spdk/util.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk/uuid.h b/include/spdk/uuid.h
index 3fe833670..d6352546d 100644
--- a/include/spdk/uuid.h
+++ b/include/spdk/uuid.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/version.h b/include/spdk/version.h
index cb860046e..54027b3c4 100644
--- a/include/spdk/version.h
+++ b/include/spdk/version.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk/vfio_user_pci.h b/include/spdk/vfio_user_pci.h
index 75e556c5a..8debcfbdb 100644
--- a/include/spdk/vfio_user_pci.h
+++ b/include/spdk/vfio_user_pci.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  */
 
 #ifndef _SPDK_VFIO_USER_PCI_H
diff --git a/include/spdk/vfio_user_spec.h b/include/spdk/vfio_user_spec.h
index 71957254c..6a5f8e126 100644
--- a/include/spdk/vfio_user_spec.h
+++ b/include/spdk/vfio_user_spec.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/vfu_target.h b/include/spdk/vfu_target.h
index 5f257628d..3db45bab1 100644
--- a/include/spdk/vfu_target.h
+++ b/include/spdk/vfu_target.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/vhost.h b/include/spdk/vhost.h
index 1850ff492..1dd5d2ace 100644
--- a/include/spdk/vhost.h
+++ b/include/spdk/vhost.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/vmd.h b/include/spdk/vmd.h
index 629fb4d8b..fed2d4837 100644
--- a/include/spdk/vmd.h
+++ b/include/spdk/vmd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/xor.h b/include/spdk/xor.h
index 4bbe4aa5d..19f4b36bd 100644
--- a/include/spdk/xor.h
+++ b/include/spdk/xor.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk/zipf.h b/include/spdk/zipf.h
index a58fcd75a..9059fa0c8 100644
--- a/include/spdk/zipf.h
+++ b/include/spdk/zipf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/accel_module.h b/include/spdk_internal/accel_module.h
index 6790a6bb4..a4cde32fa 100644
--- a/include/spdk_internal/accel_module.h
+++ b/include/spdk_internal/accel_module.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/assert.h b/include/spdk_internal/assert.h
index 897f3cd40..8a41b658a 100644
--- a/include/spdk_internal/assert.h
+++ b/include/spdk_internal/assert.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h
index c20ab2656..c43b99719 100644
--- a/include/spdk_internal/event.h
+++ b/include/spdk_internal/event.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/idxd.h b/include/spdk_internal/idxd.h
index 3b3591f25..f16b53084 100644
--- a/include/spdk_internal/idxd.h
+++ b/include/spdk_internal/idxd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/init.h b/include/spdk_internal/init.h
index f1ba4d0ed..eb31bfcca 100644
--- a/include/spdk_internal/init.h
+++ b/include/spdk_internal/init.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.  All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation.  All rights reserved.
  */
 
 #ifndef SPDK_INIT_INTERNAL_H
diff --git a/include/spdk_internal/lvolstore.h b/include/spdk_internal/lvolstore.h
index 15e0400d9..5ef6f80b2 100644
--- a/include/spdk_internal/lvolstore.h
+++ b/include/spdk_internal/lvolstore.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/mock.h b/include/spdk_internal/mock.h
index 6c8d7828e..1547e0f78 100644
--- a/include/spdk_internal/mock.h
+++ b/include/spdk_internal/mock.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/nvme_tcp.h b/include/spdk_internal/nvme_tcp.h
index 8b6b33ff4..96b0ade6c 100644
--- a/include/spdk_internal/nvme_tcp.h
+++ b/include/spdk_internal/nvme_tcp.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk_internal/rdma.h b/include/spdk_internal/rdma.h
index 983b25645..95763679e 100644
--- a/include/spdk_internal/rdma.h
+++ b/include/spdk_internal/rdma.h
@@ -1,5 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
  *   Copyright (c) Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk_internal/sgl.h b/include/spdk_internal/sgl.h
index 9a91f56f4..57bf372ab 100644
--- a/include/spdk_internal/sgl.h
+++ b/include/spdk_internal/sgl.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/sock.h b/include/spdk_internal/sock.h
index 22f1785ef..70f268ba4 100644
--- a/include/spdk_internal/sock.h
+++ b/include/spdk_internal/sock.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk_internal/thread.h b/include/spdk_internal/thread.h
index 659050b07..15f53fa12 100644
--- a/include/spdk_internal/thread.h
+++ b/include/spdk_internal/thread.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/include/spdk_internal/trace_defs.h b/include/spdk_internal/trace_defs.h
index b1e547cae..65574d1ee 100644
--- a/include/spdk_internal/trace_defs.h
+++ b/include/spdk_internal/trace_defs.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/include/spdk_internal/uring.h b/include/spdk_internal/uring.h
index 415c16a4f..d8cd03824 100644
--- a/include/spdk_internal/uring.h
+++ b/include/spdk_internal/uring.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/usdt.h b/include/spdk_internal/usdt.h
index 0caa762d7..70326420f 100644
--- a/include/spdk_internal/usdt.h
+++ b/include/spdk_internal/usdt.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/include/spdk_internal/utf.h b/include/spdk_internal/utf.h
index 8028af380..3bd33fe54 100644
--- a/include/spdk_internal/utf.h
+++ b/include/spdk_internal/utf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/ipsecbuild/Makefile b/ipsecbuild/Makefile
index 9d9b9d0d6..d87f8f8d4 100644
--- a/ipsecbuild/Makefile
+++ b/ipsecbuild/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2019 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/isalbuild/Makefile b/isalbuild/Makefile
index 263ba5676..4c95f37cd 100644
--- a/isalbuild/Makefile
+++ b/isalbuild/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2019 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/Makefile b/lib/Makefile
index 34c2d2e9f..55b3325be 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/accel/Makefile b/lib/accel/Makefile
index a0adf84d7..2013e5dd5 100644
--- a/lib/accel/Makefile
+++ b/lib/accel/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/accel/accel.c b/lib/accel/accel.c
index afdf1670f..dcfc4bd92 100644
--- a/lib/accel/accel.c
+++ b/lib/accel/accel.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/lib/accel/accel_internal.h b/lib/accel/accel_internal.h
index 3403bb55d..4af0d4d49 100644
--- a/lib/accel/accel_internal.h
+++ b/lib/accel/accel_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/lib/accel/accel_rpc.c b/lib/accel/accel_rpc.c
index 31cbe0212..909162f73 100644
--- a/lib/accel/accel_rpc.c
+++ b/lib/accel/accel_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/lib/accel/accel_sw.c b/lib/accel/accel_sw.c
index a3ea21284..ee65949ba 100644
--- a/lib/accel/accel_sw.c
+++ b/lib/accel/accel_sw.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile
index 9e7779964..0e1bc3742 100644
--- a/lib/bdev/Makefile
+++ b/lib/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index 0a5a1dba4..b7c4a7d0a 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/bdev/bdev_internal.h b/lib/bdev/bdev_internal.h
index 4eccf6359..a8b548c5a 100644
--- a/lib/bdev/bdev_internal.h
+++ b/lib/bdev/bdev_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/bdev/bdev_rpc.c b/lib/bdev/bdev_rpc.c
index fbd87dd99..c50cc5d4b 100644
--- a/lib/bdev/bdev_rpc.c
+++ b/lib/bdev/bdev_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/bdev/bdev_zone.c b/lib/bdev/bdev_zone.c
index 0133a0093..64b694bc3 100644
--- a/lib/bdev/bdev_zone.c
+++ b/lib/bdev/bdev_zone.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/bdev/part.c b/lib/bdev/part.c
index af7819fee..46bfd4678 100644
--- a/lib/bdev/part.c
+++ b/lib/bdev/part.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/lib/bdev/scsi_nvme.c b/lib/bdev/scsi_nvme.c
index 8cf7377ee..a1a936f95 100644
--- a/lib/bdev/scsi_nvme.c
+++ b/lib/bdev/scsi_nvme.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2017 Intel Corporation.
  *   Copyright (c) 2016 FUJITSU LIMITED, All rights reserved.
  */
 
diff --git a/lib/bdev/vtune.c b/lib/bdev/vtune.c
index 2cad5c3fb..444b8ddbd 100644
--- a/lib/bdev/vtune.c
+++ b/lib/bdev/vtune.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/blob/Makefile b/lib/blob/Makefile
index baf7b55db..f87bdd838 100644
--- a/lib/blob/Makefile
+++ b/lib/blob/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/blob/blob_bs_dev.c b/lib/blob/blob_bs_dev.c
index 145d5f8db..a189f54c3 100644
--- a/lib/blob/blob_bs_dev.c
+++ b/lib/blob/blob_bs_dev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c
index e28bb911c..1b28c9240 100644
--- a/lib/blob/blobstore.c
+++ b/lib/blob/blobstore.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blob/blobstore.h b/lib/blob/blobstore.h
index 20ea35890..c97a94388 100644
--- a/lib/blob/blobstore.h
+++ b/lib/blob/blobstore.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blob/request.c b/lib/blob/request.c
index c63a0e022..7943879b6 100644
--- a/lib/blob/request.c
+++ b/lib/blob/request.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blob/request.h b/lib/blob/request.h
index 77576be20..ebee8a1d7 100644
--- a/lib/blob/request.h
+++ b/lib/blob/request.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blob/zeroes.c b/lib/blob/zeroes.c
index 8342414ca..5fdf0b649 100644
--- a/lib/blob/zeroes.c
+++ b/lib/blob/zeroes.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/blobfs/Makefile b/lib/blobfs/Makefile
index a9d1c2ca2..e8d7e4a9e 100644
--- a/lib/blobfs/Makefile
+++ b/lib/blobfs/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c
index 65c02fc02..33ba49850 100644
--- a/lib/blobfs/blobfs.c
+++ b/lib/blobfs/blobfs.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/blobfs/cache_tree.h b/lib/blobfs/cache_tree.h
index a6c342fb3..3112f5e6d 100644
--- a/lib/blobfs/cache_tree.h
+++ b/lib/blobfs/cache_tree.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/blobfs/tree.c b/lib/blobfs/tree.c
index 23168f9ef..ccdc56982 100644
--- a/lib/blobfs/tree.c
+++ b/lib/blobfs/tree.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/conf/Makefile b/lib/conf/Makefile
index 7138c1203..8125b9050 100644
--- a/lib/conf/Makefile
+++ b/lib/conf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/conf/conf.c b/lib/conf/conf.c
index ca282cc29..8588cdcf5 100644
--- a/lib/conf/conf.c
+++ b/lib/conf/conf.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/dma/Makefile b/lib/dma/Makefile
index 5243ef73b..5ceed56bc 100644
--- a/lib/dma/Makefile
+++ b/lib/dma/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2022 Intel Corporation.
 #  Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 
diff --git a/lib/env_dpdk/22.07/rte_bus_pci.h b/lib/env_dpdk/22.07/rte_bus_pci.h
index 9a0b03617..f9700b42c 100644
--- a/lib/env_dpdk/22.07/rte_bus_pci.h
+++ b/lib/env_dpdk/22.07/rte_bus_pci.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2015 Intel Corporation.
+ * Copyright (C) 2010-2015 Intel Corporation.
  * Copyright 2013-2014 6WIND S.A.
  */
 
diff --git a/lib/env_dpdk/22.11/bus_pci_driver.h b/lib/env_dpdk/22.11/bus_pci_driver.h
index 0a5fffb19..e635727d2 100644
--- a/lib/env_dpdk/22.11/bus_pci_driver.h
+++ b/lib/env_dpdk/22.11/bus_pci_driver.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2015 Intel Corporation.
+ * Copyright (C) 2010-2015 Intel Corporation.
  * Copyright 2013-2014 6WIND S.A.
  */
 
diff --git a/lib/env_dpdk/22.11/rte_bus_pci.h b/lib/env_dpdk/22.11/rte_bus_pci.h
index 60e50ca87..aa0efbdd8 100644
--- a/lib/env_dpdk/22.11/rte_bus_pci.h
+++ b/lib/env_dpdk/22.11/rte_bus_pci.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2015 Intel Corporation.
+ * Copyright (C) 2010-2015 Intel Corporation.
  * Copyright 2013-2014 6WIND S.A.
  */
 
diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile
index 1ee792999..6b4c3b2e4 100644
--- a/lib/env_dpdk/Makefile
+++ b/lib/env_dpdk/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/env_dpdk/env.c b/lib/env_dpdk/env.c
index 5f0bd43bc..7c1fd624e 100644
--- a/lib/env_dpdk/env.c
+++ b/lib/env_dpdk/env.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk
index fa942f01d..e0b4b9d1a 100644
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #  Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
diff --git a/lib/env_dpdk/env_internal.h b/lib/env_dpdk/env_internal.h
index 3516c0d05..e4fa4ea7d 100644
--- a/lib/env_dpdk/env_internal.h
+++ b/lib/env_dpdk/env_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c
index d398afaf3..28c627784 100644
--- a/lib/env_dpdk/init.c
+++ b/lib/env_dpdk/init.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/memory.c b/lib/env_dpdk/memory.c
index f01884285..4e620a4ab 100644
--- a/lib/env_dpdk/memory.c
+++ b/lib/env_dpdk/memory.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci.c b/lib/env_dpdk/pci.c
index d4efc175a..4d812366d 100644
--- a/lib/env_dpdk/pci.c
+++ b/lib/env_dpdk/pci.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_dpdk.c b/lib/env_dpdk/pci_dpdk.c
index aafe68953..5f60f2b71 100644
--- a/lib/env_dpdk/pci_dpdk.c
+++ b/lib/env_dpdk/pci_dpdk.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_dpdk.h b/lib/env_dpdk/pci_dpdk.h
index 6f8564427..fa1f00177 100644
--- a/lib/env_dpdk/pci_dpdk.h
+++ b/lib/env_dpdk/pci_dpdk.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_dpdk_2207.c b/lib/env_dpdk/pci_dpdk_2207.c
index 6ef2cda02..2700446de 100644
--- a/lib/env_dpdk/pci_dpdk_2207.c
+++ b/lib/env_dpdk/pci_dpdk_2207.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_dpdk_2211.c b/lib/env_dpdk/pci_dpdk_2211.c
index af0ce5255..f9b419631 100644
--- a/lib/env_dpdk/pci_dpdk_2211.c
+++ b/lib/env_dpdk/pci_dpdk_2211.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_event.c b/lib/env_dpdk/pci_event.c
index dacfc3213..2ad3fa3a2 100644
--- a/lib/env_dpdk/pci_event.c
+++ b/lib/env_dpdk/pci_event.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_idxd.c b/lib/env_dpdk/pci_idxd.c
index 1808ea181..19000adcf 100644
--- a/lib/env_dpdk/pci_idxd.c
+++ b/lib/env_dpdk/pci_idxd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_ioat.c b/lib/env_dpdk/pci_ioat.c
index d6c3fc610..a4048021c 100644
--- a/lib/env_dpdk/pci_ioat.c
+++ b/lib/env_dpdk/pci_ioat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_virtio.c b/lib/env_dpdk/pci_virtio.c
index 0e8826936..2601fb85a 100644
--- a/lib/env_dpdk/pci_virtio.c
+++ b/lib/env_dpdk/pci_virtio.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/pci_vmd.c b/lib/env_dpdk/pci_vmd.c
index 75132a9f6..d16c404f4 100644
--- a/lib/env_dpdk/pci_vmd.c
+++ b/lib/env_dpdk/pci_vmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/sigbus_handler.c b/lib/env_dpdk/sigbus_handler.c
index 11f454da7..4ec34d0bf 100644
--- a/lib/env_dpdk/sigbus_handler.c
+++ b/lib/env_dpdk/sigbus_handler.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_dpdk/threads.c b/lib/env_dpdk/threads.c
index 5365d3876..8ecce7efb 100644
--- a/lib/env_dpdk/threads.c
+++ b/lib/env_dpdk/threads.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_ocf/Makefile b/lib/env_ocf/Makefile
index f303dd7c7..73ed32aa1 100644
--- a/lib/env_ocf/Makefile
+++ b/lib/env_ocf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2019 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/env_ocf/mpool.c b/lib/env_ocf/mpool.c
index fa882b2d8..4457f1f59 100644
--- a/lib/env_ocf/mpool.c
+++ b/lib/env_ocf/mpool.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_ocf/mpool.h b/lib/env_ocf/mpool.h
index 33dd51814..f44b08190 100644
--- a/lib/env_ocf/mpool.h
+++ b/lib/env_ocf/mpool.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_ocf/ocf_env.c b/lib/env_ocf/ocf_env.c
index 376efac9f..026c96b50 100644
--- a/lib/env_ocf/ocf_env.c
+++ b/lib/env_ocf/ocf_env.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
+
 #include "ocf/ocf_def.h"
 #include "ocf_env.h"
 
diff --git a/lib/env_ocf/ocf_env.h b/lib/env_ocf/ocf_env.h
index 356a0ad7e..19dd6f643 100644
--- a/lib/env_ocf/ocf_env.h
+++ b/lib/env_ocf/ocf_env.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_ocf/ocf_env_headers.h b/lib/env_ocf/ocf_env_headers.h
index 650f98a97..403c0bdcb 100644
--- a/lib/env_ocf/ocf_env_headers.h
+++ b/lib/env_ocf/ocf_env_headers.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/env_ocf/ocf_env_list.h b/lib/env_ocf/ocf_env_list.h
index dd7963b86..6dbb8def5 100644
--- a/lib/env_ocf/ocf_env_list.h
+++ b/lib/env_ocf/ocf_env_list.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/event/Makefile b/lib/event/Makefile
index ff2ecdbe6..d625c976d 100644
--- a/lib/event/Makefile
+++ b/lib/event/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/event/app.c b/lib/event/app.c
index 3252a3107..9f18c3066 100644
--- a/lib/event/app.c
+++ b/lib/event/app.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/event/app_rpc.c b/lib/event/app_rpc.c
index a6c1e22fd..0bc151087 100644
--- a/lib/event/app_rpc.c
+++ b/lib/event/app_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/event/log_rpc.c b/lib/event/log_rpc.c
index 4fe152ffd..fe72492bf 100644
--- a/lib/event/log_rpc.c
+++ b/lib/event/log_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/event/reactor.c b/lib/event/reactor.c
index 7f7cf4741..a03263274 100644
--- a/lib/event/reactor.c
+++ b/lib/event/reactor.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/event/scheduler_static.c b/lib/event/scheduler_static.c
index 7465004e7..f9e4562f3 100644
--- a/lib/event/scheduler_static.c
+++ b/lib/event/scheduler_static.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile
index 3ad31c435..28adb26b1 100644
--- a/lib/ftl/Makefile
+++ b/lib/ftl/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/ftl/ftl_band.c b/lib/ftl/ftl_band.c
index 479524a2e..ac1898afd 100644
--- a/lib/ftl/ftl_band.c
+++ b/lib/ftl/ftl_band.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_band.h b/lib/ftl/ftl_band.h
index 82dabe3d1..d9a33a2a6 100644
--- a/lib/ftl/ftl_band.h
+++ b/lib/ftl/ftl_band.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_band_ops.c b/lib/ftl/ftl_band_ops.c
index 1ce8184fd..0cd97dff0 100644
--- a/lib/ftl/ftl_band_ops.c
+++ b/lib/ftl/ftl_band_ops.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_core.c b/lib/ftl/ftl_core.c
index d78b85b54..4371a319f 100644
--- a/lib/ftl/ftl_core.c
+++ b/lib/ftl/ftl_core.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_core.h b/lib/ftl/ftl_core.h
index b49cd9f08..b24cfafc6 100644
--- a/lib/ftl/ftl_core.h
+++ b/lib/ftl/ftl_core.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_debug.c b/lib/ftl/ftl_debug.c
index 2197ff40d..6fec9d75a 100644
--- a/lib/ftl/ftl_debug.c
+++ b/lib/ftl/ftl_debug.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_debug.h b/lib/ftl/ftl_debug.h
index 2744a64fc..459146e48 100644
--- a/lib/ftl/ftl_debug.h
+++ b/lib/ftl/ftl_debug.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_init.c b/lib/ftl/ftl_init.c
index bc082c2f4..66614dd77 100644
--- a/lib/ftl/ftl_init.c
+++ b/lib/ftl/ftl_init.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_internal.h b/lib/ftl/ftl_internal.h
index f56c7738c..f67cbcc49 100644
--- a/lib/ftl/ftl_internal.h
+++ b/lib/ftl/ftl_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_io.c b/lib/ftl/ftl_io.c
index ece81244b..2e92f2d10 100644
--- a/lib/ftl/ftl_io.c
+++ b/lib/ftl/ftl_io.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_io.h b/lib/ftl/ftl_io.h
index fac280a24..84368f2e0 100644
--- a/lib/ftl/ftl_io.h
+++ b/lib/ftl/ftl_io.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p.c b/lib/ftl/ftl_l2p.c
index 1fee554aa..a08519eac 100644
--- a/lib/ftl/ftl_l2p.c
+++ b/lib/ftl/ftl_l2p.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p.h b/lib/ftl/ftl_l2p.h
index df593ac2b..55f03f772 100644
--- a/lib/ftl/ftl_l2p.h
+++ b/lib/ftl/ftl_l2p.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p_cache.c b/lib/ftl/ftl_l2p_cache.c
index 0f11d5f31..981a644f9 100644
--- a/lib/ftl/ftl_l2p_cache.c
+++ b/lib/ftl/ftl_l2p_cache.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p_cache.h b/lib/ftl/ftl_l2p_cache.h
index dce6238b2..acf44b685 100644
--- a/lib/ftl/ftl_l2p_cache.h
+++ b/lib/ftl/ftl_l2p_cache.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p_flat.c b/lib/ftl/ftl_l2p_flat.c
index a1dbe6137..4f6ca9eef 100644
--- a/lib/ftl/ftl_l2p_flat.c
+++ b/lib/ftl/ftl_l2p_flat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_l2p_flat.h b/lib/ftl/ftl_l2p_flat.h
index 942d18cce..eb5a900f5 100644
--- a/lib/ftl/ftl_l2p_flat.h
+++ b/lib/ftl/ftl_l2p_flat.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_layout.c b/lib/ftl/ftl_layout.c
index 5992c8814..f0f4d1921 100644
--- a/lib/ftl/ftl_layout.c
+++ b/lib/ftl/ftl_layout.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_layout.h b/lib/ftl/ftl_layout.h
index 518440572..d557125f3 100644
--- a/lib/ftl/ftl_layout.h
+++ b/lib/ftl/ftl_layout.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_nv_cache.c b/lib/ftl/ftl_nv_cache.c
index 0d470303a..a99a19fed 100644
--- a/lib/ftl/ftl_nv_cache.c
+++ b/lib/ftl/ftl_nv_cache.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_nv_cache.h b/lib/ftl/ftl_nv_cache.h
index d68493985..adff2517c 100644
--- a/lib/ftl/ftl_nv_cache.h
+++ b/lib/ftl/ftl_nv_cache.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_nv_cache_io.h b/lib/ftl/ftl_nv_cache_io.h
index ce2f6f4b6..1ceecc7e8 100644
--- a/lib/ftl/ftl_nv_cache_io.h
+++ b/lib/ftl/ftl_nv_cache_io.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_p2l.c b/lib/ftl/ftl_p2l.c
index f35e76371..6f862ce6c 100644
--- a/lib/ftl/ftl_p2l.c
+++ b/lib/ftl/ftl_p2l.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_reloc.c b/lib/ftl/ftl_reloc.c
index 334d4935d..894f32a2c 100644
--- a/lib/ftl/ftl_reloc.c
+++ b/lib/ftl/ftl_reloc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_rq.c b/lib/ftl/ftl_rq.c
index ddc8790fd..95f9b2a61 100644
--- a/lib/ftl/ftl_rq.c
+++ b/lib/ftl/ftl_rq.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_sb.c b/lib/ftl/ftl_sb.c
index 728369898..0129d6cfb 100644
--- a/lib/ftl/ftl_sb.c
+++ b/lib/ftl/ftl_sb.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_sb.h b/lib/ftl/ftl_sb.h
index ac2ae8922..0f434fc91 100644
--- a/lib/ftl/ftl_sb.h
+++ b/lib/ftl/ftl_sb.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_sb_common.h b/lib/ftl/ftl_sb_common.h
index d0b26bed4..c4eda3dc3 100644
--- a/lib/ftl/ftl_sb_common.h
+++ b/lib/ftl/ftl_sb_common.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_sb_current.h b/lib/ftl/ftl_sb_current.h
index 4a8f233eb..30defa583 100644
--- a/lib/ftl/ftl_sb_current.h
+++ b/lib/ftl/ftl_sb_current.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_trace.c b/lib/ftl/ftl_trace.c
index 154c6d731..b35948cc6 100644
--- a/lib/ftl/ftl_trace.c
+++ b/lib/ftl/ftl_trace.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_trace.h b/lib/ftl/ftl_trace.h
index d9d94c1b6..edfca8f0b 100644
--- a/lib/ftl/ftl_trace.h
+++ b/lib/ftl/ftl_trace.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_utils.h b/lib/ftl/ftl_utils.h
index 89720060c..749b9ad96 100644
--- a/lib/ftl/ftl_utils.h
+++ b/lib/ftl/ftl_utils.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_writer.c b/lib/ftl/ftl_writer.c
index ee307a410..601bcf845 100644
--- a/lib/ftl/ftl_writer.c
+++ b/lib/ftl/ftl_writer.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/ftl_writer.h b/lib/ftl/ftl_writer.h
index 79fa1224c..d5c64eec8 100644
--- a/lib/ftl/ftl_writer.h
+++ b/lib/ftl/ftl_writer.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt.c b/lib/ftl/mngt/ftl_mngt.c
index b67b1eafb..609fdd76e 100644
--- a/lib/ftl/mngt/ftl_mngt.c
+++ b/lib/ftl/mngt/ftl_mngt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt.h b/lib/ftl/mngt/ftl_mngt.h
index 558a52d36..19e5c613d 100644
--- a/lib/ftl/mngt/ftl_mngt.h
+++ b/lib/ftl/mngt/ftl_mngt.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_band.c b/lib/ftl/mngt/ftl_mngt_band.c
index 71161cad5..0d98ac663 100644
--- a/lib/ftl/mngt/ftl_mngt_band.c
+++ b/lib/ftl/mngt/ftl_mngt_band.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_bdev.c b/lib/ftl/mngt/ftl_mngt_bdev.c
index 1067d20f4..e631d5e8f 100644
--- a/lib/ftl/mngt/ftl_mngt_bdev.c
+++ b/lib/ftl/mngt/ftl_mngt_bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_ioch.c b/lib/ftl/mngt/ftl_mngt_ioch.c
index f589f3f55..d739cdb3d 100644
--- a/lib/ftl/mngt/ftl_mngt_ioch.c
+++ b/lib/ftl/mngt/ftl_mngt_ioch.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_l2p.c b/lib/ftl/mngt/ftl_mngt_l2p.c
index 800bb7a00..8dcda04d1 100644
--- a/lib/ftl/mngt/ftl_mngt_l2p.c
+++ b/lib/ftl/mngt/ftl_mngt_l2p.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_md.c b/lib/ftl/mngt/ftl_mngt_md.c
index ad06716f3..9c1ef694c 100644
--- a/lib/ftl/mngt/ftl_mngt_md.c
+++ b/lib/ftl/mngt/ftl_mngt_md.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_misc.c b/lib/ftl/mngt/ftl_mngt_misc.c
index 264a0de6c..44edfcfec 100644
--- a/lib/ftl/mngt/ftl_mngt_misc.c
+++ b/lib/ftl/mngt/ftl_mngt_misc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_p2l.c b/lib/ftl/mngt/ftl_mngt_p2l.c
index 72d311a21..3da575886 100644
--- a/lib/ftl/mngt/ftl_mngt_p2l.c
+++ b/lib/ftl/mngt/ftl_mngt_p2l.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_recovery.c b/lib/ftl/mngt/ftl_mngt_recovery.c
index a891f148f..2ab7cc68e 100644
--- a/lib/ftl/mngt/ftl_mngt_recovery.c
+++ b/lib/ftl/mngt/ftl_mngt_recovery.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_self_test.c b/lib/ftl/mngt/ftl_mngt_self_test.c
index b9452e5bf..83ab98b94 100644
--- a/lib/ftl/mngt/ftl_mngt_self_test.c
+++ b/lib/ftl/mngt/ftl_mngt_self_test.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_shutdown.c b/lib/ftl/mngt/ftl_mngt_shutdown.c
index 01b63d930..01b2f7edc 100644
--- a/lib/ftl/mngt/ftl_mngt_shutdown.c
+++ b/lib/ftl/mngt/ftl_mngt_shutdown.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_startup.c b/lib/ftl/mngt/ftl_mngt_startup.c
index 51904cb87..ff56e129d 100644
--- a/lib/ftl/mngt/ftl_mngt_startup.c
+++ b/lib/ftl/mngt/ftl_mngt_startup.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_steps.h b/lib/ftl/mngt/ftl_mngt_steps.h
index de3e3e069..50b4e514c 100644
--- a/lib/ftl/mngt/ftl_mngt_steps.h
+++ b/lib/ftl/mngt/ftl_mngt_steps.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/mngt/ftl_mngt_upgrade.c b/lib/ftl/mngt/ftl_mngt_upgrade.c
index 3d64987d4..afad8c9f9 100644
--- a/lib/ftl/mngt/ftl_mngt_upgrade.c
+++ b/lib/ftl/mngt/ftl_mngt_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_band_upgrade.c b/lib/ftl/upgrade/ftl_band_upgrade.c
index 0cf2e3387..11ad2ce18 100644
--- a/lib/ftl/upgrade/ftl_band_upgrade.c
+++ b/lib/ftl/upgrade/ftl_band_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_chunk_upgrade.c b/lib/ftl/upgrade/ftl_chunk_upgrade.c
index e0a4e6411..b9b18945b 100644
--- a/lib/ftl/upgrade/ftl_chunk_upgrade.c
+++ b/lib/ftl/upgrade/ftl_chunk_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_layout_upgrade.c b/lib/ftl/upgrade/ftl_layout_upgrade.c
index 5c3465d58..2c72cf3d7 100644
--- a/lib/ftl/upgrade/ftl_layout_upgrade.c
+++ b/lib/ftl/upgrade/ftl_layout_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_layout_upgrade.h b/lib/ftl/upgrade/ftl_layout_upgrade.h
index ed7126281..99f1f13b1 100644
--- a/lib/ftl/upgrade/ftl_layout_upgrade.h
+++ b/lib/ftl/upgrade/ftl_layout_upgrade.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_p2l_upgrade.c b/lib/ftl/upgrade/ftl_p2l_upgrade.c
index 774a8e6ae..6ba11f853 100644
--- a/lib/ftl/upgrade/ftl_p2l_upgrade.c
+++ b/lib/ftl/upgrade/ftl_p2l_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_sb_prev.h b/lib/ftl/upgrade/ftl_sb_prev.h
index 0678da270..9d5fa4812 100644
--- a/lib/ftl/upgrade/ftl_sb_prev.h
+++ b/lib/ftl/upgrade/ftl_sb_prev.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_sb_upgrade.c b/lib/ftl/upgrade/ftl_sb_upgrade.c
index 2050e4cef..5781190e0 100644
--- a/lib/ftl/upgrade/ftl_sb_upgrade.c
+++ b/lib/ftl/upgrade/ftl_sb_upgrade.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/upgrade/ftl_sb_upgrade.h b/lib/ftl/upgrade/ftl_sb_upgrade.h
index 5c92697f3..e76efc216 100644
--- a/lib/ftl/upgrade/ftl_sb_upgrade.h
+++ b/lib/ftl/upgrade/ftl_sb_upgrade.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_addr_utils.h b/lib/ftl/utils/ftl_addr_utils.h
index 7bbe18431..1fa104060 100644
--- a/lib/ftl/utils/ftl_addr_utils.h
+++ b/lib/ftl/utils/ftl_addr_utils.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_bitmap.c b/lib/ftl/utils/ftl_bitmap.c
index d52cca91d..6d57655d2 100644
--- a/lib/ftl/utils/ftl_bitmap.c
+++ b/lib/ftl/utils/ftl_bitmap.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_bitmap.h b/lib/ftl/utils/ftl_bitmap.h
index 98fe6d199..a0216a770 100644
--- a/lib/ftl/utils/ftl_bitmap.h
+++ b/lib/ftl/utils/ftl_bitmap.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_conf.c b/lib/ftl/utils/ftl_conf.c
index a3955eb5f..1d13963da 100644
--- a/lib/ftl/utils/ftl_conf.c
+++ b/lib/ftl/utils/ftl_conf.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
+
 #include "spdk/ftl.h"
 
 #include "ftl_conf.h"
diff --git a/lib/ftl/utils/ftl_conf.h b/lib/ftl/utils/ftl_conf.h
index 1933f4c59..88004b74a 100644
--- a/lib/ftl/utils/ftl_conf.h
+++ b/lib/ftl/utils/ftl_conf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_defs.h b/lib/ftl/utils/ftl_defs.h
index 97dc52d46..9232d2e32 100644
--- a/lib/ftl/utils/ftl_defs.h
+++ b/lib/ftl/utils/ftl_defs.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_df.h b/lib/ftl/utils/ftl_df.h
index 59cc95dbb..a8017407b 100644
--- a/lib/ftl/utils/ftl_df.h
+++ b/lib/ftl/utils/ftl_df.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_log.h b/lib/ftl/utils/ftl_log.h
index 65ce50dfb..403eb0f2e 100644
--- a/lib/ftl/utils/ftl_log.h
+++ b/lib/ftl/utils/ftl_log.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_md.c b/lib/ftl/utils/ftl_md.c
index 1cb44dc14..6cab12d5a 100644
--- a/lib/ftl/utils/ftl_md.c
+++ b/lib/ftl/utils/ftl_md.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_md.h b/lib/ftl/utils/ftl_md.h
index 939e3f6f8..425000a10 100644
--- a/lib/ftl/utils/ftl_md.h
+++ b/lib/ftl/utils/ftl_md.h
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
+
 #ifndef FTL_MD_H
 #define FTL_MD_H
 
diff --git a/lib/ftl/utils/ftl_mempool.c b/lib/ftl/utils/ftl_mempool.c
index 80aacb610..35b77bd1d 100644
--- a/lib/ftl/utils/ftl_mempool.c
+++ b/lib/ftl/utils/ftl_mempool.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ftl/utils/ftl_mempool.h b/lib/ftl/utils/ftl_mempool.h
index 5c665765f..2ca6b34a0 100644
--- a/lib/ftl/utils/ftl_mempool.h
+++ b/lib/ftl/utils/ftl_mempool.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/idxd/Makefile b/lib/idxd/Makefile
index 6f57c81e8..df76d936e 100644
--- a/lib/idxd/Makefile
+++ b/lib/idxd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/idxd/idxd.c b/lib/idxd/idxd.c
index b8cfc53f2..406ff3e5e 100644
--- a/lib/idxd/idxd.c
+++ b/lib/idxd/idxd.c
@@ -1,7 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
- *
  */
 
 #include "spdk/stdinc.h"
diff --git a/lib/idxd/idxd_internal.h b/lib/idxd/idxd_internal.h
index 55754b2f1..aa6bb18a6 100644
--- a/lib/idxd/idxd_internal.h
+++ b/lib/idxd/idxd_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/idxd/idxd_kernel.c b/lib/idxd/idxd_kernel.c
index 86591ecd8..3cc89ca0a 100644
--- a/lib/idxd/idxd_kernel.c
+++ b/lib/idxd/idxd_kernel.c
@@ -1,7 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
- *
  */
 
 #include "spdk/stdinc.h"
diff --git a/lib/idxd/idxd_user.c b/lib/idxd/idxd_user.c
index 6b36e3c77..18b076a6d 100644
--- a/lib/idxd/idxd_user.c
+++ b/lib/idxd/idxd_user.c
@@ -1,7 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
- *
  */
 
 #include "spdk/stdinc.h"
diff --git a/lib/init/Makefile b/lib/init/Makefile
index 66211d8b4..5266daf90 100644
--- a/lib/init/Makefile
+++ b/lib/init/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/init/json_config.c b/lib/init/json_config.c
index 60e5ea677..e9c33d45e 100644
--- a/lib/init/json_config.c
+++ b/lib/init/json_config.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/init/rpc.c b/lib/init/rpc.c
index a8fe63736..04be7c69f 100644
--- a/lib/init/rpc.c
+++ b/lib/init/rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/init/subsystem.c b/lib/init/subsystem.c
index 2d6f9e1d0..6e3b2318f 100644
--- a/lib/init/subsystem.c
+++ b/lib/init/subsystem.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/init/subsystem.h b/lib/init/subsystem.h
index 4d48a2897..fcf467842 100644
--- a/lib/init/subsystem.h
+++ b/lib/init/subsystem.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.  All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation.  All rights reserved.
  */
 
 #ifndef SPDK_SUBSYSTEM_H
diff --git a/lib/init/subsystem_rpc.c b/lib/init/subsystem_rpc.c
index b4638cb5e..a14546904 100644
--- a/lib/init/subsystem_rpc.c
+++ b/lib/init/subsystem_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile
index bbe214124..2536acce6 100644
--- a/lib/ioat/Makefile
+++ b/lib/ioat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/ioat/ioat.c b/lib/ioat/ioat.c
index 6d9687be8..479f73dd8 100644
--- a/lib/ioat/ioat.c
+++ b/lib/ioat/ioat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ioat/ioat_internal.h b/lib/ioat/ioat_internal.h
index 6db396fcd..db168aefc 100644
--- a/lib/ioat/ioat_internal.h
+++ b/lib/ioat/ioat_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile
index 11d6d7869..ac9faa06e 100644
--- a/lib/iscsi/Makefile
+++ b/lib/iscsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index 911221a3e..5a5738605 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/conn.h b/lib/iscsi/conn.h
index 851c1aca0..9e654e649 100644
--- a/lib/iscsi/conn.h
+++ b/lib/iscsi/conn.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/init_grp.c b/lib/iscsi/init_grp.c
index 86e782a56..17f4681c5 100644
--- a/lib/iscsi/init_grp.c
+++ b/lib/iscsi/init_grp.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/init_grp.h b/lib/iscsi/init_grp.h
index 75529ba25..ede52a2fa 100644
--- a/lib/iscsi/init_grp.h
+++ b/lib/iscsi/init_grp.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index 54e05620f..696b3b4bf 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 0f6b1b57e..8319acba3 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c
index 4bc0dcf9d..4d8de4953 100644
--- a/lib/iscsi/iscsi_rpc.c
+++ b/lib/iscsi/iscsi_rpc.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 70bb4aace..972869d7a 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/md5.c b/lib/iscsi/md5.c
index 239905558..2d754d474 100644
--- a/lib/iscsi/md5.c
+++ b/lib/iscsi/md5.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/md5.h b/lib/iscsi/md5.h
index a9f812bc7..9ffc3b5d7 100644
--- a/lib/iscsi/md5.h
+++ b/lib/iscsi/md5.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/param.c b/lib/iscsi/param.c
index 90952c946..7610e4587 100644
--- a/lib/iscsi/param.c
+++ b/lib/iscsi/param.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/param.h b/lib/iscsi/param.h
index 020037418..aa6656e7a 100644
--- a/lib/iscsi/param.h
+++ b/lib/iscsi/param.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c
index 58b33fb78..03e6b3e13 100644
--- a/lib/iscsi/portal_grp.c
+++ b/lib/iscsi/portal_grp.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/portal_grp.h b/lib/iscsi/portal_grp.h
index 841f1ae5a..a36df72af 100644
--- a/lib/iscsi/portal_grp.h
+++ b/lib/iscsi/portal_grp.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/task.c b/lib/iscsi/task.c
index 4f36cccbe..e33021863 100644
--- a/lib/iscsi/task.c
+++ b/lib/iscsi/task.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/task.h b/lib/iscsi/task.h
index da377caed..be9dc34d7 100644
--- a/lib/iscsi/task.h
+++ b/lib/iscsi/task.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c
index f38bcb3d4..16b7b7cff 100644
--- a/lib/iscsi/tgt_node.c
+++ b/lib/iscsi/tgt_node.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h
index b03ce621f..97650c7f6 100644
--- a/lib/iscsi/tgt_node.h
+++ b/lib/iscsi/tgt_node.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/json/Makefile b/lib/json/Makefile
index f0c746bda..30812166b 100644
--- a/lib/json/Makefile
+++ b/lib/json/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/json/json_parse.c b/lib/json/json_parse.c
index 00033005d..ba3ba2e24 100644
--- a/lib/json/json_parse.c
+++ b/lib/json/json_parse.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/json/json_util.c b/lib/json/json_util.c
index 2ca5fe14a..eb58c1d8b 100644
--- a/lib/json/json_util.c
+++ b/lib/json/json_util.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/json/json_write.c b/lib/json/json_write.c
index e8efd6318..a4fb46dc2 100644
--- a/lib/json/json_write.c
+++ b/lib/json/json_write.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile
index 9849a3a3c..f5e958585 100644
--- a/lib/jsonrpc/Makefile
+++ b/lib/jsonrpc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/jsonrpc/jsonrpc_client.c b/lib/jsonrpc/jsonrpc_client.c
index 07615613a..d9a515b65 100644
--- a/lib/jsonrpc/jsonrpc_client.c
+++ b/lib/jsonrpc/jsonrpc_client.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/jsonrpc/jsonrpc_client_tcp.c b/lib/jsonrpc/jsonrpc_client_tcp.c
index c0cb59232..447efcce0 100644
--- a/lib/jsonrpc/jsonrpc_client_tcp.c
+++ b/lib/jsonrpc/jsonrpc_client_tcp.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
+
 #include "spdk/string.h"
 #include "jsonrpc_internal.h"
 #include "spdk/util.h"
diff --git a/lib/jsonrpc/jsonrpc_internal.h b/lib/jsonrpc/jsonrpc_internal.h
index 663653214..ab2f606d5 100644
--- a/lib/jsonrpc/jsonrpc_internal.h
+++ b/lib/jsonrpc/jsonrpc_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/jsonrpc/jsonrpc_server.c b/lib/jsonrpc/jsonrpc_server.c
index 0ae0d60c1..91e4d2dfd 100644
--- a/lib/jsonrpc/jsonrpc_server.c
+++ b/lib/jsonrpc/jsonrpc_server.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/jsonrpc/jsonrpc_server_tcp.c b/lib/jsonrpc/jsonrpc_server_tcp.c
index 5e565ef7e..21dbc0e1d 100644
--- a/lib/jsonrpc/jsonrpc_server_tcp.c
+++ b/lib/jsonrpc/jsonrpc_server_tcp.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/log/Makefile b/lib/log/Makefile
index 8f2837689..66f6e0b82 100644
--- a/lib/log/Makefile
+++ b/lib/log/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/log/log.c b/lib/log/log.c
index d800b4c5b..8a2bd21da 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/log/log_flags.c b/lib/log/log_flags.c
index a0444bdea..44f6faed9 100644
--- a/lib/log/log_flags.c
+++ b/lib/log/log_flags.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile
index f667edf05..a3f9d2674 100644
--- a/lib/lvol/Makefile
+++ b/lib/lvol/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c
index 0b6d2df6a..f21995fd6 100644
--- a/lib/lvol/lvol.c
+++ b/lib/lvol/lvol.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile
index 3599cfad5..e8da680b8 100644
--- a/lib/nbd/Makefile
+++ b/lib/nbd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c
index 3b33c309c..d6eb14d07 100644
--- a/lib/nbd/nbd.c
+++ b/lib/nbd/nbd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nbd/nbd_internal.h b/lib/nbd/nbd_internal.h
index 5d45ef574..ab8f96db3 100644
--- a/lib/nbd/nbd_internal.h
+++ b/lib/nbd/nbd_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nbd/nbd_rpc.c b/lib/nbd/nbd_rpc.c
index 9ac6c364e..ece43cb6b 100644
--- a/lib/nbd/nbd_rpc.c
+++ b/lib/nbd/nbd_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/notify/Makefile b/lib/notify/Makefile
index 06371f772..26d633a39 100644
--- a/lib/notify/Makefile
+++ b/lib/notify/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/notify/notify.c b/lib/notify/notify.c
index 36649bf75..36e45029c 100644
--- a/lib/notify/notify.c
+++ b/lib/notify/notify.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/notify/notify_rpc.c b/lib/notify/notify_rpc.c
index 0d9535b30..09b3cd48d 100644
--- a/lib/notify/notify_rpc.c
+++ b/lib/notify/notify_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile
index 2de7d80ba..f73e4fbc5 100644
--- a/lib/nvme/Makefile
+++ b/lib/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/nvme/nvme.c b/lib/nvme/nvme.c
index c4e736e9b..19c6056c8 100644
--- a/lib/nvme/nvme.c
+++ b/lib/nvme/nvme.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index c02dd22a7..5ce7b1f3e 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_ctrlr_cmd.c b/lib/nvme/nvme_ctrlr_cmd.c
index 6056bc5e3..f2cad9598 100644
--- a/lib/nvme/nvme_ctrlr_cmd.c
+++ b/lib/nvme/nvme_ctrlr_cmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_ctrlr_ocssd_cmd.c b/lib/nvme/nvme_ctrlr_ocssd_cmd.c
index 429f3ca47..898b7c108 100644
--- a/lib/nvme/nvme_ctrlr_ocssd_cmd.c
+++ b/lib/nvme/nvme_ctrlr_ocssd_cmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_cuse.c b/lib/nvme/nvme_cuse.c
index 9aac6634e..ec5d79d02 100644
--- a/lib/nvme/nvme_cuse.c
+++ b/lib/nvme/nvme_cuse.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_cuse.h b/lib/nvme/nvme_cuse.h
index 4e6aa57a9..2eb13c697 100644
--- a/lib/nvme/nvme_cuse.h
+++ b/lib/nvme/nvme_cuse.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_discovery.c b/lib/nvme/nvme_discovery.c
index ee11ea918..52926d2fc 100644
--- a/lib/nvme/nvme_discovery.c
+++ b/lib/nvme/nvme_discovery.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 #include "nvme_internal.h"
diff --git a/lib/nvme/nvme_fabric.c b/lib/nvme/nvme_fabric.c
index e88757098..c43ccad6d 100644
--- a/lib/nvme/nvme_fabric.c
+++ b/lib/nvme/nvme_fabric.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h
index 95861c5f7..e1f3a13a9 100644
--- a/lib/nvme/nvme_internal.h
+++ b/lib/nvme/nvme_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_io_msg.c b/lib/nvme/nvme_io_msg.c
index 7a0782ab7..40783910e 100644
--- a/lib/nvme/nvme_io_msg.c
+++ b/lib/nvme/nvme_io_msg.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_io_msg.h b/lib/nvme/nvme_io_msg.h
index 924addf70..1c6c1d4d3 100644
--- a/lib/nvme/nvme_io_msg.h
+++ b/lib/nvme/nvme_io_msg.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_ns.c b/lib/nvme/nvme_ns.c
index 36d979f42..6fe3e6793 100644
--- a/lib/nvme/nvme_ns.c
+++ b/lib/nvme/nvme_ns.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_ns_cmd.c b/lib/nvme/nvme_ns_cmd.c
index 6337e220d..3416d738b 100644
--- a/lib/nvme/nvme_ns_cmd.c
+++ b/lib/nvme/nvme_ns_cmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
diff --git a/lib/nvme/nvme_ns_ocssd_cmd.c b/lib/nvme/nvme_ns_ocssd_cmd.c
index 90df46577..663db872a 100644
--- a/lib/nvme/nvme_ns_ocssd_cmd.c
+++ b/lib/nvme/nvme_ns_ocssd_cmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c
index a590ef5c7..a11d9231f 100644
--- a/lib/nvme/nvme_opal.c
+++ b/lib/nvme/nvme_opal.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
+
 #include "spdk/opal.h"
 #include "spdk/log.h"
 #include "spdk/util.h"
diff --git a/lib/nvme/nvme_opal_internal.h b/lib/nvme/nvme_opal_internal.h
index 00d9f2d3a..af1bdd810 100644
--- a/lib/nvme/nvme_opal_internal.h
+++ b/lib/nvme/nvme_opal_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index a55c254b9..f25012a8c 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2017, IBM Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  */
diff --git a/lib/nvme/nvme_pcie_common.c b/lib/nvme/nvme_pcie_common.c
index 65d59eb70..6ff59193b 100644
--- a/lib/nvme/nvme_pcie_common.c
+++ b/lib/nvme/nvme_pcie_common.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_pcie_internal.h b/lib/nvme/nvme_pcie_internal.h
index f3f81083f..4e08861e9 100644
--- a/lib/nvme/nvme_pcie_internal.h
+++ b/lib/nvme/nvme_pcie_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_poll_group.c b/lib/nvme/nvme_poll_group.c
index b62ec0232..6bc53dade 100644
--- a/lib/nvme/nvme_poll_group.c
+++ b/lib/nvme/nvme_poll_group.c
@@ -1,10 +1,9 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
-
 #include "nvme_internal.h"
 
 struct spdk_nvme_poll_group *
diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c
index 3eb1e805a..de94a3c08 100644
--- a/lib/nvme/nvme_qpair.c
+++ b/lib/nvme/nvme_qpair.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_quirks.c b/lib/nvme/nvme_quirks.c
index f72b0f6e7..a1909c066 100644
--- a/lib/nvme/nvme_quirks.c
+++ b/lib/nvme/nvme_quirks.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c
index 968401d39..024bc5c4c 100644
--- a/lib/nvme/nvme_rdma.c
+++ b/lib/nvme/nvme_rdma.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c
index edc973b63..9437b7034 100644
--- a/lib/nvme/nvme_tcp.c
+++ b/lib/nvme/nvme_tcp.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c
index 4ecbc68d7..9300c3614 100644
--- a/lib/nvme/nvme_transport.c
+++ b/lib/nvme/nvme_transport.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
diff --git a/lib/nvme/nvme_vfio_user.c b/lib/nvme/nvme_vfio_user.c
index 3f434b06f..5b3ea971d 100644
--- a/lib/nvme/nvme_vfio_user.c
+++ b/lib/nvme/nvme_vfio_user.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  */
 
 /* VFIO transport extensions for spdk_nvme_ctrlr */
diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
index a7693cbf7..b366e3289 100644
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 19d018346..a745cf84e 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019, 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c
index 0474d579f..dbfe019ea 100644
--- a/lib/nvmf/ctrlr_bdev.c
+++ b/lib/nvmf/ctrlr_bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c
index a11949621..2f11f0877 100644
--- a/lib/nvmf/ctrlr_discovery.c
+++ b/lib/nvmf/ctrlr_discovery.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c
index b86714b6f..e8c1fd77f 100644
--- a/lib/nvmf/fc.c
+++ b/lib/nvmf/fc.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2019 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c
index 79827bf21..c2d7b32a8 100644
--- a/lib/nvmf/fc_ls.c
+++ b/lib/nvmf/fc_ls.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  */
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 469221954..dc00ddca9 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018-2019, 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h
index bcafb4aed..d2881d8ba 100644
--- a/lib/nvmf/nvmf_fc.h
+++ b/lib/nvmf/nvmf_fc.h
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2018 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  */
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 4344781bd..1a10fb318 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c
index b8ec4b61c..ce7b299bf 100644
--- a/lib/nvmf/nvmf_rpc.c
+++ b/lib/nvmf/nvmf_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 7b0a876f6..b035ada29 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index c4fa1461c..82a83ac6a 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c
index caab06af8..1c52304c1 100644
--- a/lib/nvmf/tcp.c
+++ b/lib/nvmf/tcp.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019, 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c
index 50e4c84b9..682819794 100644
--- a/lib/nvmf/transport.c
+++ b/lib/nvmf/transport.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018-2019, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvmf/transport.h b/lib/nvmf/transport.h
index ee155c2c6..1e4907368 100644
--- a/lib/nvmf/transport.h
+++ b/lib/nvmf/transport.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c
index 8d8f600f6..7c3fd44c5 100644
--- a/lib/nvmf/vfio_user.c
+++ b/lib/nvmf/vfio_user.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2019-2022, Nutanix Inc. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/rdma/Makefile b/lib/rdma/Makefile
index f414a9610..e3fde94e1 100644
--- a/lib/rdma/Makefile
+++ b/lib/rdma/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation. All rights reserved.
+#  Copyright (C) 2020 Intel Corporation. All rights reserved.
 #  Copyright (c) Mellanox Technologies LTD. All rights reserved.
 #
 
diff --git a/lib/rdma/common.c b/lib/rdma/common.c
index ff8a63dc1..05e885af9 100644
--- a/lib/rdma/common.c
+++ b/lib/rdma/common.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/rdma/rdma_mlx5_dv.c b/lib/rdma/rdma_mlx5_dv.c
index 6d1331914..1d2b51415 100644
--- a/lib/rdma/rdma_mlx5_dv.c
+++ b/lib/rdma/rdma_mlx5_dv.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/rdma/rdma_verbs.c b/lib/rdma/rdma_verbs.c
index b418b46ef..41e66c1d9 100644
--- a/lib/rdma/rdma_verbs.c
+++ b/lib/rdma/rdma_verbs.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  *   Copyright (c) Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile
index 5c161076e..78da0ea87 100644
--- a/lib/reduce/Makefile
+++ b/lib/reduce/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/reduce/reduce.c b/lib/reduce/reduce.c
index 47ca156d3..e2ac29cd1 100644
--- a/lib/reduce/reduce.c
+++ b/lib/reduce/reduce.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc
index 45eba3283..088e5c1ab 100644
--- a/lib/rocksdb/env_spdk.cc
+++ b/lib/rocksdb/env_spdk.cc
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk
index 053aab321..9680fbff0 100644
--- a/lib/rocksdb/spdk.rocksdb.mk
+++ b/lib/rocksdb/spdk.rocksdb.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile
index a3c64bb89..3cfa54f56 100644
--- a/lib/rpc/Makefile
+++ b/lib/rpc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #  Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c
index c19da685f..08911ead2 100644
--- a/lib/rpc/rpc.c
+++ b/lib/rpc/rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile
index 75df40421..8ad918e74 100644
--- a/lib/scsi/Makefile
+++ b/lib/scsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/scsi/dev.c b/lib/scsi/dev.c
index 69abaa6fa..d3fb3e639 100644
--- a/lib/scsi/dev.c
+++ b/lib/scsi/dev.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/lun.c b/lib/scsi/lun.c
index fc493658f..a10618289 100644
--- a/lib/scsi/lun.c
+++ b/lib/scsi/lun.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/port.c b/lib/scsi/port.c
index 847592cca..78c1ba1aa 100644
--- a/lib/scsi/port.c
+++ b/lib/scsi/port.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/scsi.c b/lib/scsi/scsi.c
index 1e60e5b69..4f411feab 100644
--- a/lib/scsi/scsi.c
+++ b/lib/scsi/scsi.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c
index 66b57a081..608eae416 100644
--- a/lib/scsi/scsi_bdev.c
+++ b/lib/scsi/scsi_bdev.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/scsi_internal.h b/lib/scsi/scsi_internal.h
index 9cc86ee53..0da0d59f7 100644
--- a/lib/scsi/scsi_internal.h
+++ b/lib/scsi/scsi_internal.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/scsi_pr.c b/lib/scsi/scsi_pr.c
index d6cf167b3..647a816c7 100644
--- a/lib/scsi/scsi_pr.c
+++ b/lib/scsi/scsi_pr.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/scsi_rpc.c b/lib/scsi/scsi_rpc.c
index bb8ca7b79..165b157f1 100644
--- a/lib/scsi/scsi_rpc.c
+++ b/lib/scsi/scsi_rpc.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/scsi/task.c b/lib/scsi/task.c
index 3bcd920c2..1f205af0a 100644
--- a/lib/scsi/task.c
+++ b/lib/scsi/task.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/sock/Makefile b/lib/sock/Makefile
index b938ad435..184b3faa8 100644
--- a/lib/sock/Makefile
+++ b/lib/sock/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  Copyright (c) 2020 Mellanox Technologies LTD
 #  All rights reserved.
 #
diff --git a/lib/sock/sock.c b/lib/sock/sock.c
index 6c3065f5d..b85fef33c 100644
--- a/lib/sock/sock.c
+++ b/lib/sock/sock.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/sock/sock_rpc.c b/lib/sock/sock_rpc.c
index a182074d8..7910b11df 100644
--- a/lib/sock/sock_rpc.c
+++ b/lib/sock/sock_rpc.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/lib/thread/Makefile b/lib/thread/Makefile
index b8f7c22a7..13b06c35f 100644
--- a/lib/thread/Makefile
+++ b/lib/thread/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/thread/thread.c b/lib/thread/thread.c
index 94c695623..fccf5f14d 100644
--- a/lib/thread/thread.c
+++ b/lib/thread/thread.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/thread/thread_internal.h b/lib/thread/thread_internal.h
index a0addc929..ad5f2c166 100644
--- a/lib/thread/thread_internal.h
+++ b/lib/thread/thread_internal.h
@@ -1,5 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
  */
 
 #ifndef SPDK_THREAD_INTERNAL_H_
diff --git a/lib/trace/Makefile b/lib/trace/Makefile
index 37e364eda..4b21801ff 100644
--- a/lib/trace/Makefile
+++ b/lib/trace/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/trace/trace.c b/lib/trace/trace.c
index 52b54de9d..c7123b827 100644
--- a/lib/trace/trace.c
+++ b/lib/trace/trace.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/trace/trace_flags.c b/lib/trace/trace_flags.c
index 953a7f442..911b828ee 100644
--- a/lib/trace/trace_flags.c
+++ b/lib/trace/trace_flags.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/trace/trace_rpc.c b/lib/trace/trace_rpc.c
index 0d7365bbf..51a53377b 100644
--- a/lib/trace/trace_rpc.c
+++ b/lib/trace/trace_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/trace_parser/Makefile b/lib/trace_parser/Makefile
index d3e3aefd1..e1c14b90b 100644
--- a/lib/trace_parser/Makefile
+++ b/lib/trace_parser/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/trace_parser/trace.cpp b/lib/trace_parser/trace.cpp
index 593004cb3..f47feb23e 100644
--- a/lib/trace_parser/trace.cpp
+++ b/lib/trace_parser/trace.cpp
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile
index fba882b17..b88a42fe3 100644
--- a/lib/ut_mock/Makefile
+++ b/lib/ut_mock/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/ut_mock/mock.c b/lib/ut_mock/mock.c
index 2a5cbb7e3..499b16f19 100644
--- a/lib/ut_mock/mock.c
+++ b/lib/ut_mock/mock.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/Makefile b/lib/util/Makefile
index fe30f7219..fc9adb7d4 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/util/base64.c b/lib/util/base64.c
index acde0bd59..e498a404f 100644
--- a/lib/util/base64.c
+++ b/lib/util/base64.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright(c) ARM Limited. 2021 All rights reserved.
  *   All rights reserved.
  */
diff --git a/lib/util/base64_neon.c b/lib/util/base64_neon.c
index 40715b3ac..3ec3235fa 100644
--- a/lib/util/base64_neon.c
+++ b/lib/util/base64_neon.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-2-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2005-2007, Nick Galbreath
  *   Copyright (c) 2013-2017, Alfred Klomp
  *   Copyright (c) 2015-2017, Wojciech Mula
diff --git a/lib/util/base64_sve.c b/lib/util/base64_sve.c
index 659387660..7f1d97b9f 100644
--- a/lib/util/base64_sve.c
+++ b/lib/util/base64_sve.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2022 Intel Corporation.
  *   Copyright(c) ARM Limited. 2021 All rights reserved.
  */
 
diff --git a/lib/util/bit_array.c b/lib/util/bit_array.c
index 65330ad4d..ec182492f 100644
--- a/lib/util/bit_array.c
+++ b/lib/util/bit_array.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/cpuset.c b/lib/util/cpuset.c
index 3cc1f66bb..0fdd6f549 100644
--- a/lib/util/cpuset.c
+++ b/lib/util/cpuset.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/util/crc16.c b/lib/util/crc16.c
index 1860b6eae..f085a2851 100644
--- a/lib/util/crc16.c
+++ b/lib/util/crc16.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/crc32.c b/lib/util/crc32.c
index b6e1c9970..d9e2c5c30 100644
--- a/lib/util/crc32.c
+++ b/lib/util/crc32.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/crc32_ieee.c b/lib/util/crc32_ieee.c
index ce9c12e15..4942f0ce8 100644
--- a/lib/util/crc32_ieee.c
+++ b/lib/util/crc32_ieee.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/crc32c.c b/lib/util/crc32c.c
index 241473863..69e99be53 100644
--- a/lib/util/crc32c.c
+++ b/lib/util/crc32c.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/dif.c b/lib/util/dif.c
index 4771726d6..a2efdffa4 100644
--- a/lib/util/dif.c
+++ b/lib/util/dif.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/fd.c b/lib/util/fd.c
index a19e0789c..184e1a8bd 100644
--- a/lib/util/fd.c
+++ b/lib/util/fd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/fd_group.c b/lib/util/fd_group.c
index d2c36ed0a..749c55b01 100644
--- a/lib/util/fd_group.c
+++ b/lib/util/fd_group.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/util/file.c b/lib/util/file.c
index d677a9fa9..1acb006a9 100644
--- a/lib/util/file.c
+++ b/lib/util/file.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/hexlify.c b/lib/util/hexlify.c
index 67dd9434f..07467fdb5 100644
--- a/lib/util/hexlify.c
+++ b/lib/util/hexlify.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/iov.c b/lib/util/iov.c
index 3bc4c4cd8..4f693cb46 100644
--- a/lib/util/iov.c
+++ b/lib/util/iov.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/math.c b/lib/util/math.c
index 09924e63b..f2f77f7d2 100644
--- a/lib/util/math.c
+++ b/lib/util/math.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/util/pipe.c b/lib/util/pipe.c
index f2147d27b..87a8db642 100644
--- a/lib/util/pipe.c
+++ b/lib/util/pipe.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/strerror_tls.c b/lib/util/strerror_tls.c
index 501ab67d1..c9bf7e2e1 100644
--- a/lib/util/strerror_tls.c
+++ b/lib/util/strerror_tls.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/string.c b/lib/util/string.c
index a25349b2f..80df11cf4 100644
--- a/lib/util/string.c
+++ b/lib/util/string.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/util_internal.h b/lib/util/util_internal.h
index 387cb518b..474e1b602 100644
--- a/lib/util/util_internal.h
+++ b/lib/util/util_internal.h
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *   Copyright (C) 2008-2012 Daisuke Aoyama <aoyama@peach.ne.jp>.
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/uuid.c b/lib/util/uuid.c
index f569b70fb..03085ed46 100644
--- a/lib/util/uuid.c
+++ b/lib/util/uuid.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/xor.c b/lib/util/xor.c
index d5ec7795a..cb043234d 100644
--- a/lib/util/xor.c
+++ b/lib/util/xor.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/util/zipf.c b/lib/util/zipf.c
index 49a9b8854..fc608c38d 100644
--- a/lib/util/zipf.c
+++ b/lib/util/zipf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/vfio_user/Makefile b/lib/vfio_user/Makefile
index 66f9cb776..ee5e711fb 100644
--- a/lib/vfio_user/Makefile
+++ b/lib/vfio_user/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/vfio_user/host/Makefile b/lib/vfio_user/host/Makefile
index 8049c7e0f..abf6614d1 100644
--- a/lib/vfio_user/host/Makefile
+++ b/lib/vfio_user/host/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/vfio_user/host/vfio_user.c b/lib/vfio_user/host/vfio_user.c
index fb6d9d662..7f6bbdce8 100644
--- a/lib/vfio_user/host/vfio_user.c
+++ b/lib/vfio_user/host/vfio_user.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vfio_user/host/vfio_user_internal.h b/lib/vfio_user/host/vfio_user_internal.h
index fec747ae7..f99892370 100644
--- a/lib/vfio_user/host/vfio_user_internal.h
+++ b/lib/vfio_user/host/vfio_user_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2020 Intel Corporation. All rights reserved.
  */
 
 #ifndef _VFIO_INTERNAL_H
diff --git a/lib/vfio_user/host/vfio_user_pci.c b/lib/vfio_user/host/vfio_user_pci.c
index 010b2924a..f41e6232a 100644
--- a/lib/vfio_user/host/vfio_user_pci.c
+++ b/lib/vfio_user/host/vfio_user_pci.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vfu_tgt/Makefile b/lib/vfu_tgt/Makefile
index 95b6d07c6..c4020cff2 100644
--- a/lib/vfu_tgt/Makefile
+++ b/lib/vfu_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/vfu_tgt/tgt_endpoint.c b/lib/vfu_tgt/tgt_endpoint.c
index f6b8bc2df..3d8cb8b7f 100644
--- a/lib/vfu_tgt/tgt_endpoint.c
+++ b/lib/vfu_tgt/tgt_endpoint.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vfu_tgt/tgt_internal.h b/lib/vfu_tgt/tgt_internal.h
index f5a8b13c6..0fa277001 100644
--- a/lib/vfu_tgt/tgt_internal.h
+++ b/lib/vfu_tgt/tgt_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vfu_tgt/tgt_rpc.c b/lib/vfu_tgt/tgt_rpc.c
index ce4a8f714..73a8fdd82 100644
--- a/lib/vfu_tgt/tgt_rpc.c
+++ b/lib/vfu_tgt/tgt_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile
index b8cb820dd..912ac7dbb 100644
--- a/lib/vhost/Makefile
+++ b/lib/vhost/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/vhost/rte_vhost_user.c b/lib/vhost/rte_vhost_user.c
index 682fa3f52..f6413a06c 100644
--- a/lib/vhost/rte_vhost_user.c
+++ b/lib/vhost/rte_vhost_user.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index b18fe07f9..8b64e10d5 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c
index d32b42265..d5ec677b1 100644
--- a/lib/vhost/vhost_blk.c
+++ b/lib/vhost/vhost_blk.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/vhost/vhost_internal.h b/lib/vhost/vhost_internal.h
index 149a84d1a..bc9a56538 100644
--- a/lib/vhost/vhost_internal.h
+++ b/lib/vhost/vhost_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c
index e7b7719b9..ddad76f3e 100644
--- a/lib/vhost/vhost_rpc.c
+++ b/lib/vhost/vhost_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c
index b3082a672..fa4e46a6e 100644
--- a/lib/vhost/vhost_scsi.c
+++ b/lib/vhost/vhost_scsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile
index 1b5649f0d..d154a0302 100644
--- a/lib/virtio/Makefile
+++ b/lib/virtio/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/virtio/virtio.c b/lib/virtio/virtio.c
index 5d34b6bdb..901ee62da 100644
--- a/lib/virtio/virtio.c
+++ b/lib/virtio/virtio.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ *   Copyright (C) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/virtio/virtio_pci.c b/lib/virtio/virtio_pci.c
index b1bc1b409..cbe609832 100644
--- a/lib/virtio/virtio_pci.c
+++ b/lib/virtio/virtio_pci.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright (C) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/virtio/virtio_vfio_user.c b/lib/virtio/virtio_vfio_user.c
index 9181137f5..28cb45666 100644
--- a/lib/virtio/virtio_vfio_user.c
+++ b/lib/virtio/virtio_vfio_user.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2022 Intel Corporation. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/lib/virtio/virtio_vhost_user.c b/lib/virtio/virtio_vhost_user.c
index 23149452f..8bd777bfe 100644
--- a/lib/virtio/virtio_vhost_user.c
+++ b/lib/virtio/virtio_vhost_user.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ *   Copyright (C) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  */
 
diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile
index bb38c508d..01f3fc8d5 100644
--- a/lib/vmd/Makefile
+++ b/lib/vmd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/lib/vmd/led.c b/lib/vmd/led.c
index cb920c9b8..c47988faf 100644
--- a/lib/vmd/led.c
+++ b/lib/vmd/led.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vmd/vmd.c b/lib/vmd/vmd.c
index f3181454c..6590d8f2d 100644
--- a/lib/vmd/vmd.c
+++ b/lib/vmd/vmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vmd/vmd_internal.h b/lib/vmd/vmd_internal.h
index e932d10a3..7703de460 100644
--- a/lib/vmd/vmd_internal.h
+++ b/lib/vmd/vmd_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/lib/vmd/vmd_spec.h b/lib/vmd/vmd_spec.h
index e564dd4a3..b36f51e48 100644
--- a/lib/vmd/vmd_spec.h
+++ b/lib/vmd/vmd_spec.h
@@ -1,9 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
-
 #ifndef VMD_SPEC_H
 #define VMD_SPEC_H
 
diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk
index b162a84ad..02a1b056f 100644
--- a/mk/nvme.libtest.mk
+++ b/mk/nvme.libtest.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk
index 424fac1ab..0a83e1d82 100644
--- a/mk/spdk.app.mk
+++ b/mk/spdk.app.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.app_cxx.mk b/mk/spdk.app_cxx.mk
index 9b244ec1d..b63a769cd 100644
--- a/mk/spdk.app_cxx.mk
+++ b/mk/spdk.app_cxx.mk
@@ -1,7 +1,8 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
+
 include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
 
 # Applications in app/ go into build/bin/.
diff --git a/mk/spdk.app_vars.mk b/mk/spdk.app_vars.mk
index c7b41e607..a4c2c4bf1 100644
--- a/mk/spdk.app_vars.mk
+++ b/mk/spdk.app_vars.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index b84ac222f..1a5608658 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  Copyright (c) 2017, IBM Corporation.
 #  Copyright (c) 2019, 2021 Mellanox Corporation.
 #  All rights reserved.
diff --git a/mk/spdk.deps.mk b/mk/spdk.deps.mk
index f3952a270..cb1233785 100644
--- a/mk/spdk.deps.mk
+++ b/mk/spdk.deps.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.fio.mk b/mk/spdk.fio.mk
index f1a738407..a328a816f 100644
--- a/mk/spdk.fio.mk
+++ b/mk/spdk.fio.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk
index 33790b9c4..06f8f8c67 100644
--- a/mk/spdk.lib.mk
+++ b/mk/spdk.lib.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.lib_deps.mk b/mk/spdk.lib_deps.mk
index 275765aa1..93ff8506b 100644
--- a/mk/spdk.lib_deps.mk
+++ b/mk/spdk.lib_deps.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.mock.unittest.mk b/mk/spdk.mock.unittest.mk
index 4bf9db589..514b1dd3c 100644
--- a/mk/spdk.mock.unittest.mk
+++ b/mk/spdk.mock.unittest.mk
@@ -1,7 +1,8 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
+
 SPDK_MOCK_SYSCALLS += \
 	calloc \
 	pthread_mutexattr_init \
diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk
index 01f8f5cd4..c6ed25ab3 100644
--- a/mk/spdk.modules.mk
+++ b/mk/spdk.modules.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #  Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
diff --git a/mk/spdk.nvmecli.mk b/mk/spdk.nvmecli.mk
index ebae61b2f..a2ddf3813 100644
--- a/mk/spdk.nvmecli.mk
+++ b/mk/spdk.nvmecli.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.subdirs.mk b/mk/spdk.subdirs.mk
index 7c67b5b29..5b089910b 100644
--- a/mk/spdk.subdirs.mk
+++ b/mk/spdk.subdirs.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk
index dbd051360..2b98f3793 100644
--- a/mk/spdk.unittest.mk
+++ b/mk/spdk.unittest.mk
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/Makefile b/module/Makefile
index 9b2191b67..741fabf14 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/accel/Makefile b/module/accel/Makefile
index 14056b7c9..56ea19d4a 100644
--- a/module/accel/Makefile
+++ b/module/accel/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/accel/dsa/Makefile b/module/accel/dsa/Makefile
index 0ba0fb28a..25f98572c 100644
--- a/module/accel/dsa/Makefile
+++ b/module/accel/dsa/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/accel/dsa/accel_dsa.c b/module/accel/dsa/accel_dsa.c
index db99a94ab..b98c6e402 100644
--- a/module/accel/dsa/accel_dsa.c
+++ b/module/accel/dsa/accel_dsa.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/dsa/accel_dsa.h b/module/accel/dsa/accel_dsa.h
index c528fdb22..dbfefb585 100644
--- a/module/accel/dsa/accel_dsa.h
+++ b/module/accel/dsa/accel_dsa.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/dsa/accel_dsa_rpc.c b/module/accel/dsa/accel_dsa_rpc.c
index 7b8430f76..14be75f0c 100644
--- a/module/accel/dsa/accel_dsa_rpc.c
+++ b/module/accel/dsa/accel_dsa_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/iaa/Makefile b/module/accel/iaa/Makefile
index 8a4e0d866..89a2a9d52 100644
--- a/module/accel/iaa/Makefile
+++ b/module/accel/iaa/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/accel/iaa/accel_iaa.c b/module/accel/iaa/accel_iaa.c
index ad26bb1d7..1aabac22c 100644
--- a/module/accel/iaa/accel_iaa.c
+++ b/module/accel/iaa/accel_iaa.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/iaa/accel_iaa.h b/module/accel/iaa/accel_iaa.h
index 74facd55e..940b314b9 100644
--- a/module/accel/iaa/accel_iaa.h
+++ b/module/accel/iaa/accel_iaa.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/iaa/accel_iaa_rpc.c b/module/accel/iaa/accel_iaa_rpc.c
index 934668ad7..3801b8e42 100644
--- a/module/accel/iaa/accel_iaa_rpc.c
+++ b/module/accel/iaa/accel_iaa_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile
index c1b9c4042..dd6f3f98e 100644
--- a/module/accel/ioat/Makefile
+++ b/module/accel/ioat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/accel/ioat/accel_ioat.c b/module/accel/ioat/accel_ioat.c
index e245f91e8..6fc2dd27a 100644
--- a/module/accel/ioat/accel_ioat.c
+++ b/module/accel/ioat/accel_ioat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/ioat/accel_ioat.h b/module/accel/ioat/accel_ioat.h
index e485dac20..9cc41c0cc 100644
--- a/module/accel/ioat/accel_ioat.h
+++ b/module/accel/ioat/accel_ioat.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/accel/ioat/accel_ioat_rpc.c b/module/accel/ioat/accel_ioat_rpc.c
index 4b5e5db43..020e5b29c 100644
--- a/module/accel/ioat/accel_ioat_rpc.c
+++ b/module/accel/ioat/accel_ioat_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/Makefile b/module/bdev/Makefile
index 338bb0314..ed3a91dde 100644
--- a/module/bdev/Makefile
+++ b/module/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2019 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile
index f17dc8652..25d93d345 100644
--- a/module/bdev/aio/Makefile
+++ b/module/bdev/aio/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c
index 382623460..62f477921 100644
--- a/module/bdev/aio/bdev_aio.c
+++ b/module/bdev/aio/bdev_aio.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/aio/bdev_aio.h b/module/bdev/aio/bdev_aio.h
index 232ffc150..133dfb577 100644
--- a/module/bdev/aio/bdev_aio.h
+++ b/module/bdev/aio/bdev_aio.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/aio/bdev_aio_rpc.c b/module/bdev/aio/bdev_aio_rpc.c
index 2af791768..e64ea7d6b 100644
--- a/module/bdev/aio/bdev_aio_rpc.c
+++ b/module/bdev/aio/bdev_aio_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile
index 5abe313f5..f611231e5 100644
--- a/module/bdev/compress/Makefile
+++ b/module/bdev/compress/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c
index 2e72ef8a8..f7448bd6e 100644
--- a/module/bdev/compress/vbdev_compress.c
+++ b/module/bdev/compress/vbdev_compress.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/compress/vbdev_compress.h b/module/bdev/compress/vbdev_compress.h
index f2d188612..193ec3152 100644
--- a/module/bdev/compress/vbdev_compress.h
+++ b/module/bdev/compress/vbdev_compress.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/compress/vbdev_compress_rpc.c b/module/bdev/compress/vbdev_compress_rpc.c
index 53966fd8d..08a29a77c 100644
--- a/module/bdev/compress/vbdev_compress_rpc.c
+++ b/module/bdev/compress/vbdev_compress_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile
index 0d5145ca8..92b12b5ae 100644
--- a/module/bdev/crypto/Makefile
+++ b/module/bdev/crypto/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/crypto/vbdev_crypto.c b/module/bdev/crypto/vbdev_crypto.c
index fa5b1b0ae..11b615eee 100644
--- a/module/bdev/crypto/vbdev_crypto.c
+++ b/module/bdev/crypto/vbdev_crypto.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
diff --git a/module/bdev/crypto/vbdev_crypto.h b/module/bdev/crypto/vbdev_crypto.h
index 1602a5871..810181bfa 100644
--- a/module/bdev/crypto/vbdev_crypto.h
+++ b/module/bdev/crypto/vbdev_crypto.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
diff --git a/module/bdev/crypto/vbdev_crypto_rpc.c b/module/bdev/crypto/vbdev_crypto_rpc.c
index e4427f557..8a88f090c 100644
--- a/module/bdev/crypto/vbdev_crypto_rpc.c
+++ b/module/bdev/crypto/vbdev_crypto_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
diff --git a/module/bdev/daos/Makefile b/module/bdev/daos/Makefile
index 09478bc1a..1f02d3e85 100644
--- a/module/bdev/daos/Makefile
+++ b/module/bdev/daos/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) Intel Corporation.
-# All rights reserved.
 # Copyright (c) croit GmbH.
 # All rights reserved.
 
diff --git a/module/bdev/daos/bdev_daos.c b/module/bdev/daos/bdev_daos.c
index 477b9c363..f4a91b7d7 100644
--- a/module/bdev/daos/bdev_daos.c
+++ b/module/bdev/daos/bdev_daos.c
@@ -1,6 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
  *   Copyright (c) croit GmbH.
  *   All rights reserved.
  */
diff --git a/module/bdev/daos/bdev_daos.h b/module/bdev/daos/bdev_daos.h
index cb9985dea..2fd8d813f 100644
--- a/module/bdev/daos/bdev_daos.h
+++ b/module/bdev/daos/bdev_daos.h
@@ -1,6 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
  *   Copyright (c) croit GmbH.
  *   All rights reserved.
  */
diff --git a/module/bdev/daos/bdev_daos_rpc.c b/module/bdev/daos/bdev_daos_rpc.c
index 58c6499fe..50b639dd1 100644
--- a/module/bdev/daos/bdev_daos_rpc.c
+++ b/module/bdev/daos/bdev_daos_rpc.c
@@ -1,6 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
  *   Copyright (c) croit GmbH.
  *   All rights reserved.
  */
diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile
index bd46d1ed6..d52ded667 100644
--- a/module/bdev/delay/Makefile
+++ b/module/bdev/delay/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c
index 324ec99e2..0e9005f6a 100644
--- a/module/bdev/delay/vbdev_delay.c
+++ b/module/bdev/delay/vbdev_delay.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/delay/vbdev_delay.h b/module/bdev/delay/vbdev_delay.h
index 183e10715..c3371d5f2 100644
--- a/module/bdev/delay/vbdev_delay.h
+++ b/module/bdev/delay/vbdev_delay.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/delay/vbdev_delay_rpc.c b/module/bdev/delay/vbdev_delay_rpc.c
index aef94a2d7..ecaa0aeda 100644
--- a/module/bdev/delay/vbdev_delay_rpc.c
+++ b/module/bdev/delay/vbdev_delay_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile
index 27788529b..f277de403 100644
--- a/module/bdev/error/Makefile
+++ b/module/bdev/error/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/error/vbdev_error.c b/module/bdev/error/vbdev_error.c
index e19fe830d..a3dee0525 100644
--- a/module/bdev/error/vbdev_error.c
+++ b/module/bdev/error/vbdev_error.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/error/vbdev_error.h b/module/bdev/error/vbdev_error.h
index 5d2d0649f..943a207af 100644
--- a/module/bdev/error/vbdev_error.h
+++ b/module/bdev/error/vbdev_error.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/error/vbdev_error_rpc.c b/module/bdev/error/vbdev_error_rpc.c
index 9aea8fb3e..add4c40d2 100644
--- a/module/bdev/error/vbdev_error_rpc.c
+++ b/module/bdev/error/vbdev_error_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile
index 3b53425b4..a3a3722e7 100644
--- a/module/bdev/ftl/Makefile
+++ b/module/bdev/ftl/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/ftl/bdev_ftl.c b/module/bdev/ftl/bdev_ftl.c
index e5beb373a..f12198e14 100644
--- a/module/bdev/ftl/bdev_ftl.c
+++ b/module/bdev/ftl/bdev_ftl.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ftl/bdev_ftl.h b/module/bdev/ftl/bdev_ftl.h
index 5f348881b..7b19a0c6c 100644
--- a/module/bdev/ftl/bdev_ftl.h
+++ b/module/bdev/ftl/bdev_ftl.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ftl/bdev_ftl_rpc.c b/module/bdev/ftl/bdev_ftl_rpc.c
index f8916d070..b9db0df00 100644
--- a/module/bdev/ftl/bdev_ftl_rpc.c
+++ b/module/bdev/ftl/bdev_ftl_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile
index d3fb7c5bd..c2a60b712 100644
--- a/module/bdev/gpt/Makefile
+++ b/module/bdev/gpt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/gpt/gpt.c b/module/bdev/gpt/gpt.c
index df4157ba8..ee61fd1eb 100644
--- a/module/bdev/gpt/gpt.c
+++ b/module/bdev/gpt/gpt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/gpt/gpt.h b/module/bdev/gpt/gpt.h
index fe6cc0add..06f5f8223 100644
--- a/module/bdev/gpt/gpt.h
+++ b/module/bdev/gpt/gpt.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/gpt/vbdev_gpt.c b/module/bdev/gpt/vbdev_gpt.c
index b93da2893..15cec1b1e 100644
--- a/module/bdev/gpt/vbdev_gpt.c
+++ b/module/bdev/gpt/vbdev_gpt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile
index fe1218625..42fcaec16 100644
--- a/module/bdev/iscsi/Makefile
+++ b/module/bdev/iscsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/iscsi/bdev_iscsi.c b/module/bdev/iscsi/bdev_iscsi.c
index f5a150757..af87539aa 100644
--- a/module/bdev/iscsi/bdev_iscsi.c
+++ b/module/bdev/iscsi/bdev_iscsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/iscsi/bdev_iscsi.h b/module/bdev/iscsi/bdev_iscsi.h
index e31ec191c..4f594b02c 100644
--- a/module/bdev/iscsi/bdev_iscsi.h
+++ b/module/bdev/iscsi/bdev_iscsi.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/iscsi/bdev_iscsi_rpc.c b/module/bdev/iscsi/bdev_iscsi_rpc.c
index 0d5195e39..c2a79ad74 100644
--- a/module/bdev/iscsi/bdev_iscsi_rpc.c
+++ b/module/bdev/iscsi/bdev_iscsi_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile
index 554a341aa..824cd0150 100644
--- a/module/bdev/lvol/Makefile
+++ b/module/bdev/lvol/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c
index 1ce041436..545f00218 100644
--- a/module/bdev/lvol/vbdev_lvol.c
+++ b/module/bdev/lvol/vbdev_lvol.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/lvol/vbdev_lvol.h b/module/bdev/lvol/vbdev_lvol.h
index a4f35dbd4..763ac67fc 100644
--- a/module/bdev/lvol/vbdev_lvol.h
+++ b/module/bdev/lvol/vbdev_lvol.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c
index 1244d0cdb..49a0cc586 100644
--- a/module/bdev/lvol/vbdev_lvol_rpc.c
+++ b/module/bdev/lvol/vbdev_lvol_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile
index 501490946..3a50b27b0 100644
--- a/module/bdev/malloc/Makefile
+++ b/module/bdev/malloc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/malloc/bdev_malloc.c b/module/bdev/malloc/bdev_malloc.c
index adf30929f..65115465e 100644
--- a/module/bdev/malloc/bdev_malloc.c
+++ b/module/bdev/malloc/bdev_malloc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/malloc/bdev_malloc.h b/module/bdev/malloc/bdev_malloc.h
index 2abd9fa89..16d1f3b71 100644
--- a/module/bdev/malloc/bdev_malloc.h
+++ b/module/bdev/malloc/bdev_malloc.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c
index cab42a8bb..6e79d6900 100644
--- a/module/bdev/malloc/bdev_malloc_rpc.c
+++ b/module/bdev/malloc/bdev_malloc_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile
index bbf8ca1bb..3a4a4cc1b 100644
--- a/module/bdev/null/Makefile
+++ b/module/bdev/null/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/null/bdev_null.c b/module/bdev/null/bdev_null.c
index 308d40a5c..4e4752e58 100644
--- a/module/bdev/null/bdev_null.c
+++ b/module/bdev/null/bdev_null.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/module/bdev/null/bdev_null.h b/module/bdev/null/bdev_null.h
index ac2e31cb3..d539c71ad 100644
--- a/module/bdev/null/bdev_null.h
+++ b/module/bdev/null/bdev_null.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/module/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c
index f4209bffb..685203048 100644
--- a/module/bdev/null/bdev_null_rpc.c
+++ b/module/bdev/null/bdev_null_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile
index 26d37a91b..6ec1180e7 100644
--- a/module/bdev/nvme/Makefile
+++ b/module/bdev/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c
index 72838416d..e8242d4d5 100644
--- a/module/bdev/nvme/bdev_nvme.c
+++ b/module/bdev/nvme/bdev_nvme.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/nvme/bdev_nvme.h b/module/bdev/nvme/bdev_nvme.h
index 73e2250e1..a43746c22 100644
--- a/module/bdev/nvme/bdev_nvme.h
+++ b/module/bdev/nvme/bdev_nvme.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/nvme/bdev_nvme_cuse_rpc.c b/module/bdev/nvme/bdev_nvme_cuse_rpc.c
index 2e538ab40..0ceb47c2b 100644
--- a/module/bdev/nvme/bdev_nvme_cuse_rpc.c
+++ b/module/bdev/nvme/bdev_nvme_cuse_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c
index 2f8b60557..6a87ff395 100644
--- a/module/bdev/nvme/bdev_nvme_rpc.c
+++ b/module/bdev/nvme/bdev_nvme_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019-2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/nvme/nvme_rpc.c b/module/bdev/nvme/nvme_rpc.c
index ee2e84f4c..2b40b1389 100644
--- a/module/bdev/nvme/nvme_rpc.c
+++ b/module/bdev/nvme/nvme_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/nvme/vbdev_opal.c b/module/bdev/nvme/vbdev_opal.c
index dfe8c1514..863ca5455 100644
--- a/module/bdev/nvme/vbdev_opal.c
+++ b/module/bdev/nvme/vbdev_opal.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/nvme/vbdev_opal.h b/module/bdev/nvme/vbdev_opal.h
index a6f779bdb..4f8e931b6 100644
--- a/module/bdev/nvme/vbdev_opal.h
+++ b/module/bdev/nvme/vbdev_opal.h
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
+
 #ifndef SPDK_VBDEV_OPAL_H
 #define SPDK_VBDEV_OPAL_H
 
diff --git a/module/bdev/nvme/vbdev_opal_rpc.c b/module/bdev/nvme/vbdev_opal_rpc.c
index fe9ca2ca1..706b8ac2d 100644
--- a/module/bdev/nvme/vbdev_opal_rpc.c
+++ b/module/bdev/nvme/vbdev_opal_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile
index 2be3170db..19eb8897c 100644
--- a/module/bdev/ocf/Makefile
+++ b/module/bdev/ocf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2018 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/ocf/ctx.c b/module/bdev/ocf/ctx.c
index fbc20dad6..f22ed1588 100644
--- a/module/bdev/ocf/ctx.c
+++ b/module/bdev/ocf/ctx.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
+
 #include <ocf/ocf.h>
 #include <execinfo.h>
 
diff --git a/module/bdev/ocf/ctx.h b/module/bdev/ocf/ctx.h
index 08ec578d0..730e1cb0d 100644
--- a/module/bdev/ocf/ctx.h
+++ b/module/bdev/ocf/ctx.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/data.c b/module/bdev/ocf/data.c
index 01649d94a..ff3f347ed 100644
--- a/module/bdev/ocf/data.c
+++ b/module/bdev/ocf/data.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/data.h b/module/bdev/ocf/data.h
index baeec8dbd..e1b571ddf 100644
--- a/module/bdev/ocf/data.h
+++ b/module/bdev/ocf/data.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/stats.c b/module/bdev/ocf/stats.c
index eac173ee2..bbc91f596 100644
--- a/module/bdev/ocf/stats.c
+++ b/module/bdev/ocf/stats.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/stats.h b/module/bdev/ocf/stats.h
index f7423026e..9bfcc36da 100644
--- a/module/bdev/ocf/stats.h
+++ b/module/bdev/ocf/stats.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/utils.c b/module/bdev/ocf/utils.c
index ec423ad74..4c70c70fa 100644
--- a/module/bdev/ocf/utils.c
+++ b/module/bdev/ocf/utils.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/utils.h b/module/bdev/ocf/utils.h
index 99dd4c2e9..8f1688c63 100644
--- a/module/bdev/ocf/utils.h
+++ b/module/bdev/ocf/utils.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c
index 9ef7c7933..50dc77448 100644
--- a/module/bdev/ocf/vbdev_ocf.c
+++ b/module/bdev/ocf/vbdev_ocf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/vbdev_ocf.h b/module/bdev/ocf/vbdev_ocf.h
index 95a4d31c2..dc9998ba5 100644
--- a/module/bdev/ocf/vbdev_ocf.h
+++ b/module/bdev/ocf/vbdev_ocf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/vbdev_ocf_rpc.c b/module/bdev/ocf/vbdev_ocf_rpc.c
index caf45d935..ab5a9ffc5 100644
--- a/module/bdev/ocf/vbdev_ocf_rpc.c
+++ b/module/bdev/ocf/vbdev_ocf_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/volume.c b/module/bdev/ocf/volume.c
index 11a84b9d8..4d606dcbc 100644
--- a/module/bdev/ocf/volume.c
+++ b/module/bdev/ocf/volume.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/ocf/volume.h b/module/bdev/ocf/volume.h
index e88089601..02749acf2 100644
--- a/module/bdev/ocf/volume.h
+++ b/module/bdev/ocf/volume.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile
index 1be3e2c14..6fb95d314 100644
--- a/module/bdev/passthru/Makefile
+++ b/module/bdev/passthru/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/passthru/vbdev_passthru.c b/module/bdev/passthru/vbdev_passthru.c
index 52a16f2ea..7f60586c3 100644
--- a/module/bdev/passthru/vbdev_passthru.c
+++ b/module/bdev/passthru/vbdev_passthru.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/passthru/vbdev_passthru.h b/module/bdev/passthru/vbdev_passthru.h
index be0eeb196..5450fbb14 100644
--- a/module/bdev/passthru/vbdev_passthru.h
+++ b/module/bdev/passthru/vbdev_passthru.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/passthru/vbdev_passthru_rpc.c b/module/bdev/passthru/vbdev_passthru_rpc.c
index 33a3b026d..6fad37e8b 100644
--- a/module/bdev/passthru/vbdev_passthru_rpc.c
+++ b/module/bdev/passthru/vbdev_passthru_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile
index 6a9d24fd6..430e1c5d0 100644
--- a/module/bdev/pmem/Makefile
+++ b/module/bdev/pmem/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/pmem/bdev_pmem.c b/module/bdev/pmem/bdev_pmem.c
index 1cdef4138..4b5225aab 100644
--- a/module/bdev/pmem/bdev_pmem.c
+++ b/module/bdev/pmem/bdev_pmem.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/pmem/bdev_pmem.h b/module/bdev/pmem/bdev_pmem.h
index 607758c75..d6320c84f 100644
--- a/module/bdev/pmem/bdev_pmem.h
+++ b/module/bdev/pmem/bdev_pmem.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/pmem/bdev_pmem_rpc.c b/module/bdev/pmem/bdev_pmem_rpc.c
index f9c810226..b006c19df 100644
--- a/module/bdev/pmem/bdev_pmem_rpc.c
+++ b/module/bdev/pmem/bdev_pmem_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile
index e2c3941ca..e8bf5efd3 100644
--- a/module/bdev/raid/Makefile
+++ b/module/bdev/raid/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c
index c61fb5f85..4208d015c 100644
--- a/module/bdev/raid/bdev_raid.c
+++ b/module/bdev/raid/bdev_raid.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/raid/bdev_raid.h b/module/bdev/raid/bdev_raid.h
index fb3a5f20b..b73472f8b 100644
--- a/module/bdev/raid/bdev_raid.h
+++ b/module/bdev/raid/bdev_raid.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c
index 0ac91e350..54ea08e3b 100644
--- a/module/bdev/raid/bdev_raid_rpc.c
+++ b/module/bdev/raid/bdev_raid_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/raid/concat.c b/module/bdev/raid/concat.c
index c35dbb589..c9f7b5dc5 100644
--- a/module/bdev/raid/concat.c
+++ b/module/bdev/raid/concat.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2022 Intel Corporation.
  *   Copyright (c) Peng Yu yupeng0921@gmail.com.
  *   All rights reserved.
  */
diff --git a/module/bdev/raid/raid0.c b/module/bdev/raid/raid0.c
index 1f2eab3af..7603a8281 100644
--- a/module/bdev/raid/raid0.c
+++ b/module/bdev/raid/raid0.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/bdev/raid/raid5f.c b/module/bdev/raid/raid5f.c
index 8b0a71941..2868363f3 100644
--- a/module/bdev/raid/raid5f.c
+++ b/module/bdev/raid/raid5f.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile
index 69a043c41..b74c9674e 100644
--- a/module/bdev/rbd/Makefile
+++ b/module/bdev/rbd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/rbd/bdev_rbd.c b/module/bdev/rbd/bdev_rbd.c
index 1e16f9882..354c97154 100644
--- a/module/bdev/rbd/bdev_rbd.c
+++ b/module/bdev/rbd/bdev_rbd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/rbd/bdev_rbd.h b/module/bdev/rbd/bdev_rbd.h
index 5912bdeca..7ce21d70a 100644
--- a/module/bdev/rbd/bdev_rbd.h
+++ b/module/bdev/rbd/bdev_rbd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/rbd/bdev_rbd_rpc.c b/module/bdev/rbd/bdev_rbd_rpc.c
index 9ba1e094b..4f8f7cfa7 100644
--- a/module/bdev/rbd/bdev_rbd_rpc.c
+++ b/module/bdev/rbd/bdev_rbd_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile
index 3b4c8efc1..a7145648d 100644
--- a/module/bdev/split/Makefile
+++ b/module/bdev/split/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/split/vbdev_split.c b/module/bdev/split/vbdev_split.c
index 1da9667c4..44c5d7ddf 100644
--- a/module/bdev/split/vbdev_split.c
+++ b/module/bdev/split/vbdev_split.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/split/vbdev_split.h b/module/bdev/split/vbdev_split.h
index c795d946a..ff4fdab5e 100644
--- a/module/bdev/split/vbdev_split.h
+++ b/module/bdev/split/vbdev_split.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/split/vbdev_split_rpc.c b/module/bdev/split/vbdev_split_rpc.c
index 1f86994bb..e8af8ed62 100644
--- a/module/bdev/split/vbdev_split_rpc.c
+++ b/module/bdev/split/vbdev_split_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile
index 44e093a1a..6e4114344 100644
--- a/module/bdev/uring/Makefile
+++ b/module/bdev/uring/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/uring/bdev_uring.c b/module/bdev/uring/bdev_uring.c
index 3a9c7d778..36046cf61 100644
--- a/module/bdev/uring/bdev_uring.c
+++ b/module/bdev/uring/bdev_uring.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/uring/bdev_uring.h b/module/bdev/uring/bdev_uring.h
index b869d2729..177cab809 100644
--- a/module/bdev/uring/bdev_uring.h
+++ b/module/bdev/uring/bdev_uring.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/uring/bdev_uring_rpc.c b/module/bdev/uring/bdev_uring_rpc.c
index d7c595ae3..fefee3388 100644
--- a/module/bdev/uring/bdev_uring_rpc.c
+++ b/module/bdev/uring/bdev_uring_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile
index 5d26e7569..608f1a018 100644
--- a/module/bdev/virtio/Makefile
+++ b/module/bdev/virtio/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/virtio/bdev_virtio.h b/module/bdev/virtio/bdev_virtio.h
index 8bcb13e73..69cfadea3 100644
--- a/module/bdev/virtio/bdev_virtio.h
+++ b/module/bdev/virtio/bdev_virtio.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/virtio/bdev_virtio_blk.c b/module/bdev/virtio/bdev_virtio_blk.c
index 5a3859196..728a55737 100644
--- a/module/bdev/virtio/bdev_virtio_blk.c
+++ b/module/bdev/virtio/bdev_virtio_blk.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/virtio/bdev_virtio_rpc.c b/module/bdev/virtio/bdev_virtio_rpc.c
index 8155fd5ea..810785c0f 100644
--- a/module/bdev/virtio/bdev_virtio_rpc.c
+++ b/module/bdev/virtio/bdev_virtio_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/virtio/bdev_virtio_scsi.c b/module/bdev/virtio/bdev_virtio_scsi.c
index 0bf9f7557..322e21947 100644
--- a/module/bdev/virtio/bdev_virtio_scsi.c
+++ b/module/bdev/virtio/bdev_virtio_scsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/xnvme/bdev_xnvme.c b/module/bdev/xnvme/bdev_xnvme.c
index 9edc63084..e75f039a9 100644
--- a/module/bdev/xnvme/bdev_xnvme.c
+++ b/module/bdev/xnvme/bdev_xnvme.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2022 Intel Corporation.
  *   Copyright (c) Samsung Electronics Co., Ltd.
  *   All rights reserved.
  */
diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile
index aa82cbfec..f023852e4 100644
--- a/module/bdev/zone_block/Makefile
+++ b/module/bdev/zone_block/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/bdev/zone_block/vbdev_zone_block.c b/module/bdev/zone_block/vbdev_zone_block.c
index 467f1da68..70fd73500 100644
--- a/module/bdev/zone_block/vbdev_zone_block.c
+++ b/module/bdev/zone_block/vbdev_zone_block.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/module/bdev/zone_block/vbdev_zone_block.h b/module/bdev/zone_block/vbdev_zone_block.h
index 38024fadd..f5c8c16e0 100644
--- a/module/bdev/zone_block/vbdev_zone_block.h
+++ b/module/bdev/zone_block/vbdev_zone_block.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/bdev/zone_block/vbdev_zone_block_rpc.c b/module/bdev/zone_block/vbdev_zone_block_rpc.c
index 105ec6caf..59b5ca023 100644
--- a/module/bdev/zone_block/vbdev_zone_block_rpc.c
+++ b/module/bdev/zone_block/vbdev_zone_block_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/blob/Makefile b/module/blob/Makefile
index a3baff731..17aa8dd9e 100644
--- a/module/blob/Makefile
+++ b/module/blob/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/blob/bdev/Makefile b/module/blob/bdev/Makefile
index fa40d2259..f8c9d598a 100644
--- a/module/blob/bdev/Makefile
+++ b/module/blob/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/blob/bdev/blob_bdev.c b/module/blob/bdev/blob_bdev.c
index ef153012b..c12169368 100644
--- a/module/blob/bdev/blob_bdev.c
+++ b/module/blob/bdev/blob_bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/blobfs/Makefile b/module/blobfs/Makefile
index a3baff731..17aa8dd9e 100644
--- a/module/blobfs/Makefile
+++ b/module/blobfs/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile
index 7ac9a9463..0cc7981df 100644
--- a/module/blobfs/bdev/Makefile
+++ b/module/blobfs/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/blobfs/bdev/blobfs_bdev.c b/module/blobfs/bdev/blobfs_bdev.c
index cf22e80b1..856541368 100644
--- a/module/blobfs/bdev/blobfs_bdev.c
+++ b/module/blobfs/bdev/blobfs_bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/blobfs/bdev/blobfs_bdev_rpc.c b/module/blobfs/bdev/blobfs_bdev_rpc.c
index bf52434ab..0bd5d2609 100644
--- a/module/blobfs/bdev/blobfs_bdev_rpc.c
+++ b/module/blobfs/bdev/blobfs_bdev_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/blobfs/bdev/blobfs_fuse.c b/module/blobfs/bdev/blobfs_fuse.c
index b82c51972..45f6f76e1 100644
--- a/module/blobfs/bdev/blobfs_fuse.c
+++ b/module/blobfs/bdev/blobfs_fuse.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/blobfs/bdev/blobfs_fuse.h b/module/blobfs/bdev/blobfs_fuse.h
index cb2051b39..aa48e367d 100644
--- a/module/blobfs/bdev/blobfs_fuse.h
+++ b/module/blobfs/bdev/blobfs_fuse.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/env_dpdk/Makefile b/module/env_dpdk/Makefile
index 344f80ed1..fcd3a9b12 100644
--- a/module/env_dpdk/Makefile
+++ b/module/env_dpdk/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/env_dpdk/env_dpdk_rpc.c b/module/env_dpdk/env_dpdk_rpc.c
index f19885822..0e2cbcb5e 100644
--- a/module/env_dpdk/env_dpdk_rpc.c
+++ b/module/env_dpdk/env_dpdk_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/module/event/Makefile b/module/event/Makefile
index a9ad603b2..493093b48 100644
--- a/module/event/Makefile
+++ b/module/event/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/Makefile b/module/event/subsystems/Makefile
index 6f456994e..f358bb306 100644
--- a/module/event/subsystems/Makefile
+++ b/module/event/subsystems/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile
index 8e9ececa6..fb1b73036 100644
--- a/module/event/subsystems/accel/Makefile
+++ b/module/event/subsystems/accel/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/accel/accel.c b/module/event/subsystems/accel/accel.c
index ea34dc4cc..337457966 100644
--- a/module/event/subsystems/accel/accel.c
+++ b/module/event/subsystems/accel/accel.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile
index bfb0cf584..53388581e 100644
--- a/module/event/subsystems/bdev/Makefile
+++ b/module/event/subsystems/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/bdev/bdev.c b/module/event/subsystems/bdev/bdev.c
index c3c7ac53e..16a8be418 100644
--- a/module/event/subsystems/bdev/bdev.c
+++ b/module/event/subsystems/bdev/bdev.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile
index deb3efb6e..2c091c395 100644
--- a/module/event/subsystems/iscsi/Makefile
+++ b/module/event/subsystems/iscsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/iscsi/iscsi.c b/module/event/subsystems/iscsi/iscsi.c
index 606ecbc1c..ef66c223f 100644
--- a/module/event/subsystems/iscsi/iscsi.c
+++ b/module/event/subsystems/iscsi/iscsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile
index 56b01eb7c..c2fe23ac3 100644
--- a/module/event/subsystems/nbd/Makefile
+++ b/module/event/subsystems/nbd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/nbd/nbd.c b/module/event/subsystems/nbd/nbd.c
index ad4cc88db..a482ad760 100644
--- a/module/event/subsystems/nbd/nbd.c
+++ b/module/event/subsystems/nbd/nbd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile
index bec1315c2..7d8fcfa7c 100644
--- a/module/event/subsystems/nvmf/Makefile
+++ b/module/event/subsystems/nvmf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/nvmf/event_nvmf.h b/module/event/subsystems/nvmf/event_nvmf.h
index 151007145..82e614d1a 100644
--- a/module/event/subsystems/nvmf/event_nvmf.h
+++ b/module/event/subsystems/nvmf/event_nvmf.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/event/subsystems/nvmf/nvmf_rpc.c b/module/event/subsystems/nvmf/nvmf_rpc.c
index 7e11abc5f..66a4d2b5f 100644
--- a/module/event/subsystems/nvmf/nvmf_rpc.c
+++ b/module/event/subsystems/nvmf/nvmf_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018-2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/event/subsystems/nvmf/nvmf_tgt.c b/module/event/subsystems/nvmf/nvmf_tgt.c
index b8bb0f3b2..2f23d0e64 100644
--- a/module/event/subsystems/nvmf/nvmf_tgt.c
+++ b/module/event/subsystems/nvmf/nvmf_tgt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/event/subsystems/scheduler/Makefile b/module/event/subsystems/scheduler/Makefile
index f1a9f445d..f52d67907 100644
--- a/module/event/subsystems/scheduler/Makefile
+++ b/module/event/subsystems/scheduler/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/scheduler/scheduler.c b/module/event/subsystems/scheduler/scheduler.c
index 4d4ba0ce2..3cc714e7b 100644
--- a/module/event/subsystems/scheduler/scheduler.c
+++ b/module/event/subsystems/scheduler/scheduler.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile
index 2a985bbe9..fa7356d1b 100644
--- a/module/event/subsystems/scsi/Makefile
+++ b/module/event/subsystems/scsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/scsi/scsi.c b/module/event/subsystems/scsi/scsi.c
index ea180cd46..bc524d217 100644
--- a/module/event/subsystems/scsi/scsi.c
+++ b/module/event/subsystems/scsi/scsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/sock/Makefile b/module/event/subsystems/sock/Makefile
index acda0d67c..e6f12402e 100644
--- a/module/event/subsystems/sock/Makefile
+++ b/module/event/subsystems/sock/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2021 Intel Corporation.
 #  Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
 #
 
diff --git a/module/event/subsystems/sock/sock.c b/module/event/subsystems/sock/sock.c
index 36911b0e2..643c694d5 100644
--- a/module/event/subsystems/sock/sock.c
+++ b/module/event/subsystems/sock/sock.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2021 Intel Corporation.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/module/event/subsystems/vfu_tgt/Makefile b/module/event/subsystems/vfu_tgt/Makefile
index 7dfa4885a..d6bd9680e 100644
--- a/module/event/subsystems/vfu_tgt/Makefile
+++ b/module/event/subsystems/vfu_tgt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/vfu_tgt/vfu_tgt.c b/module/event/subsystems/vfu_tgt/vfu_tgt.c
index 789d7b71f..ef3a68748 100644
--- a/module/event/subsystems/vfu_tgt/vfu_tgt.c
+++ b/module/event/subsystems/vfu_tgt/vfu_tgt.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/vhost_blk/Makefile b/module/event/subsystems/vhost_blk/Makefile
index b04c496d6..3e831b71a 100644
--- a/module/event/subsystems/vhost_blk/Makefile
+++ b/module/event/subsystems/vhost_blk/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/vhost_blk/vhost_blk.c b/module/event/subsystems/vhost_blk/vhost_blk.c
index e23adadc8..8a661af6d 100644
--- a/module/event/subsystems/vhost_blk/vhost_blk.c
+++ b/module/event/subsystems/vhost_blk/vhost_blk.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/vhost_scsi/Makefile b/module/event/subsystems/vhost_scsi/Makefile
index ff58e129f..fc2ad51c2 100644
--- a/module/event/subsystems/vhost_scsi/Makefile
+++ b/module/event/subsystems/vhost_scsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/vhost_scsi/vhost_scsi.c b/module/event/subsystems/vhost_scsi/vhost_scsi.c
index 5425aae5a..0b6900ae9 100644
--- a/module/event/subsystems/vhost_scsi/vhost_scsi.c
+++ b/module/event/subsystems/vhost_scsi/vhost_scsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile
index f85979fde..5fa0fbef5 100644
--- a/module/event/subsystems/vmd/Makefile
+++ b/module/event/subsystems/vmd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/event/subsystems/vmd/event_vmd.h b/module/event/subsystems/vmd/event_vmd.h
index 4b5a269e8..9bea64578 100644
--- a/module/event/subsystems/vmd/event_vmd.h
+++ b/module/event/subsystems/vmd/event_vmd.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/vmd/vmd.c b/module/event/subsystems/vmd/vmd.c
index 027448446..5a71b5fc0 100644
--- a/module/event/subsystems/vmd/vmd.c
+++ b/module/event/subsystems/vmd/vmd.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/event/subsystems/vmd/vmd_rpc.c b/module/event/subsystems/vmd/vmd_rpc.c
index 844561eac..507b58f34 100644
--- a/module/event/subsystems/vmd/vmd_rpc.c
+++ b/module/event/subsystems/vmd/vmd_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/scheduler/Makefile b/module/scheduler/Makefile
index 83f48c905..d973ce092 100644
--- a/module/scheduler/Makefile
+++ b/module/scheduler/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/scheduler/dpdk_governor/Makefile b/module/scheduler/dpdk_governor/Makefile
index 4bdb6508f..07717a837 100644
--- a/module/scheduler/dpdk_governor/Makefile
+++ b/module/scheduler/dpdk_governor/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/scheduler/dpdk_governor/dpdk_governor.c b/module/scheduler/dpdk_governor/dpdk_governor.c
index e8e217446..2e1ff2e3a 100644
--- a/module/scheduler/dpdk_governor/dpdk_governor.c
+++ b/module/scheduler/dpdk_governor/dpdk_governor.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/scheduler/dynamic/Makefile b/module/scheduler/dynamic/Makefile
index dc274ee4d..81815d8b6 100644
--- a/module/scheduler/dynamic/Makefile
+++ b/module/scheduler/dynamic/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/scheduler/dynamic/scheduler_dynamic.c b/module/scheduler/dynamic/scheduler_dynamic.c
index 939c08709..25ead071e 100644
--- a/module/scheduler/dynamic/scheduler_dynamic.c
+++ b/module/scheduler/dynamic/scheduler_dynamic.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/scheduler/gscheduler/Makefile b/module/scheduler/gscheduler/Makefile
index e92d30126..20d71e689 100644
--- a/module/scheduler/gscheduler/Makefile
+++ b/module/scheduler/gscheduler/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/scheduler/gscheduler/gscheduler.c b/module/scheduler/gscheduler/gscheduler.c
index 3f09ecdec..446619b41 100644
--- a/module/scheduler/gscheduler/gscheduler.c
+++ b/module/scheduler/gscheduler/gscheduler.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/sock/Makefile b/module/sock/Makefile
index 6ead8029b..af6288670 100644
--- a/module/sock/Makefile
+++ b/module/sock/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile
index 4e2fde33f..e08c8ba4a 100644
--- a/module/sock/posix/Makefile
+++ b/module/sock/posix/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/sock/posix/posix.c b/module/sock/posix/posix.c
index 435ebf699..220c41d95 100644
--- a/module/sock/posix/posix.c
+++ b/module/sock/posix/posix.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/module/sock/sock_kernel.h b/module/sock/sock_kernel.h
index 59e7221ec..a9fc87435 100644
--- a/module/sock/sock_kernel.h
+++ b/module/sock/sock_kernel.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 static int
diff --git a/module/sock/uring/Makefile b/module/sock/uring/Makefile
index 00a2a90f6..c506d2743 100644
--- a/module/sock/uring/Makefile
+++ b/module/sock/uring/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/sock/uring/uring.c b/module/sock/uring/uring.c
index a82dd1a05..b4caa9b9d 100644
--- a/module/sock/uring/uring.c
+++ b/module/sock/uring/uring.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/vfu_device/Makefile b/module/vfu_device/Makefile
index ff16188a8..73a3905a8 100644
--- a/module/vfu_device/Makefile
+++ b/module/vfu_device/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/module/vfu_device/vfu_virtio.c b/module/vfu_device/vfu_virtio.c
index 904332fbe..633e53779 100644
--- a/module/vfu_device/vfu_virtio.c
+++ b/module/vfu_device/vfu_virtio.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/vfu_device/vfu_virtio_blk.c b/module/vfu_device/vfu_virtio_blk.c
index a72e1336d..302d784da 100644
--- a/module/vfu_device/vfu_virtio_blk.c
+++ b/module/vfu_device/vfu_virtio_blk.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/vfu_device/vfu_virtio_internal.h b/module/vfu_device/vfu_virtio_internal.h
index e6c963018..992cf722d 100644
--- a/module/vfu_device/vfu_virtio_internal.h
+++ b/module/vfu_device/vfu_virtio_internal.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/vfu_device/vfu_virtio_rpc.c b/module/vfu_device/vfu_virtio_rpc.c
index c3803de2e..31794588e 100644
--- a/module/vfu_device/vfu_virtio_rpc.c
+++ b/module/vfu_device/vfu_virtio_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/module/vfu_device/vfu_virtio_scsi.c b/module/vfu_device/vfu_virtio_scsi.c
index 6093fc7ed..35d8d1d10 100644
--- a/module/vfu_device/vfu_virtio_scsi.c
+++ b/module/vfu_device/vfu_virtio_scsi.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/proto/Makefile b/proto/Makefile
index eceb0aee2..767b93bd3 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/scripts/gdb_macros.py b/scripts/gdb_macros.py
index 8624fabf3..8c9f0c9ae 100644
--- a/scripts/gdb_macros.py
+++ b/scripts/gdb_macros.py
@@ -1,3 +1,7 @@
+#   SPDX-License-Identifier: BSD-3-Clause
+#   Copyright (C) 2019 Intel Corporation.
+#
+
 import gdb
 
 
diff --git a/scripts/perf/nvmf/set_xps_rxqs b/scripts/perf/nvmf/set_xps_rxqs
index c8b1cdd18..bcd28fe37 100755
--- a/scripts/perf/nvmf/set_xps_rxqs
+++ b/scripts/perf/nvmf/set_xps_rxqs
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2019, Intel Corporation
+# Copyright (C) 2021 Intel Corporation.
 #
 # Script to setup mechanism for Tx queue selection based on Rx queue(s) map.
 # This is done by configuring Rx queue(s) map per Tx queue via sysfs. This
diff --git a/shared_lib/Makefile b/shared_lib/Makefile
index ee0905d5d..cec085f06 100644
--- a/shared_lib/Makefile
+++ b/shared_lib/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2018 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/Makefile b/test/Makefile
index 648800925..d369a4955 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/Makefile b/test/app/Makefile
index 0a45d45ef..d1bf18bb7 100644
--- a/test/app/Makefile
+++ b/test/app/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index 4b5950104..cf7fa8370 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/bdev_svc/bdev_svc.c b/test/app/bdev_svc/bdev_svc.c
index 0a7f81184..3dfc7a422 100644
--- a/test/app/bdev_svc/bdev_svc.c
+++ b/test/app/bdev_svc/bdev_svc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/app/fuzz/Makefile b/test/app/fuzz/Makefile
index 929ab8a3e..0164c59d6 100644
--- a/test/app/fuzz/Makefile
+++ b/test/app/fuzz/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/fuzz/common/fuzz_common.h b/test/app/fuzz/common/fuzz_common.h
index a9da81c56..6d53d8ab0 100644
--- a/test/app/fuzz/common/fuzz_common.h
+++ b/test/app/fuzz/common/fuzz_common.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/app/fuzz/iscsi_fuzz/Makefile b/test/app/fuzz/iscsi_fuzz/Makefile
index 8b798e04f..cac000cac 100644
--- a/test/app/fuzz/iscsi_fuzz/Makefile
+++ b/test/app/fuzz/iscsi_fuzz/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2019 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
diff --git a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c
index b10327cf2..c29b64da9 100644
--- a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c
+++ b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/app/fuzz/llvm_nvme_fuzz/Makefile b/test/app/fuzz/llvm_nvme_fuzz/Makefile
index 05a4a102c..99886e311 100644
--- a/test/app/fuzz/llvm_nvme_fuzz/Makefile
+++ b/test/app/fuzz/llvm_nvme_fuzz/Makefile
@@ -1,4 +1,6 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2021 Intel Corporation.
+#  All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
diff --git a/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c b/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
index 89e11572b..2859dbdc5 100644
--- a/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
+++ b/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/test/app/fuzz/llvm_vfio_fuzz/llvm_vfio_fuzz.c b/test/app/fuzz/llvm_vfio_fuzz/llvm_vfio_fuzz.c
index 79286398e..a11214e7e 100644
--- a/test/app/fuzz/llvm_vfio_fuzz/llvm_vfio_fuzz.c
+++ b/test/app/fuzz/llvm_vfio_fuzz/llvm_vfio_fuzz.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2022 Intel Corporation. All rights reserved.
  */
 #include "spdk/stdinc.h"
 #include "spdk/conf.h"
diff --git a/test/app/fuzz/nvme_fuzz/nvme_fuzz.c b/test/app/fuzz/nvme_fuzz/nvme_fuzz.c
index a0608245c..461a5f9ac 100644
--- a/test/app/fuzz/nvme_fuzz/nvme_fuzz.c
+++ b/test/app/fuzz/nvme_fuzz/nvme_fuzz.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/app/fuzz/vhost_fuzz/vhost_fuzz.c b/test/app/fuzz/vhost_fuzz/vhost_fuzz.c
index 2a090e5ba..98d6a921e 100644
--- a/test/app/fuzz/vhost_fuzz/vhost_fuzz.c
+++ b/test/app/fuzz/vhost_fuzz/vhost_fuzz.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/app/fuzz/vhost_fuzz/vhost_fuzz.h b/test/app/fuzz/vhost_fuzz/vhost_fuzz.h
index 266730e2f..61b5acda8 100644
--- a/test/app/fuzz/vhost_fuzz/vhost_fuzz.h
+++ b/test/app/fuzz/vhost_fuzz/vhost_fuzz.h
@@ -1,9 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
-
 #ifndef VHOST_FUZZ_H
 #define VHOST_FUZZ_H
 
diff --git a/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c b/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c
index 64b2d137b..a5bd88caf 100644
--- a/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c
+++ b/test/app/fuzz/vhost_fuzz/vhost_fuzz_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2019 Intel Corporation. All rights reserved.
  *   Copyright (c) 2018 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/app/histogram_perf/Makefile b/test/app/histogram_perf/Makefile
index 776aefb52..f6ecd5d70 100644
--- a/test/app/histogram_perf/Makefile
+++ b/test/app/histogram_perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/histogram_perf/histogram_perf.c b/test/app/histogram_perf/histogram_perf.c
index 4ac9b47ed..6852fcd24 100644
--- a/test/app/histogram_perf/histogram_perf.c
+++ b/test/app/histogram_perf/histogram_perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/app/jsoncat/Makefile b/test/app/jsoncat/Makefile
index 6b6d99ebb..527baa918 100644
--- a/test/app/jsoncat/Makefile
+++ b/test/app/jsoncat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/jsoncat/jsoncat.c b/test/app/jsoncat/jsoncat.c
index 29492cf87..46b31437d 100644
--- a/test/app/jsoncat/jsoncat.c
+++ b/test/app/jsoncat/jsoncat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile
index b4886286e..668f93925 100644
--- a/test/app/stub/Makefile
+++ b/test/app/stub/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/app/stub/stub.c b/test/app/stub/stub.c
index 3001ec4d6..7c3ed026c 100644
--- a/test/app/stub/stub.c
+++ b/test/app/stub/stub.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/bdev/Makefile b/test/bdev/Makefile
index e91cb4843..5b3dab9ff 100644
--- a/test/bdev/Makefile
+++ b/test/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile
index ac9c7696d..55e6e9f67 100644
--- a/test/bdev/bdevio/Makefile
+++ b/test/bdev/bdevio/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/bdev/bdevio/bdevio.c b/test/bdev/bdevio/bdevio.c
index 63f598375..53b4fca0f 100644
--- a/test/bdev/bdevio/bdevio.c
+++ b/test/bdev/bdevio/bdevio.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile
index e3471f2e7..2e3fc9607 100644
--- a/test/bdev/bdevperf/Makefile
+++ b/test/bdev/bdevperf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
index d440806df..f34829ec9 100644
--- a/test/bdev/bdevperf/bdevperf.c
+++ b/test/bdev/bdevperf/bdevperf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/test/blobfs/Makefile b/test/blobfs/Makefile
index ec0760458..7f308304e 100644
--- a/test/blobfs/Makefile
+++ b/test/blobfs/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile
index e83a694ad..00407a592 100644
--- a/test/blobfs/fuse/Makefile
+++ b/test/blobfs/fuse/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c
index 77d075746..db2a93bdc 100644
--- a/test/blobfs/fuse/fuse.c
+++ b/test/blobfs/fuse/fuse.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile
index 0026edf80..52ab602a7 100644
--- a/test/blobfs/mkfs/Makefile
+++ b/test/blobfs/mkfs/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/blobfs/mkfs/mkfs.c b/test/blobfs/mkfs/mkfs.c
index 1137ae8ed..d66e22103 100644
--- a/test/blobfs/mkfs/mkfs.c
+++ b/test/blobfs/mkfs/mkfs.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/common/lib/nvme/common_stubs.h b/test/common/lib/nvme/common_stubs.h
index 1164258b1..4e9ed6865 100644
--- a/test/common/lib/nvme/common_stubs.h
+++ b/test/common/lib/nvme/common_stubs.h
@@ -1,8 +1,9 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
+
 #include "common/lib/test_env.c"
 
 const char *
diff --git a/test/common/lib/test_env.c b/test/common/lib/test_env.c
index b82b3c922..cdda43e43 100644
--- a/test/common/lib/test_env.c
+++ b/test/common/lib/test_env.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
  *   All rights reserved.
  */
diff --git a/test/common/lib/test_rdma.c b/test/common/lib/test_rdma.c
index dba07f87c..e41df3c5e 100644
--- a/test/common/lib/test_rdma.c
+++ b/test/common/lib/test_rdma.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/common/lib/test_sock.c b/test/common/lib/test_sock.c
index f49449315..e7bdbfefd 100644
--- a/test/common/lib/test_sock.c
+++ b/test/common/lib/test_sock.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/common/lib/ut_multithread.c b/test/common/lib/ut_multithread.c
index 4a3c163ec..86fdee74d 100644
--- a/test/common/lib/ut_multithread.c
+++ b/test/common/lib/ut_multithread.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/cpp_headers/Makefile b/test/cpp_headers/Makefile
index f4f628e6c..602d4e18c 100644
--- a/test/cpp_headers/Makefile
+++ b/test/cpp_headers/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/Makefile b/test/env/Makefile
index 713806c76..d71250a6d 100644
--- a/test/env/Makefile
+++ b/test/env/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/env_dpdk_post_init/Makefile b/test/env/env_dpdk_post_init/Makefile
index 4887ee0fe..d3996908b 100644
--- a/test/env/env_dpdk_post_init/Makefile
+++ b/test/env/env_dpdk_post_init/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/env_dpdk_post_init/env_dpdk_post_init.c b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
index abc079c47..16851d0bd 100644
--- a/test/env/env_dpdk_post_init/env_dpdk_post_init.c
+++ b/test/env/env_dpdk_post_init/env_dpdk_post_init.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/env/mem_callbacks/Makefile b/test/env/mem_callbacks/Makefile
index 40fd3e486..90f458dc9 100644
--- a/test/env/mem_callbacks/Makefile
+++ b/test/env/mem_callbacks/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/mem_callbacks/mem_callbacks.c b/test/env/mem_callbacks/mem_callbacks.c
index 32f397bb7..25def1fbf 100644
--- a/test/env/mem_callbacks/mem_callbacks.c
+++ b/test/env/mem_callbacks/mem_callbacks.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/env/memory/Makefile b/test/env/memory/Makefile
index 4690af8fe..90fda4b72 100644
--- a/test/env/memory/Makefile
+++ b/test/env/memory/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/memory/memory_ut.c b/test/env/memory/memory_ut.c
index 7e6a6d324..b75adac74 100644
--- a/test/env/memory/memory_ut.c
+++ b/test/env/memory/memory_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/env/pci/Makefile b/test/env/pci/Makefile
index 2e78d7100..8b78e1033 100644
--- a/test/env/pci/Makefile
+++ b/test/env/pci/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/pci/pci_ut.c b/test/env/pci/pci_ut.c
index f8f08bcb5..dd63210fe 100644
--- a/test/env/pci/pci_ut.c
+++ b/test/env/pci/pci_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/env/vtophys/Makefile b/test/env/vtophys/Makefile
index 9589b6562..8d52fc6d8 100644
--- a/test/env/vtophys/Makefile
+++ b/test/env/vtophys/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/env/vtophys/vtophys.c b/test/env/vtophys/vtophys.c
index 74b54558a..2160ffb74 100644
--- a/test/env/vtophys/vtophys.c
+++ b/test/env/vtophys/vtophys.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/event/Makefile b/test/event/Makefile
index 1ef694bfd..6da567ce7 100644
--- a/test/event/Makefile
+++ b/test/event/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/app_repeat/Makefile b/test/event/app_repeat/Makefile
index 3019f417b..967f6acb4 100644
--- a/test/event/app_repeat/Makefile
+++ b/test/event/app_repeat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/app_repeat/app_repeat.c b/test/event/app_repeat/app_repeat.c
index 50359e715..207455de7 100644
--- a/test/event/app_repeat/app_repeat.c
+++ b/test/event/app_repeat/app_repeat.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/event/event_perf/Makefile b/test/event/event_perf/Makefile
index 8af25f486..19c849103 100644
--- a/test/event/event_perf/Makefile
+++ b/test/event/event_perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/event_perf/event_perf.c b/test/event/event_perf/event_perf.c
index ac76f9bb0..f78bce27f 100644
--- a/test/event/event_perf/event_perf.c
+++ b/test/event/event_perf/event_perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/event/reactor/Makefile b/test/event/reactor/Makefile
index cbd2b5e68..4769478bb 100644
--- a/test/event/reactor/Makefile
+++ b/test/event/reactor/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/reactor/reactor.c b/test/event/reactor/reactor.c
index 7bff54fd8..d6b482c36 100644
--- a/test/event/reactor/reactor.c
+++ b/test/event/reactor/reactor.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/event/reactor_perf/Makefile b/test/event/reactor_perf/Makefile
index 1b59015ec..34275ebf4 100644
--- a/test/event/reactor_perf/Makefile
+++ b/test/event/reactor_perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/reactor_perf/reactor_perf.c b/test/event/reactor_perf/reactor_perf.c
index 93109af2c..1eac5f4d5 100644
--- a/test/event/reactor_perf/reactor_perf.c
+++ b/test/event/reactor_perf/reactor_perf.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/event/scheduler/Makefile b/test/event/scheduler/Makefile
index 6c0e43a0d..1051a5618 100644
--- a/test/event/scheduler/Makefile
+++ b/test/event/scheduler/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/event/scheduler/scheduler.c b/test/event/scheduler/scheduler.c
index c7e941335..ef204278a 100644
--- a/test/event/scheduler/scheduler.c
+++ b/test/event/scheduler/scheduler.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/Makefile b/test/external_code/Makefile
index 82b78b281..ecbb8abad 100644
--- a/test/external_code/Makefile
+++ b/test/external_code/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/external_code/hello_world/Makefile b/test/external_code/hello_world/Makefile
index 6205fadfb..ba4be9e1c 100644
--- a/test/external_code/hello_world/Makefile
+++ b/test/external_code/hello_world/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/external_code/nvme/Makefile b/test/external_code/nvme/Makefile
index 912e2d78e..5044a3d90 100644
--- a/test/external_code/nvme/Makefile
+++ b/test/external_code/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2021 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/external_code/nvme/identify.c b/test/external_code/nvme/identify.c
index d74bd68ae..ca47a7ede 100644
--- a/test/external_code/nvme/identify.c
+++ b/test/external_code/nvme/identify.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/nvme/nvme.c b/test/external_code/nvme/nvme.c
index d24029c45..f25020c76 100644
--- a/test/external_code/nvme/nvme.c
+++ b/test/external_code/nvme/nvme.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/nvme/nvme.h b/test/external_code/nvme/nvme.h
index d4c282d0f..1b294e48d 100644
--- a/test/external_code/nvme/nvme.h
+++ b/test/external_code/nvme/nvme.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/passthru/Makefile b/test/external_code/passthru/Makefile
index 2dcd2d793..c0805fd7b 100644
--- a/test/external_code/passthru/Makefile
+++ b/test/external_code/passthru/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/external_code/passthru/vbdev_passthru.c b/test/external_code/passthru/vbdev_passthru.c
index ad6db1859..407b86fde 100644
--- a/test/external_code/passthru/vbdev_passthru.c
+++ b/test/external_code/passthru/vbdev_passthru.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/passthru/vbdev_passthru.h b/test/external_code/passthru/vbdev_passthru.h
index ac7b96cd3..1cfdaa5b8 100644
--- a/test/external_code/passthru/vbdev_passthru.h
+++ b/test/external_code/passthru/vbdev_passthru.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/external_code/passthru/vbdev_passthru_rpc.c b/test/external_code/passthru/vbdev_passthru_rpc.c
index 9a931694f..07074401b 100644
--- a/test/external_code/passthru/vbdev_passthru_rpc.c
+++ b/test/external_code/passthru/vbdev_passthru_rpc.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/Makefile b/test/nvme/Makefile
index 022f25aa5..bd8093686 100644
--- a/test/nvme/Makefile
+++ b/test/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/aer/Makefile b/test/nvme/aer/Makefile
index ea56d899c..eeab56435 100644
--- a/test/nvme/aer/Makefile
+++ b/test/nvme/aer/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/aer/aer.c b/test/nvme/aer/aer.c
index cda8e892d..d96c14830 100644
--- a/test/nvme/aer/aer.c
+++ b/test/nvme/aer/aer.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/compliance/Makefile b/test/nvme/compliance/Makefile
index a435a56dc..92a0c453e 100644
--- a/test/nvme/compliance/Makefile
+++ b/test/nvme/compliance/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/compliance/nvme_compliance.c b/test/nvme/compliance/nvme_compliance.c
index 650b9213b..47c46f3e7 100644
--- a/test/nvme/compliance/nvme_compliance.c
+++ b/test/nvme/compliance/nvme_compliance.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/test/nvme/connect_stress/Makefile b/test/nvme/connect_stress/Makefile
index d297784f3..a955f7e31 100644
--- a/test/nvme/connect_stress/Makefile
+++ b/test/nvme/connect_stress/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/connect_stress/connect_stress.c b/test/nvme/connect_stress/connect_stress.c
index b810cc4cf..8a2ebecf9 100644
--- a/test/nvme/connect_stress/connect_stress.c
+++ b/test/nvme/connect_stress/connect_stress.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/cuse/Makefile b/test/nvme/cuse/Makefile
index 53fa3c122..3479f286d 100644
--- a/test/nvme/cuse/Makefile
+++ b/test/nvme/cuse/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/cuse/cuse.c b/test/nvme/cuse/cuse.c
index e943db03b..3026256e6 100644
--- a/test/nvme/cuse/cuse.c
+++ b/test/nvme/cuse/cuse.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/e2edp/Makefile b/test/nvme/e2edp/Makefile
index 9653cd416..ca9180203 100644
--- a/test/nvme/e2edp/Makefile
+++ b/test/nvme/e2edp/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/e2edp/nvme_dp.c b/test/nvme/e2edp/nvme_dp.c
index 53c2b46c9..fb6852cce 100644
--- a/test/nvme/e2edp/nvme_dp.c
+++ b/test/nvme/e2edp/nvme_dp.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/err_injection/Makefile b/test/nvme/err_injection/Makefile
index 71f24021d..57405bae2 100644
--- a/test/nvme/err_injection/Makefile
+++ b/test/nvme/err_injection/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/err_injection/err_injection.c b/test/nvme/err_injection/err_injection.c
index 592c56fbf..38cb83a20 100644
--- a/test/nvme/err_injection/err_injection.c
+++ b/test/nvme/err_injection/err_injection.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/fused_ordering/Makefile b/test/nvme/fused_ordering/Makefile
index 3778e649d..aba1ae591 100644
--- a/test/nvme/fused_ordering/Makefile
+++ b/test/nvme/fused_ordering/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/fused_ordering/fused_ordering.c b/test/nvme/fused_ordering/fused_ordering.c
index e0a057c2e..a7b784e3d 100644
--- a/test/nvme/fused_ordering/fused_ordering.c
+++ b/test/nvme/fused_ordering/fused_ordering.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/overhead/Makefile b/test/nvme/overhead/Makefile
index 793f26966..ce7b3bc26 100644
--- a/test/nvme/overhead/Makefile
+++ b/test/nvme/overhead/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/overhead/overhead.c b/test/nvme/overhead/overhead.c
index 73c2694da..dee0b8419 100644
--- a/test/nvme/overhead/overhead.c
+++ b/test/nvme/overhead/overhead.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/reserve/Makefile b/test/nvme/reserve/Makefile
index 3d2aa33d1..9c90bc185 100644
--- a/test/nvme/reserve/Makefile
+++ b/test/nvme/reserve/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/reserve/reserve.c b/test/nvme/reserve/reserve.c
index 45cf2bfb8..6e5c80e70 100644
--- a/test/nvme/reserve/reserve.c
+++ b/test/nvme/reserve/reserve.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/reset/Makefile b/test/nvme/reset/Makefile
index babca6570..e162924a7 100644
--- a/test/nvme/reset/Makefile
+++ b/test/nvme/reset/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/reset/reset.c b/test/nvme/reset/reset.c
index 084247ad7..af6c76dad 100644
--- a/test/nvme/reset/reset.c
+++ b/test/nvme/reset/reset.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/sgl/Makefile b/test/nvme/sgl/Makefile
index 682220e37..3c531421f 100644
--- a/test/nvme/sgl/Makefile
+++ b/test/nvme/sgl/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/sgl/sgl.c b/test/nvme/sgl/sgl.c
index d13c8afd5..8fd8315fb 100644
--- a/test/nvme/sgl/sgl.c
+++ b/test/nvme/sgl/sgl.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/nvme/startup/Makefile b/test/nvme/startup/Makefile
index cd4c0559a..475f27751 100644
--- a/test/nvme/startup/Makefile
+++ b/test/nvme/startup/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/nvme/startup/startup.c b/test/nvme/startup/startup.c
index daca0fa7a..83b4a8946 100644
--- a/test/nvme/startup/startup.c
+++ b/test/nvme/startup/startup.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/rpc_client/Makefile b/test/rpc_client/Makefile
index 0ff85a983..14efdbed0 100644
--- a/test/rpc_client/Makefile
+++ b/test/rpc_client/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2018 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/rpc_client/rpc_client_test.c b/test/rpc_client/rpc_client_test.c
index a5a9df577..89399ca44 100644
--- a/test/rpc_client/rpc_client_test.c
+++ b/test/rpc_client/rpc_client_test.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/spdk_cunit.h b/test/spdk_cunit.h
index 474aae0c4..2036b23bf 100644
--- a/test/spdk_cunit.h
+++ b/test/spdk_cunit.h
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/thread/Makefile b/test/thread/Makefile
index a42f2694d..db7bc2118 100644
--- a/test/thread/Makefile
+++ b/test/thread/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/thread/poller_perf/Makefile b/test/thread/poller_perf/Makefile
index 39f226f2f..0e6015a72 100644
--- a/test/thread/poller_perf/Makefile
+++ b/test/thread/poller_perf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/thread/poller_perf/poller_perf.c b/test/thread/poller_perf/poller_perf.c
index 72980d432..054791a9b 100644
--- a/test/thread/poller_perf/poller_perf.c
+++ b/test/thread/poller_perf/poller_perf.c
@@ -1,6 +1,4 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
- *   All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/test/unit/Makefile b/test/unit/Makefile
index 8863cb235..b28e7181d 100644
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/include/Makefile b/test/unit/include/Makefile
index e126a6274..8c8de160e 100644
--- a/test/unit/include/Makefile
+++ b/test/unit/include/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/include/spdk/Makefile b/test/unit/include/spdk/Makefile
index 5036ab134..e04ed787b 100644
--- a/test/unit/include/spdk/Makefile
+++ b/test/unit/include/spdk/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/include/spdk/histogram_data.h/Makefile b/test/unit/include/spdk/histogram_data.h/Makefile
index 0903f3c0c..d685da144 100644
--- a/test/unit/include/spdk/histogram_data.h/Makefile
+++ b/test/unit/include/spdk/histogram_data.h/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2017 Intel Corporation.
 #  Copyright (c) 2016 FUJITSU LIMITED, All rights reserved.
 #
 
diff --git a/test/unit/include/spdk/histogram_data.h/histogram_ut.c b/test/unit/include/spdk/histogram_data.h/histogram_ut.c
index 9f9260a9c..a42e38d7e 100644
--- a/test/unit/include/spdk/histogram_data.h/histogram_ut.c
+++ b/test/unit/include/spdk/histogram_data.h/histogram_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile
index 8b7ab97cb..553ac3a59 100644
--- a/test/unit/lib/Makefile
+++ b/test/unit/lib/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/accel/Makefile b/test/unit/lib/accel/Makefile
index ea882c0df..5e259e42e 100644
--- a/test/unit/lib/accel/Makefile
+++ b/test/unit/lib/accel/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/accel/accel.c/Makefile b/test/unit/lib/accel/accel.c/Makefile
index cb0ef546b..60e9b50f4 100644
--- a/test/unit/lib/accel/accel.c/Makefile
+++ b/test/unit/lib/accel/accel.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/accel/accel.c/accel_ut.c b/test/unit/lib/accel/accel.c/accel_ut.c
index c023c8a63..4c3c5c3b9 100644
--- a/test/unit/lib/accel/accel.c/accel_ut.c
+++ b/test/unit/lib/accel/accel.c/accel_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/Makefile b/test/unit/lib/bdev/Makefile
index 78d6cf647..6f13b3323 100644
--- a/test/unit/lib/bdev/Makefile
+++ b/test/unit/lib/bdev/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/bdev.c/Makefile b/test/unit/lib/bdev/bdev.c/Makefile
index ab17ef9d4..a54946d83 100644
--- a/test/unit/lib/bdev/bdev.c/Makefile
+++ b/test/unit/lib/bdev/bdev.c/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2016 Intel Corporation.
 #  Copyright (c) 2016 FUJITSU LIMITED, All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c
index 9df987c2f..23abc3ef1 100644
--- a/test/unit/lib/bdev/bdev.c/bdev_ut.c
+++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/bdev_zone.c/Makefile b/test/unit/lib/bdev/bdev_zone.c/Makefile
index fa2acae82..b2b5bd8ab 100644
--- a/test/unit/lib/bdev/bdev_zone.c/Makefile
+++ b/test/unit/lib/bdev/bdev_zone.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c b/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c
index 8a93c6b38..464436efa 100644
--- a/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c
+++ b/test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/compress.c/Makefile b/test/unit/lib/bdev/compress.c/Makefile
index 6fdfc981b..435d1e834 100644
--- a/test/unit/lib/bdev/compress.c/Makefile
+++ b/test/unit/lib/bdev/compress.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/compress.c/compress_ut.c b/test/unit/lib/bdev/compress.c/compress_ut.c
index 9334900bb..ddcb31567 100644
--- a/test/unit/lib/bdev/compress.c/compress_ut.c
+++ b/test/unit/lib/bdev/compress.c/compress_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/crypto.c/Makefile b/test/unit/lib/bdev/crypto.c/Makefile
index 8ae5c441a..21a8ad456 100644
--- a/test/unit/lib/bdev/crypto.c/Makefile
+++ b/test/unit/lib/bdev/crypto.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/crypto.c/crypto_ut.c b/test/unit/lib/bdev/crypto.c/crypto_ut.c
index 8fd10ab69..efddd58e6 100644
--- a/test/unit/lib/bdev/crypto.c/crypto_ut.c
+++ b/test/unit/lib/bdev/crypto.c/crypto_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/gpt/Makefile b/test/unit/lib/bdev/gpt/Makefile
index d2b448c94..bf617f495 100644
--- a/test/unit/lib/bdev/gpt/Makefile
+++ b/test/unit/lib/bdev/gpt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/gpt/gpt.c/Makefile b/test/unit/lib/bdev/gpt/gpt.c/Makefile
index 5bd92d788..7e46851fc 100644
--- a/test/unit/lib/bdev/gpt/gpt.c/Makefile
+++ b/test/unit/lib/bdev/gpt/gpt.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c
index 72c68cfce..7b23c8e2c 100644
--- a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c
+++ b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/mt/Makefile b/test/unit/lib/bdev/mt/Makefile
index c5cf91233..8111178c9 100644
--- a/test/unit/lib/bdev/mt/Makefile
+++ b/test/unit/lib/bdev/mt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/mt/bdev.c/Makefile b/test/unit/lib/bdev/mt/bdev.c/Makefile
index 40886277c..e4e5ff5d9 100644
--- a/test/unit/lib/bdev/mt/bdev.c/Makefile
+++ b/test/unit/lib/bdev/mt/bdev.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c
index 1af31c8ff..d85895383 100644
--- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c
+++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/nvme/Makefile b/test/unit/lib/bdev/nvme/Makefile
index ab9505f10..9d86b70db 100644
--- a/test/unit/lib/bdev/nvme/Makefile
+++ b/test/unit/lib/bdev/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2021 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/nvme/bdev_nvme.c/Makefile b/test/unit/lib/bdev/nvme/bdev_nvme.c/Makefile
index a21d2b9ec..d6b657edf 100644
--- a/test/unit/lib/bdev/nvme/bdev_nvme.c/Makefile
+++ b/test/unit/lib/bdev/nvme/bdev_nvme.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
index 827bfed93..fb69de14a 100644
--- a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
+++ b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/part.c/Makefile b/test/unit/lib/bdev/part.c/Makefile
index 7e5f99d18..d2f9f8677 100644
--- a/test/unit/lib/bdev/part.c/Makefile
+++ b/test/unit/lib/bdev/part.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c
index c66ffac96..10b14b1c6 100644
--- a/test/unit/lib/bdev/part.c/part_ut.c
+++ b/test/unit/lib/bdev/part.c/part_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/pmem/Makefile b/test/unit/lib/bdev/pmem/Makefile
index a56dfd33a..84625a8ea 100644
--- a/test/unit/lib/bdev/pmem/Makefile
+++ b/test/unit/lib/bdev/pmem/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
index e985344ae..2e4ce1bfa 100644
--- a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
+++ b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/raid/Makefile b/test/unit/lib/bdev/raid/Makefile
index 8eb519607..4e306930d 100644
--- a/test/unit/lib/bdev/raid/Makefile
+++ b/test/unit/lib/bdev/raid/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/raid/bdev_raid.c/Makefile b/test/unit/lib/bdev/raid/bdev_raid.c/Makefile
index 7ad4ebf8c..d48abda32 100644
--- a/test/unit/lib/bdev/raid/bdev_raid.c/Makefile
+++ b/test/unit/lib/bdev/raid/bdev_raid.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
index f098ff233..9a5462351 100644
--- a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
+++ b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/raid/concat.c/Makefile b/test/unit/lib/bdev/raid/concat.c/Makefile
index 2a07a2be3..5bfd9a087 100644
--- a/test/unit/lib/bdev/raid/concat.c/Makefile
+++ b/test/unit/lib/bdev/raid/concat.c/Makefile
@@ -1,3 +1,6 @@
+#  SPDX-License-Identifier: BSD-3-Clause
+#
+
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../../..)
 
 TEST_FILE = concat_ut.c
diff --git a/test/unit/lib/bdev/raid/concat.c/concat_ut.c b/test/unit/lib/bdev/raid/concat.c/concat_ut.c
index 45295a606..2fe99b67b 100644
--- a/test/unit/lib/bdev/raid/concat.c/concat_ut.c
+++ b/test/unit/lib/bdev/raid/concat.c/concat_ut.c
@@ -1,3 +1,8 @@
+/*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2022 Intel Corporation.
+ *   All rights reserved.
+ */
+
 #include "spdk/stdinc.h"
 #include "spdk_cunit.h"
 #include "spdk/env.h"
diff --git a/test/unit/lib/bdev/raid/raid5f.c/Makefile b/test/unit/lib/bdev/raid/raid5f.c/Makefile
index 2d82c3176..7d0436149 100644
--- a/test/unit/lib/bdev/raid/raid5f.c/Makefile
+++ b/test/unit/lib/bdev/raid/raid5f.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c b/test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c
index 5b9a8552d..4efa743c2 100644
--- a/test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c
+++ b/test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/scsi_nvme.c/Makefile b/test/unit/lib/bdev/scsi_nvme.c/Makefile
index 5d06723e4..2d267d244 100644
--- a/test/unit/lib/bdev/scsi_nvme.c/Makefile
+++ b/test/unit/lib/bdev/scsi_nvme.c/Makefile
@@ -1,4 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (C) 2016 Intel Corporation.
 #  Copyright (c) 2016 FUJITSU LIMITED, All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c b/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c
index 3525bc3da..ccd728429 100644
--- a/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c
+++ b/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2017 Intel Corporation.
  *   Copyright (c) 2016 FUJITSU LIMITED, All rights reserved.
  */
 
diff --git a/test/unit/lib/bdev/vbdev_lvol.c/Makefile b/test/unit/lib/bdev/vbdev_lvol.c/Makefile
index 8ea15558e..5e8f2e1ed 100644
--- a/test/unit/lib/bdev/vbdev_lvol.c/Makefile
+++ b/test/unit/lib/bdev/vbdev_lvol.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
index 23232a434..0b349a50a 100644
--- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
+++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/bdev/vbdev_zone_block.c/Makefile b/test/unit/lib/bdev/vbdev_zone_block.c/Makefile
index 637dd9b7a..88e5c067f 100644
--- a/test/unit/lib/bdev/vbdev_zone_block.c/Makefile
+++ b/test/unit/lib/bdev/vbdev_zone_block.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
index b56b3830f..645848624 100644
--- a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
+++ b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blob/Makefile b/test/unit/lib/blob/Makefile
index 56f345508..9e4a04ac1 100644
--- a/test/unit/lib/blob/Makefile
+++ b/test/unit/lib/blob/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blob/blob.c/Makefile b/test/unit/lib/blob/blob.c/Makefile
index a2cdfda18..0676d8f32 100644
--- a/test/unit/lib/blob/blob.c/Makefile
+++ b/test/unit/lib/blob/blob.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c
index 87658ada7..f22192f9e 100644
--- a/test/unit/lib/blob/blob.c/blob_ut.c
+++ b/test/unit/lib/blob/blob.c/blob_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/blob/bs_dev_common.c b/test/unit/lib/blob/bs_dev_common.c
index 32f3dd7e7..e8cff2efe 100644
--- a/test/unit/lib/blob/bs_dev_common.c
+++ b/test/unit/lib/blob/bs_dev_common.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blob/bs_scheduler.c b/test/unit/lib/blob/bs_scheduler.c
index 1d8e97e2b..d00c97068 100644
--- a/test/unit/lib/blob/bs_scheduler.c
+++ b/test/unit/lib/blob/bs_scheduler.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blobfs/Makefile b/test/unit/lib/blobfs/Makefile
index 415b34101..2468f2640 100644
--- a/test/unit/lib/blobfs/Makefile
+++ b/test/unit/lib/blobfs/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blobfs/blobfs_async_ut/Makefile b/test/unit/lib/blobfs/blobfs_async_ut/Makefile
index f5c8cd258..375879b14 100644
--- a/test/unit/lib/blobfs/blobfs_async_ut/Makefile
+++ b/test/unit/lib/blobfs/blobfs_async_ut/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
index 0709c1063..d555772b2 100644
--- a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
+++ b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blobfs/blobfs_bdev.c/Makefile b/test/unit/lib/blobfs/blobfs_bdev.c/Makefile
index 4a8efdcf9..9389789df 100644
--- a/test/unit/lib/blobfs/blobfs_bdev.c/Makefile
+++ b/test/unit/lib/blobfs/blobfs_bdev.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c b/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
index 5c1f9eada..6a885859e 100644
--- a/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
+++ b/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/Makefile b/test/unit/lib/blobfs/blobfs_sync_ut/Makefile
index 4f1c3f02a..034900f5a 100644
--- a/test/unit/lib/blobfs/blobfs_sync_ut/Makefile
+++ b/test/unit/lib/blobfs/blobfs_sync_ut/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
index 8ed7e2f6b..f8827b3d0 100644
--- a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
+++ b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/blobfs/tree.c/Makefile b/test/unit/lib/blobfs/tree.c/Makefile
index a8421c38a..3ca8748f4 100644
--- a/test/unit/lib/blobfs/tree.c/Makefile
+++ b/test/unit/lib/blobfs/tree.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/blobfs/tree.c/tree_ut.c b/test/unit/lib/blobfs/tree.c/tree_ut.c
index 056bb277b..561c55519 100644
--- a/test/unit/lib/blobfs/tree.c/tree_ut.c
+++ b/test/unit/lib/blobfs/tree.c/tree_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/env_dpdk/Makefile b/test/unit/lib/env_dpdk/Makefile
index 0f15c3b20..d9fff0378 100644
--- a/test/unit/lib/env_dpdk/Makefile
+++ b/test/unit/lib/env_dpdk/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/env_dpdk/pci_event.c/Makefile b/test/unit/lib/env_dpdk/pci_event.c/Makefile
index 2acf30ef9..cb567d99e 100644
--- a/test/unit/lib/env_dpdk/pci_event.c/Makefile
+++ b/test/unit/lib/env_dpdk/pci_event.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c b/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
index 6841b0b74..ba98cc11c 100644
--- a/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
+++ b/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/event/Makefile b/test/unit/lib/event/Makefile
index 92b536a44..aadc5e75f 100644
--- a/test/unit/lib/event/Makefile
+++ b/test/unit/lib/event/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/event/app.c/Makefile b/test/unit/lib/event/app.c/Makefile
index b4ff971e9..e52334dd3 100644
--- a/test/unit/lib/event/app.c/Makefile
+++ b/test/unit/lib/event/app.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/event/app.c/app_ut.c b/test/unit/lib/event/app.c/app_ut.c
index f887a120d..d5a8e3792 100644
--- a/test/unit/lib/event/app.c/app_ut.c
+++ b/test/unit/lib/event/app.c/app_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/event/reactor.c/Makefile b/test/unit/lib/event/reactor.c/Makefile
index 7a40192ab..7e8cb6bda 100644
--- a/test/unit/lib/event/reactor.c/Makefile
+++ b/test/unit/lib/event/reactor.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/event/reactor.c/reactor_ut.c b/test/unit/lib/event/reactor.c/reactor_ut.c
index 0c6ded694..98c4787ca 100644
--- a/test/unit/lib/event/reactor.c/reactor_ut.c
+++ b/test/unit/lib/event/reactor.c/reactor_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/Makefile b/test/unit/lib/ftl/Makefile
index f358fc2bd..b1013628f 100644
--- a/test/unit/lib/ftl/Makefile
+++ b/test/unit/lib/ftl/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/common/utils.c b/test/unit/lib/ftl/common/utils.c
index 5a7dfc7e7..dd4b03282 100644
--- a/test/unit/lib/ftl/common/utils.c
+++ b/test/unit/lib/ftl/common/utils.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_band.c/Makefile b/test/unit/lib/ftl/ftl_band.c/Makefile
index 434f4968a..c32233e44 100644
--- a/test/unit/lib/ftl/ftl_band.c/Makefile
+++ b/test/unit/lib/ftl/ftl_band.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_band.c/ftl_band_ut.c b/test/unit/lib/ftl/ftl_band.c/ftl_band_ut.c
index 50c51666a..f31a5e67a 100644
--- a/test/unit/lib/ftl/ftl_band.c/ftl_band_ut.c
+++ b/test/unit/lib/ftl/ftl_band.c/ftl_band_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_bitmap.c/Makefile b/test/unit/lib/ftl/ftl_bitmap.c/Makefile
index 66e0d9cee..0e02ff26f 100644
--- a/test/unit/lib/ftl/ftl_bitmap.c/Makefile
+++ b/test/unit/lib/ftl/ftl_bitmap.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_bitmap.c/ftl_bitmap_ut.c b/test/unit/lib/ftl/ftl_bitmap.c/ftl_bitmap_ut.c
index a744bb53d..2c1c0a7cb 100644
--- a/test/unit/lib/ftl/ftl_bitmap.c/ftl_bitmap_ut.c
+++ b/test/unit/lib/ftl/ftl_bitmap.c/ftl_bitmap_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_io.c/Makefile b/test/unit/lib/ftl/ftl_io.c/Makefile
index b60122ce6..8a72e20d4 100644
--- a/test/unit/lib/ftl/ftl_io.c/Makefile
+++ b/test/unit/lib/ftl/ftl_io.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_io.c/ftl_io_ut.c b/test/unit/lib/ftl/ftl_io.c/ftl_io_ut.c
index 226ad20b7..611252451 100644
--- a/test/unit/lib/ftl/ftl_io.c/ftl_io_ut.c
+++ b/test/unit/lib/ftl/ftl_io.c/ftl_io_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_l2p/Makefile b/test/unit/lib/ftl/ftl_l2p/Makefile
index 82f6b11a9..d62b0e94a 100644
--- a/test/unit/lib/ftl/ftl_l2p/Makefile
+++ b/test/unit/lib/ftl/ftl_l2p/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_l2p/ftl_l2p_ut.c b/test/unit/lib/ftl/ftl_l2p/ftl_l2p_ut.c
index 96df69d13..87e6d226c 100644
--- a/test/unit/lib/ftl/ftl_l2p/ftl_l2p_ut.c
+++ b/test/unit/lib/ftl/ftl_l2p/ftl_l2p_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_layout_upgrade/Makefile b/test/unit/lib/ftl/ftl_layout_upgrade/Makefile
index 4cdd661af..739850d16 100644
--- a/test/unit/lib/ftl/ftl_layout_upgrade/Makefile
+++ b/test/unit/lib/ftl/ftl_layout_upgrade/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_layout_upgrade/ftl_layout_upgrade_ut.c b/test/unit/lib/ftl/ftl_layout_upgrade/ftl_layout_upgrade_ut.c
index 3798f0333..551aca7a2 100644
--- a/test/unit/lib/ftl/ftl_layout_upgrade/ftl_layout_upgrade_ut.c
+++ b/test/unit/lib/ftl/ftl_layout_upgrade/ftl_layout_upgrade_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_mempool.c/Makefile b/test/unit/lib/ftl/ftl_mempool.c/Makefile
index 6b8f06b2e..feedf8eca 100644
--- a/test/unit/lib/ftl/ftl_mempool.c/Makefile
+++ b/test/unit/lib/ftl/ftl_mempool.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_mempool.c/ftl_mempool_ut.c b/test/unit/lib/ftl/ftl_mempool.c/ftl_mempool_ut.c
index 3030e798b..d228e9f88 100644
--- a/test/unit/lib/ftl/ftl_mempool.c/ftl_mempool_ut.c
+++ b/test/unit/lib/ftl/ftl_mempool.c/ftl_mempool_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_mngt/Makefile b/test/unit/lib/ftl/ftl_mngt/Makefile
index ab8ea5709..ced5e425f 100644
--- a/test/unit/lib/ftl/ftl_mngt/Makefile
+++ b/test/unit/lib/ftl/ftl_mngt/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_mngt/ftl_mngt_ut.c b/test/unit/lib/ftl/ftl_mngt/ftl_mngt_ut.c
index f86e6c87b..143972a9a 100644
--- a/test/unit/lib/ftl/ftl_mngt/ftl_mngt_ut.c
+++ b/test/unit/lib/ftl/ftl_mngt/ftl_mngt_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/ftl/ftl_sb/Makefile b/test/unit/lib/ftl/ftl_sb/Makefile
index eb64910db..36b7a9956 100644
--- a/test/unit/lib/ftl/ftl_sb/Makefile
+++ b/test/unit/lib/ftl/ftl_sb/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2022 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ftl/ftl_sb/ftl_sb_ut.c b/test/unit/lib/ftl/ftl_sb/ftl_sb_ut.c
index d1722e215..dfc4a6ca6 100644
--- a/test/unit/lib/ftl/ftl_sb/ftl_sb_ut.c
+++ b/test/unit/lib/ftl/ftl_sb/ftl_sb_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/idxd/Makefile b/test/unit/lib/idxd/Makefile
index 368a9301a..66e542a6a 100644
--- a/test/unit/lib/idxd/Makefile
+++ b/test/unit/lib/idxd/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/idxd/idxd_user.c/Makefile b/test/unit/lib/idxd/idxd_user.c/Makefile
index 2ac3186ec..48669187e 100644
--- a/test/unit/lib/idxd/idxd_user.c/Makefile
+++ b/test/unit/lib/idxd/idxd_user.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
index 1d9e004b3..4af93bc6d 100644
--- a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
+++ b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/init/Makefile b/test/unit/lib/init/Makefile
index ae4c7d0f2..6f63d3384 100644
--- a/test/unit/lib/init/Makefile
+++ b/test/unit/lib/init/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/init/subsystem.c/Makefile b/test/unit/lib/init/subsystem.c/Makefile
index c43376202..243097f2d 100644
--- a/test/unit/lib/init/subsystem.c/Makefile
+++ b/test/unit/lib/init/subsystem.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/init/subsystem.c/subsystem_ut.c b/test/unit/lib/init/subsystem.c/subsystem_ut.c
index 8f3e712ff..3197dc138 100644
--- a/test/unit/lib/init/subsystem.c/subsystem_ut.c
+++ b/test/unit/lib/init/subsystem.c/subsystem_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/ioat/Makefile b/test/unit/lib/ioat/Makefile
index c8c2113e7..4f36ba69a 100644
--- a/test/unit/lib/ioat/Makefile
+++ b/test/unit/lib/ioat/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ioat/ioat.c/Makefile b/test/unit/lib/ioat/ioat.c/Makefile
index 152cc537e..4b583f00f 100644
--- a/test/unit/lib/ioat/ioat.c/Makefile
+++ b/test/unit/lib/ioat/ioat.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/ioat/ioat.c/ioat_ut.c b/test/unit/lib/ioat/ioat.c/ioat_ut.c
index 450431895..b9ceccbaf 100644
--- a/test/unit/lib/ioat/ioat.c/ioat_ut.c
+++ b/test/unit/lib/ioat/ioat.c/ioat_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/iscsi/Makefile b/test/unit/lib/iscsi/Makefile
index 187a6b917..0b4e21c55 100644
--- a/test/unit/lib/iscsi/Makefile
+++ b/test/unit/lib/iscsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/common.c b/test/unit/lib/iscsi/common.c
index e030d1890..1e434a907 100644
--- a/test/unit/lib/iscsi/common.c
+++ b/test/unit/lib/iscsi/common.c
@@ -1,3 +1,8 @@
+/*  SPDX-License-Identifier: BSD-3-Clause
+ *  Copyright (C) 2016 Intel Corporation.
+ *  All rights reserved.
+ */
+
 #include "iscsi/task.h"
 #include "iscsi/iscsi.h"
 #include "iscsi/conn.h"
diff --git a/test/unit/lib/iscsi/conn.c/Makefile b/test/unit/lib/iscsi/conn.c/Makefile
index dfea703bd..afca5d6f7 100644
--- a/test/unit/lib/iscsi/conn.c/Makefile
+++ b/test/unit/lib/iscsi/conn.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/conn.c/conn_ut.c b/test/unit/lib/iscsi/conn.c/conn_ut.c
index 93869c208..9e682b4bf 100644
--- a/test/unit/lib/iscsi/conn.c/conn_ut.c
+++ b/test/unit/lib/iscsi/conn.c/conn_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/iscsi/init_grp.c/Makefile b/test/unit/lib/iscsi/init_grp.c/Makefile
index 2b37407c7..769827fb8 100644
--- a/test/unit/lib/iscsi/init_grp.c/Makefile
+++ b/test/unit/lib/iscsi/init_grp.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c b/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c
index c98123c43..df81eda6c 100644
--- a/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c
+++ b/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c
@@ -1,7 +1,8 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
+
 #include "spdk/stdinc.h"
 
 #include "spdk_cunit.h"
diff --git a/test/unit/lib/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile
index ec95d0607..9f82f2e05 100644
--- a/test/unit/lib/iscsi/iscsi.c/Makefile
+++ b/test/unit/lib/iscsi/iscsi.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
index f08dba23b..d728715eb 100644
--- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
+++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/iscsi/param.c/Makefile b/test/unit/lib/iscsi/param.c/Makefile
index b93b988f4..cd6ceb910 100644
--- a/test/unit/lib/iscsi/param.c/Makefile
+++ b/test/unit/lib/iscsi/param.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/param.c/param_ut.c b/test/unit/lib/iscsi/param.c/param_ut.c
index 5825b14b1..bb78c81ab 100644
--- a/test/unit/lib/iscsi/param.c/param_ut.c
+++ b/test/unit/lib/iscsi/param.c/param_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/iscsi/portal_grp.c/Makefile b/test/unit/lib/iscsi/portal_grp.c/Makefile
index 6b3a2781d..d3bdb0669 100644
--- a/test/unit/lib/iscsi/portal_grp.c/Makefile
+++ b/test/unit/lib/iscsi/portal_grp.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2018 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
index 1c6af7059..60a503826 100644
--- a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
+++ b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/iscsi/tgt_node.c/Makefile b/test/unit/lib/iscsi/tgt_node.c/Makefile
index 2b2f16193..4517b32fb 100644
--- a/test/unit/lib/iscsi/tgt_node.c/Makefile
+++ b/test/unit/lib/iscsi/tgt_node.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
index 1cb6838bc..1eb7ddf93 100644
--- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
+++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/json/Makefile b/test/unit/lib/json/Makefile
index 5d2e6adf4..fedd89b86 100644
--- a/test/unit/lib/json/Makefile
+++ b/test/unit/lib/json/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/json/json_parse.c/Makefile b/test/unit/lib/json/json_parse.c/Makefile
index 485bedf66..7f6e491a3 100644
--- a/test/unit/lib/json/json_parse.c/Makefile
+++ b/test/unit/lib/json/json_parse.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/json/json_parse.c/json_parse_ut.c b/test/unit/lib/json/json_parse.c/json_parse_ut.c
index 2ee1110ec..2b52ef20b 100644
--- a/test/unit/lib/json/json_parse.c/json_parse_ut.c
+++ b/test/unit/lib/json/json_parse.c/json_parse_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/json/json_util.c/Makefile b/test/unit/lib/json/json_util.c/Makefile
index 5f161001f..6fff013cd 100644
--- a/test/unit/lib/json/json_util.c/Makefile
+++ b/test/unit/lib/json/json_util.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/json/json_util.c/json_util_ut.c b/test/unit/lib/json/json_util.c/json_util_ut.c
index c9e7c8977..74867aeb5 100644
--- a/test/unit/lib/json/json_util.c/json_util_ut.c
+++ b/test/unit/lib/json/json_util.c/json_util_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/json/json_write.c/Makefile b/test/unit/lib/json/json_write.c/Makefile
index 4c31ee473..04c96da89 100644
--- a/test/unit/lib/json/json_write.c/Makefile
+++ b/test/unit/lib/json/json_write.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/json/json_write.c/json_write_ut.c b/test/unit/lib/json/json_write.c/json_write_ut.c
index 8c642da82..220fd28ee 100644
--- a/test/unit/lib/json/json_write.c/json_write_ut.c
+++ b/test/unit/lib/json/json_write.c/json_write_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/json_mock.c b/test/unit/lib/json_mock.c
index 6107e1ad3..b7abd432c 100644
--- a/test/unit/lib/json_mock.c
+++ b/test/unit/lib/json_mock.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/jsonrpc/Makefile b/test/unit/lib/jsonrpc/Makefile
index 82487d5c4..6c306aaee 100644
--- a/test/unit/lib/jsonrpc/Makefile
+++ b/test/unit/lib/jsonrpc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
index a53445346..342c0186a 100644
--- a/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
index a5dc6f1bc..91e969cef 100644
--- a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/log/Makefile b/test/unit/lib/log/Makefile
index 2de0bd8c7..6e43e9591 100644
--- a/test/unit/lib/log/Makefile
+++ b/test/unit/lib/log/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/log/log.c/Makefile b/test/unit/lib/log/log.c/Makefile
index 447a747eb..d2418c110 100644
--- a/test/unit/lib/log/log.c/Makefile
+++ b/test/unit/lib/log/log.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/log/log.c/log_ut.c b/test/unit/lib/log/log.c/log_ut.c
index 3d11e22ee..2ac149fc3 100644
--- a/test/unit/lib/log/log.c/log_ut.c
+++ b/test/unit/lib/log/log.c/log_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/lvol/Makefile b/test/unit/lib/lvol/Makefile
index 4979f5acf..fae68975b 100644
--- a/test/unit/lib/lvol/Makefile
+++ b/test/unit/lib/lvol/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/lvol/lvol.c/Makefile b/test/unit/lib/lvol/lvol.c/Makefile
index ab2606f37..e46a2d6f5 100644
--- a/test/unit/lib/lvol/lvol.c/Makefile
+++ b/test/unit/lib/lvol/lvol.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/lvol/lvol.c/lvol_ut.c b/test/unit/lib/lvol/lvol.c/lvol_ut.c
index e8bfb159e..63d922c50 100644
--- a/test/unit/lib/lvol/lvol.c/lvol_ut.c
+++ b/test/unit/lib/lvol/lvol.c/lvol_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/notify/Makefile b/test/unit/lib/notify/Makefile
index a0a18d133..aff1666ae 100644
--- a/test/unit/lib/notify/Makefile
+++ b/test/unit/lib/notify/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/notify/notify.c/Makefile b/test/unit/lib/notify/notify.c/Makefile
index d0e5a2003..18b54ad52 100644
--- a/test/unit/lib/notify/notify.c/Makefile
+++ b/test/unit/lib/notify/notify.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/notify/notify.c/notify_ut.c b/test/unit/lib/notify/notify.c/notify_ut.c
index 19045e2f8..af648537b 100644
--- a/test/unit/lib/notify/notify.c/notify_ut.c
+++ b/test/unit/lib/notify/notify.c/notify_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/Makefile b/test/unit/lib/nvme/Makefile
index 45b5b4821..c322e09f7 100644
--- a/test/unit/lib/nvme/Makefile
+++ b/test/unit/lib/nvme/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme.c/Makefile b/test/unit/lib/nvme/nvme.c/Makefile
index 61547ebd9..bc7e32af5 100644
--- a/test/unit/lib/nvme/nvme.c/Makefile
+++ b/test/unit/lib/nvme/nvme.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme.c/nvme_ut.c b/test/unit/lib/nvme/nvme.c/nvme_ut.c
index 9a26ec12b..bd6cf3644 100644
--- a/test/unit/lib/nvme/nvme.c/nvme_ut.c
+++ b/test/unit/lib/nvme/nvme.c/nvme_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile
index 37478ae83..e20a76b7f 100644
--- a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
index 9ba013890..1efa88c25 100644
--- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020, 2021 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile
index 1df89fe77..9374b0622 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
index 05be242b2..0a0142aa9 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
@@ -1,6 +1,6 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2015 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/Makefile
index a144da6e7..89516b6f6 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
index 9bcc5ce77..90b15670d 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_cuse.c/Makefile b/test/unit/lib/nvme/nvme_cuse.c/Makefile
index e1e67839d..2179bd98b 100644
--- a/test/unit/lib/nvme/nvme_cuse.c/Makefile
+++ b/test/unit/lib/nvme/nvme_cuse.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c b/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
index 08a7e0324..279acb839 100644
--- a/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
+++ b/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_fabric.c/Makefile b/test/unit/lib/nvme/nvme_fabric.c/Makefile
index 79afc78c3..7c497df2d 100644
--- a/test/unit/lib/nvme/nvme_fabric.c/Makefile
+++ b/test/unit/lib/nvme/nvme_fabric.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
index ec174b9d2..ee7e17466 100644
--- a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
+++ b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_io_msg.c/Makefile b/test/unit/lib/nvme/nvme_io_msg.c/Makefile
index b15f5727c..e55e0b2bc 100644
--- a/test/unit/lib/nvme/nvme_io_msg.c/Makefile
+++ b/test/unit/lib/nvme/nvme_io_msg.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c b/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
index 2e1fc6abe..583221ccb 100644
--- a/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
+++ b/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_ns.c/Makefile b/test/unit/lib/nvme/nvme_ns.c/Makefile
index 5c3b46a0e..4798d2b7d 100644
--- a/test/unit/lib/nvme/nvme_ns.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ns.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
index 5de3fdf0d..e83a87526 100644
--- a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
+++ b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2017 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
index ee7916df3..14e229c8d 100644
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
index 67587233d..4630f2105 100644
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/Makefile b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/Makefile
index 54c1e26da..0df1cb220 100644
--- a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
index 33e69394e..535d689b6 100644
--- a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_opal.c/Makefile b/test/unit/lib/nvme/nvme_opal.c/Makefile
index 1e2d9ac3d..f78fdc836 100644
--- a/test/unit/lib/nvme/nvme_opal.c/Makefile
+++ b/test/unit/lib/nvme/nvme_opal.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c b/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
index 989028413..728c2d3cf 100644
--- a/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
+++ b/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_pcie.c/Makefile b/test/unit/lib/nvme/nvme_pcie.c/Makefile
index b6cdfaeb2..9d16a26d5 100644
--- a/test/unit/lib/nvme/nvme_pcie.c/Makefile
+++ b/test/unit/lib/nvme/nvme_pcie.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
index 863cee4eb..8c22dfbe6 100644
--- a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_pcie_common.c/Makefile b/test/unit/lib/nvme/nvme_pcie_common.c/Makefile
index f2a209492..f755d6d44 100644
--- a/test/unit/lib/nvme/nvme_pcie_common.c/Makefile
+++ b/test/unit/lib/nvme/nvme_pcie_common.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c b/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
index 2fe95d791..8293bfb9d 100644
--- a/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_poll_group.c/Makefile b/test/unit/lib/nvme/nvme_poll_group.c/Makefile
index 754e478f0..1d574466d 100644
--- a/test/unit/lib/nvme/nvme_poll_group.c/Makefile
+++ b/test/unit/lib/nvme/nvme_poll_group.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_poll_group.c/nvme_poll_group_ut.c b/test/unit/lib/nvme/nvme_poll_group.c/nvme_poll_group_ut.c
index 691645df6..1feaa4d03 100644
--- a/test/unit/lib/nvme/nvme_poll_group.c/nvme_poll_group_ut.c
+++ b/test/unit/lib/nvme/nvme_poll_group.c/nvme_poll_group_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_qpair.c/Makefile b/test/unit/lib/nvme/nvme_qpair.c/Makefile
index 60971f291..a6e405b24 100644
--- a/test/unit/lib/nvme/nvme_qpair.c/Makefile
+++ b/test/unit/lib/nvme/nvme_qpair.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
index 6307af237..a5cf6dbe2 100644
--- a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
+++ b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2015 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_quirks.c/Makefile b/test/unit/lib/nvme/nvme_quirks.c/Makefile
index 770713b1c..78fab3a10 100644
--- a/test/unit/lib/nvme/nvme_quirks.c/Makefile
+++ b/test/unit/lib/nvme/nvme_quirks.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
index 86c55debf..cb6495769 100644
--- a/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
+++ b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_rdma.c/Makefile b/test/unit/lib/nvme/nvme_rdma.c/Makefile
index e07af35a8..ebcc6a28c 100644
--- a/test/unit/lib/nvme/nvme_rdma.c/Makefile
+++ b/test/unit/lib/nvme/nvme_rdma.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
index 32c989ec9..565687487 100644
--- a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
+++ b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvme/nvme_tcp.c/Makefile b/test/unit/lib/nvme/nvme_tcp.c/Makefile
index 20c0a28dc..daf67aaa7 100644
--- a/test/unit/lib/nvme/nvme_tcp.c/Makefile
+++ b/test/unit/lib/nvme/nvme_tcp.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2017 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c b/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
index adc32b80e..46dfd24a7 100644
--- a/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
+++ b/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021,2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvme/nvme_transport.c/Makefile b/test/unit/lib/nvme/nvme_transport.c/Makefile
index cc0f0fb06..31e9ef70a 100644
--- a/test/unit/lib/nvme/nvme_transport.c/Makefile
+++ b/test/unit/lib/nvme/nvme_transport.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c b/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
index 982f927de..d669c9a47 100644
--- a/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
+++ b/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021, 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvmf/Makefile b/test/unit/lib/nvmf/Makefile
index d0eb0b298..3689361e5 100644
--- a/test/unit/lib/nvmf/Makefile
+++ b/test/unit/lib/nvmf/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/ctrlr.c/Makefile b/test/unit/lib/nvmf/ctrlr.c/Makefile
index 8e113d9db..60ac81843 100644
--- a/test/unit/lib/nvmf/ctrlr.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
index ccf8c0120..0edfaa1e8 100644
--- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
+++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile b/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
index 968eb6e77..6b1f8e095 100644
--- a/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr_bdev.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
index 2a610d976..d7254a710 100644
--- a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
index 11fd41359..353b0691d 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
index 3f4568044..8f61ea53d 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c
index 40806f68f..ac173eaa5 100644
--- a/test/unit/lib/nvmf/fc.c/fc_ut.c
+++ b/test/unit/lib/nvmf/fc.c/fc_ut.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2019 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  */
diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
index ffb462f42..91bffa084 100644
--- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
+++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
@@ -1,4 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (C) 2020 Intel Corporation.
  *   Copyright (c) 2018-2019 Broadcom.  All Rights Reserved.
  *   The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  */
diff --git a/test/unit/lib/nvmf/nvmf.c/Makefile b/test/unit/lib/nvmf/nvmf.c/Makefile
index 1ff831d30..11b82aaf0 100644
--- a/test/unit/lib/nvmf/nvmf.c/Makefile
+++ b/test/unit/lib/nvmf/nvmf.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
index 3419069aa..9b17e3c2f 100644
--- a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
+++ b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvmf/rdma.c/Makefile b/test/unit/lib/nvmf/rdma.c/Makefile
index 5c5f451f1..6171484a0 100644
--- a/test/unit/lib/nvmf/rdma.c/Makefile
+++ b/test/unit/lib/nvmf/rdma.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/rdma.c/rdma_ut.c b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
index 7ec495819..ae44b29c9 100644
--- a/test/unit/lib/nvmf/rdma.c/rdma_ut.c
+++ b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019, 2021 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvmf/subsystem.c/Makefile b/test/unit/lib/nvmf/subsystem.c/Makefile
index 295a75156..19c07bd0e 100644
--- a/test/unit/lib/nvmf/subsystem.c/Makefile
+++ b/test/unit/lib/nvmf/subsystem.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
index 2c34396b3..faf803852 100644
--- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
+++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2016 Intel Corporation. All rights reserved.
  *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.
  */
 
diff --git a/test/unit/lib/nvmf/tcp.c/Makefile b/test/unit/lib/nvmf/tcp.c/Makefile
index 8d91f9be1..9fe240b6f 100644
--- a/test/unit/lib/nvmf/tcp.c/Makefile
+++ b/test/unit/lib/nvmf/tcp.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
index 158b8a79d..9a4ade7c2 100644
--- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c
+++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/nvmf/transport.c/Makefile b/test/unit/lib/nvmf/transport.c/Makefile
index dfbdd1c9f..afcb1f213 100644
--- a/test/unit/lib/nvmf/transport.c/Makefile
+++ b/test/unit/lib/nvmf/transport.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/transport.c/transport_ut.c b/test/unit/lib/nvmf/transport.c/transport_ut.c
index 428be0dbe..fd7e8ade4 100644
--- a/test/unit/lib/nvmf/transport.c/transport_ut.c
+++ b/test/unit/lib/nvmf/transport.c/transport_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/test/unit/lib/nvmf/vfio_user.c/Makefile b/test/unit/lib/nvmf/vfio_user.c/Makefile
index 3ff63b938..258d625ef 100644
--- a/test/unit/lib/nvmf/vfio_user.c/Makefile
+++ b/test/unit/lib/nvmf/vfio_user.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c b/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
index 0fa094954..1feeddd29 100644
--- a/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
+++ b/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2021 Intel Corporation. All rights reserved.
  */
 
 #include "spdk/stdinc.h"
diff --git a/test/unit/lib/reduce/Makefile b/test/unit/lib/reduce/Makefile
index c8a5802a7..22bfa24ba 100644
--- a/test/unit/lib/reduce/Makefile
+++ b/test/unit/lib/reduce/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/reduce/reduce.c/Makefile b/test/unit/lib/reduce/reduce.c/Makefile
index ea995198b..8282a845c 100644
--- a/test/unit/lib/reduce/reduce.c/Makefile
+++ b/test/unit/lib/reduce/reduce.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/reduce/reduce.c/reduce_ut.c b/test/unit/lib/reduce/reduce.c/reduce_ut.c
index c434e44b1..61c476212 100644
--- a/test/unit/lib/reduce/reduce.c/reduce_ut.c
+++ b/test/unit/lib/reduce/reduce.c/reduce_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/rpc/Makefile b/test/unit/lib/rpc/Makefile
index e5cc1648d..54984cbe3 100644
--- a/test/unit/lib/rpc/Makefile
+++ b/test/unit/lib/rpc/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/rpc/rpc.c/Makefile b/test/unit/lib/rpc/rpc.c/Makefile
index c945385c0..6340c81c3 100644
--- a/test/unit/lib/rpc/rpc.c/Makefile
+++ b/test/unit/lib/rpc/rpc.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/rpc/rpc.c/rpc_ut.c b/test/unit/lib/rpc/rpc.c/rpc_ut.c
index 37a35624a..a5b833964 100644
--- a/test/unit/lib/rpc/rpc.c/rpc_ut.c
+++ b/test/unit/lib/rpc/rpc.c/rpc_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2021 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/scsi/Makefile b/test/unit/lib/scsi/Makefile
index 292c03c8b..45f1a688a 100644
--- a/test/unit/lib/scsi/Makefile
+++ b/test/unit/lib/scsi/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/dev.c/Makefile b/test/unit/lib/scsi/dev.c/Makefile
index a2949f873..753677f52 100644
--- a/test/unit/lib/scsi/dev.c/Makefile
+++ b/test/unit/lib/scsi/dev.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/dev.c/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c
index 332e0608c..d378d699b 100644
--- a/test/unit/lib/scsi/dev.c/dev_ut.c
+++ b/test/unit/lib/scsi/dev.c/dev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/scsi/lun.c/Makefile b/test/unit/lib/scsi/lun.c/Makefile
index 30c4d1bcd..946b01fd5 100644
--- a/test/unit/lib/scsi/lun.c/Makefile
+++ b/test/unit/lib/scsi/lun.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c
index 2fdf2fb1e..889f96eb4 100644
--- a/test/unit/lib/scsi/lun.c/lun_ut.c
+++ b/test/unit/lib/scsi/lun.c/lun_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/scsi/scsi.c/Makefile b/test/unit/lib/scsi/scsi.c/Makefile
index d2f802adb..766233640 100644
--- a/test/unit/lib/scsi/scsi.c/Makefile
+++ b/test/unit/lib/scsi/scsi.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/scsi.c/scsi_ut.c b/test/unit/lib/scsi/scsi.c/scsi_ut.c
index f778d74a2..02eb7bfcb 100644
--- a/test/unit/lib/scsi/scsi.c/scsi_ut.c
+++ b/test/unit/lib/scsi/scsi.c/scsi_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/scsi/scsi_bdev.c/Makefile b/test/unit/lib/scsi/scsi_bdev.c/Makefile
index 21a9dd386..1e04dfab8 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/Makefile
+++ b/test/unit/lib/scsi/scsi_bdev.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
index edfa9d7e0..8e70960f1 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
+++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/scsi/scsi_pr.c/Makefile b/test/unit/lib/scsi/scsi_pr.c/Makefile
index a85b9f94d..57f94c5d7 100644
--- a/test/unit/lib/scsi/scsi_pr.c/Makefile
+++ b/test/unit/lib/scsi/scsi_pr.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/scsi/scsi_pr.c/scsi_pr_ut.c b/test/unit/lib/scsi/scsi_pr.c/scsi_pr_ut.c
index 67db56c27..b2d1331b4 100644
--- a/test/unit/lib/scsi/scsi_pr.c/scsi_pr_ut.c
+++ b/test/unit/lib/scsi/scsi_pr.c/scsi_pr_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/sock/Makefile b/test/unit/lib/sock/Makefile
index 04d77796f..7a554777b 100644
--- a/test/unit/lib/sock/Makefile
+++ b/test/unit/lib/sock/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/sock/posix.c/Makefile b/test/unit/lib/sock/posix.c/Makefile
index 4f6cecf4e..2b77b667e 100644
--- a/test/unit/lib/sock/posix.c/Makefile
+++ b/test/unit/lib/sock/posix.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/sock/posix.c/posix_ut.c b/test/unit/lib/sock/posix.c/posix_ut.c
index b8ba92147..4253034be 100644
--- a/test/unit/lib/sock/posix.c/posix_ut.c
+++ b/test/unit/lib/sock/posix.c/posix_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/sock/sock.c/Makefile b/test/unit/lib/sock/sock.c/Makefile
index e344d4b42..9a0f13b0a 100644
--- a/test/unit/lib/sock/sock.c/Makefile
+++ b/test/unit/lib/sock/sock.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/sock/sock.c/sock_ut.c b/test/unit/lib/sock/sock.c/sock_ut.c
index 952725724..db30efbd9 100644
--- a/test/unit/lib/sock/sock.c/sock_ut.c
+++ b/test/unit/lib/sock/sock.c/sock_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation. All rights reserved.
+ *   Copyright (C) 2018 Intel Corporation. All rights reserved.
  *   Copyright (c) 2020 Mellanox Technologies LTD. All rights reserved.
  *   Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  */
diff --git a/test/unit/lib/sock/uring.c/Makefile b/test/unit/lib/sock/uring.c/Makefile
index 64a77f71e..7db0e4545 100644
--- a/test/unit/lib/sock/uring.c/Makefile
+++ b/test/unit/lib/sock/uring.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/sock/uring.c/uring_ut.c b/test/unit/lib/sock/uring.c/uring_ut.c
index 5b0729462..7d2fed4c9 100644
--- a/test/unit/lib/sock/uring.c/uring_ut.c
+++ b/test/unit/lib/sock/uring.c/uring_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/thread/Makefile b/test/unit/lib/thread/Makefile
index b33ab1173..0b08bc5d3 100644
--- a/test/unit/lib/thread/Makefile
+++ b/test/unit/lib/thread/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/thread/thread.c/Makefile b/test/unit/lib/thread/thread.c/Makefile
index 5ee956586..ba82bd2c3 100644
--- a/test/unit/lib/thread/thread.c/Makefile
+++ b/test/unit/lib/thread/thread.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/thread/thread.c/thread_ut.c b/test/unit/lib/thread/thread.c/thread_ut.c
index fd3f9a8bc..01b60b56b 100644
--- a/test/unit/lib/thread/thread.c/thread_ut.c
+++ b/test/unit/lib/thread/thread.c/thread_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/Makefile b/test/unit/lib/util/Makefile
index 4304791d8..556a4e18d 100644
--- a/test/unit/lib/util/Makefile
+++ b/test/unit/lib/util/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/base64.c/Makefile b/test/unit/lib/util/base64.c/Makefile
index 5bcefd7d0..f612e2fdc 100644
--- a/test/unit/lib/util/base64.c/Makefile
+++ b/test/unit/lib/util/base64.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/base64.c/base64_ut.c b/test/unit/lib/util/base64.c/base64_ut.c
index 913fbfb2e..400d1dc3e 100644
--- a/test/unit/lib/util/base64.c/base64_ut.c
+++ b/test/unit/lib/util/base64.c/base64_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2018 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/bit_array.c/Makefile b/test/unit/lib/util/bit_array.c/Makefile
index 97c494389..9d92fb09d 100644
--- a/test/unit/lib/util/bit_array.c/Makefile
+++ b/test/unit/lib/util/bit_array.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/bit_array.c/bit_array_ut.c b/test/unit/lib/util/bit_array.c/bit_array_ut.c
index b53295bf3..f4f2fb610 100644
--- a/test/unit/lib/util/bit_array.c/bit_array_ut.c
+++ b/test/unit/lib/util/bit_array.c/bit_array_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2016 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/cpuset.c/Makefile b/test/unit/lib/util/cpuset.c/Makefile
index 288b95c65..d5a39e1a0 100644
--- a/test/unit/lib/util/cpuset.c/Makefile
+++ b/test/unit/lib/util/cpuset.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/cpuset.c/cpuset_ut.c b/test/unit/lib/util/cpuset.c/cpuset_ut.c
index a44ff9ead..440f303dd 100644
--- a/test/unit/lib/util/cpuset.c/cpuset_ut.c
+++ b/test/unit/lib/util/cpuset.c/cpuset_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/crc16.c/Makefile b/test/unit/lib/util/crc16.c/Makefile
index 8218b5b54..c6d08bd3d 100644
--- a/test/unit/lib/util/crc16.c/Makefile
+++ b/test/unit/lib/util/crc16.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/crc16.c/crc16_ut.c b/test/unit/lib/util/crc16.c/crc16_ut.c
index 4b41509de..a77e21506 100644
--- a/test/unit/lib/util/crc16.c/crc16_ut.c
+++ b/test/unit/lib/util/crc16.c/crc16_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/crc32_ieee.c/Makefile b/test/unit/lib/util/crc32_ieee.c/Makefile
index dc2569115..dcede7615 100644
--- a/test/unit/lib/util/crc32_ieee.c/Makefile
+++ b/test/unit/lib/util/crc32_ieee.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/crc32_ieee.c/crc32_ieee_ut.c b/test/unit/lib/util/crc32_ieee.c/crc32_ieee_ut.c
index 34022f9f8..8861fcb31 100644
--- a/test/unit/lib/util/crc32_ieee.c/crc32_ieee_ut.c
+++ b/test/unit/lib/util/crc32_ieee.c/crc32_ieee_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/crc32c.c/Makefile b/test/unit/lib/util/crc32c.c/Makefile
index 3dd23ddd9..f34021e25 100644
--- a/test/unit/lib/util/crc32c.c/Makefile
+++ b/test/unit/lib/util/crc32c.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/crc32c.c/crc32c_ut.c b/test/unit/lib/util/crc32c.c/crc32c_ut.c
index ea9a610d9..82d6d5e20 100644
--- a/test/unit/lib/util/crc32c.c/crc32c_ut.c
+++ b/test/unit/lib/util/crc32c.c/crc32c_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/dif.c/Makefile b/test/unit/lib/util/dif.c/Makefile
index e061164a3..bf4f0dfd4 100644
--- a/test/unit/lib/util/dif.c/Makefile
+++ b/test/unit/lib/util/dif.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2019 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/dif.c/dif_ut.c b/test/unit/lib/util/dif.c/dif_ut.c
index 07f023fe8..863c884da 100644
--- a/test/unit/lib/util/dif.c/dif_ut.c
+++ b/test/unit/lib/util/dif.c/dif_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/iov.c/Makefile b/test/unit/lib/util/iov.c/Makefile
index 2eea53203..5223ad17b 100644
--- a/test/unit/lib/util/iov.c/Makefile
+++ b/test/unit/lib/util/iov.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/iov.c/iov_ut.c b/test/unit/lib/util/iov.c/iov_ut.c
index bbef734eb..7b26cde70 100644
--- a/test/unit/lib/util/iov.c/iov_ut.c
+++ b/test/unit/lib/util/iov.c/iov_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/math.c/Makefile b/test/unit/lib/util/math.c/Makefile
index 4fff439e7..8d85e3327 100644
--- a/test/unit/lib/util/math.c/Makefile
+++ b/test/unit/lib/util/math.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/math.c/math_ut.c b/test/unit/lib/util/math.c/math_ut.c
index 38b26d0f3..8b22db277 100644
--- a/test/unit/lib/util/math.c/math_ut.c
+++ b/test/unit/lib/util/math.c/math_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2020 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/pipe.c/Makefile b/test/unit/lib/util/pipe.c/Makefile
index 0dee75c2b..cb8c0581d 100644
--- a/test/unit/lib/util/pipe.c/Makefile
+++ b/test/unit/lib/util/pipe.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/pipe.c/pipe_ut.c b/test/unit/lib/util/pipe.c/pipe_ut.c
index c4242944e..d628ca627 100644
--- a/test/unit/lib/util/pipe.c/pipe_ut.c
+++ b/test/unit/lib/util/pipe.c/pipe_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2019 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/string.c/Makefile b/test/unit/lib/util/string.c/Makefile
index c3d49e3bc..3c6b6ba86 100644
--- a/test/unit/lib/util/string.c/Makefile
+++ b/test/unit/lib/util/string.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/string.c/string_ut.c b/test/unit/lib/util/string.c/string_ut.c
index 99ab7a124..d9c218827 100644
--- a/test/unit/lib/util/string.c/string_ut.c
+++ b/test/unit/lib/util/string.c/string_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/util/xor.c/Makefile b/test/unit/lib/util/xor.c/Makefile
index 0758a3b38..61795e560 100644
--- a/test/unit/lib/util/xor.c/Makefile
+++ b/test/unit/lib/util/xor.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/util/xor.c/xor_ut.c b/test/unit/lib/util/xor.c/xor_ut.c
index 72361ee59..0953bb064 100644
--- a/test/unit/lib/util/xor.c/xor_ut.c
+++ b/test/unit/lib/util/xor.c/xor_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2022 Intel Corporation.
  *   All rights reserved.
  */
 
diff --git a/test/unit/lib/vhost/Makefile b/test/unit/lib/vhost/Makefile
index d5ebd6d2f..7a36a974d 100644
--- a/test/unit/lib/vhost/Makefile
+++ b/test/unit/lib/vhost/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/vhost/vhost.c/Makefile b/test/unit/lib/vhost/vhost.c/Makefile
index 9ee8d3f51..275cc3c68 100644
--- a/test/unit/lib/vhost/vhost.c/Makefile
+++ b/test/unit/lib/vhost/vhost.c/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2016 Intel Corporation.
 #  All rights reserved.
 #
 
diff --git a/test/unit/lib/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c
index e19645463..77fb35744 100644
--- a/test/unit/lib/vhost/vhost.c/vhost_ut.c
+++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c
@@ -1,5 +1,5 @@
 /*   SPDX-License-Identifier: BSD-3-Clause
- *   Copyright (c) Intel Corporation.
+ *   Copyright (C) 2017 Intel Corporation.
  *   All rights reserved.
  *   Copyright (c) 2021 Mellanox Technologies LTD. All rights reserved.
  */
diff --git a/vfiouserbuild/Makefile b/vfiouserbuild/Makefile
index 1968839fe..eb2b6512c 100644
--- a/vfiouserbuild/Makefile
+++ b/vfiouserbuild/Makefile
@@ -1,5 +1,5 @@
 #  SPDX-License-Identifier: BSD-3-Clause
-#  Copyright (c) Intel Corporation.
+#  Copyright (C) 2020 Intel Corporation.
 #  All rights reserved.
 #