diff --git a/catch/include/hip_test_common.hh b/catch/include/hip_test_common.hh
index 135d220d9a..e8b2f40f88 100644
--- a/catch/include/hip_test_common.hh
+++ b/catch/include/hip_test_common.hh
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/include/hip_test_helper.hh b/catch/include/hip_test_helper.hh
index db51ceecdb..1d0a57b776 100644
--- a/catch/include/hip_test_helper.hh
+++ b/catch/include/hip_test_helper.hh
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/include/hip_test_kernels.hh b/catch/include/hip_test_kernels.hh
index 999cced8c3..d871177f22 100644
--- a/catch/include/hip_test_kernels.hh
+++ b/catch/include/hip_test_kernels.hh
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/anyAll.cc b/catch/unit/deviceLib/anyAll.cc
index d7d5a0d973..1d660f7c7c 100644
--- a/catch/unit/deviceLib/anyAll.cc
+++ b/catch/unit/deviceLib/anyAll.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/ballot.cc b/catch/unit/deviceLib/ballot.cc
index 0668d51435..09de1fa5b6 100644
--- a/catch/unit/deviceLib/ballot.cc
+++ b/catch/unit/deviceLib/ballot.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/bitExtract.cc b/catch/unit/deviceLib/bitExtract.cc
index 249c0949e0..b8997db021 100644
--- a/catch/unit/deviceLib/bitExtract.cc
+++ b/catch/unit/deviceLib/bitExtract.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/bitInsert.cc b/catch/unit/deviceLib/bitInsert.cc
index e8e92f37e8..27a63663fd 100644
--- a/catch/unit/deviceLib/bitInsert.cc
+++ b/catch/unit/deviceLib/bitInsert.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/brev.cc b/catch/unit/deviceLib/brev.cc
index 5631f97679..a28c0b688c 100644
--- a/catch/unit/deviceLib/brev.cc
+++ b/catch/unit/deviceLib/brev.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/clz.cc b/catch/unit/deviceLib/clz.cc
index 0b5bf04b30..82c7346f9c 100644
--- a/catch/unit/deviceLib/clz.cc
+++ b/catch/unit/deviceLib/clz.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/ffs.cc b/catch/unit/deviceLib/ffs.cc
index 5c94cc3d20..7e3828e286 100644
--- a/catch/unit/deviceLib/ffs.cc
+++ b/catch/unit/deviceLib/ffs.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/floatMath.cc b/catch/unit/deviceLib/floatMath.cc
index ee6037635d..430df9a847 100644
--- a/catch/unit/deviceLib/floatMath.cc
+++ b/catch/unit/deviceLib/floatMath.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/floatTM.cc b/catch/unit/deviceLib/floatTM.cc
index e4f2a05e2e..df04904d59 100644
--- a/catch/unit/deviceLib/floatTM.cc
+++ b/catch/unit/deviceLib/floatTM.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/funnelshift.cc b/catch/unit/deviceLib/funnelshift.cc
index ef2a96f73a..881f51947a 100644
--- a/catch/unit/deviceLib/funnelshift.cc
+++ b/catch/unit/deviceLib/funnelshift.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/catch/unit/deviceLib/vectorTypesDevice.cc b/catch/unit/deviceLib/vectorTypesDevice.cc
index 8676a34264..c4237e28ed 100644
--- a/catch/unit/deviceLib/vectorTypesDevice.cc
+++ b/catch/unit/deviceLib/vectorTypesDevice.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 - present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2021 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/perftests/compute/hipPerfDotProduct.cpp b/perftests/compute/hipPerfDotProduct.cpp
index 2826d05bae..78215c8502 100644
--- a/perftests/compute/hipPerfDotProduct.cpp
+++ b/perftests/compute/hipPerfDotProduct.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/compute/hipPerfMandelbrot.cpp b/perftests/compute/hipPerfMandelbrot.cpp
index dcf4da9b21..5d556ed960 100644
--- a/perftests/compute/hipPerfMandelbrot.cpp
+++ b/perftests/compute/hipPerfMandelbrot.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2020 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/dispatch/hipPerfDispatchSpeed.cpp b/perftests/dispatch/hipPerfDispatchSpeed.cpp
index 2eb4e083aa..74d77f2113 100644
--- a/perftests/dispatch/hipPerfDispatchSpeed.cpp
+++ b/perftests/dispatch/hipPerfDispatchSpeed.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfBufferCopyRectSpeed.cpp b/perftests/memory/hipPerfBufferCopyRectSpeed.cpp
index b3d2d97b8c..7fd10673b9 100644
--- a/perftests/memory/hipPerfBufferCopyRectSpeed.cpp
+++ b/perftests/memory/hipPerfBufferCopyRectSpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfBufferCopySpeed.cpp b/perftests/memory/hipPerfBufferCopySpeed.cpp
index dc08b4f58c..0a046fa8c0 100644
--- a/perftests/memory/hipPerfBufferCopySpeed.cpp
+++ b/perftests/memory/hipPerfBufferCopySpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfDevMemReadSpeed.cpp b/perftests/memory/hipPerfDevMemReadSpeed.cpp
index b211188714..408a1949b4 100644
--- a/perftests/memory/hipPerfDevMemReadSpeed.cpp
+++ b/perftests/memory/hipPerfDevMemReadSpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfDevMemWriteSpeed.cpp b/perftests/memory/hipPerfDevMemWriteSpeed.cpp
index 69baef269c..21b19ff1de 100644
--- a/perftests/memory/hipPerfDevMemWriteSpeed.cpp
+++ b/perftests/memory/hipPerfDevMemWriteSpeed.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfHostNumaAlloc.cpp b/perftests/memory/hipPerfHostNumaAlloc.cpp
index 3a45913c7f..93cd71ace7 100644
--- a/perftests/memory/hipPerfHostNumaAlloc.cpp
+++ b/perftests/memory/hipPerfHostNumaAlloc.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfMemFill.cpp b/perftests/memory/hipPerfMemFill.cpp
index 1570c84301..4aedb72073 100644
--- a/perftests/memory/hipPerfMemFill.cpp
+++ b/perftests/memory/hipPerfMemFill.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfMemMallocCpyFree.cpp b/perftests/memory/hipPerfMemMallocCpyFree.cpp
index 5723819f75..970d18a56d 100644
--- a/perftests/memory/hipPerfMemMallocCpyFree.cpp
+++ b/perftests/memory/hipPerfMemMallocCpyFree.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfMemcpy.cpp b/perftests/memory/hipPerfMemcpy.cpp
index 2af8ea8d6e..005b1a9c85 100644
--- a/perftests/memory/hipPerfMemcpy.cpp
+++ b/perftests/memory/hipPerfMemcpy.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfMemset.cpp b/perftests/memory/hipPerfMemset.cpp
index 6de7345f18..4e71a094dc 100644
--- a/perftests/memory/hipPerfMemset.cpp
+++ b/perftests/memory/hipPerfMemset.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfSampleRate.cpp b/perftests/memory/hipPerfSampleRate.cpp
index 15141998d8..8346cb3cda 100644
--- a/perftests/memory/hipPerfSampleRate.cpp
+++ b/perftests/memory/hipPerfSampleRate.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/memory/hipPerfSharedMemReadSpeed.cpp b/perftests/memory/hipPerfSharedMemReadSpeed.cpp
index 63be529fd0..4cdabd9303 100644
--- a/perftests/memory/hipPerfSharedMemReadSpeed.cpp
+++ b/perftests/memory/hipPerfSharedMemReadSpeed.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/module/hipPerfModuleLoad.cpp b/perftests/module/hipPerfModuleLoad.cpp
index f3bc98a212..e1038f268e 100755
--- a/perftests/module/hipPerfModuleLoad.cpp
+++ b/perftests/module/hipPerfModuleLoad.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/perftests/stream/hipPerfDeviceConcurrency.cpp b/perftests/stream/hipPerfDeviceConcurrency.cpp
index 266344e492..a4403eeae7 100644
--- a/perftests/stream/hipPerfDeviceConcurrency.cpp
+++ b/perftests/stream/hipPerfDeviceConcurrency.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/stream/hipPerfStreamConcurrency.cpp b/perftests/stream/hipPerfStreamConcurrency.cpp
index 9922cfdaa9..fd4b0107e4 100644
--- a/perftests/stream/hipPerfStreamConcurrency.cpp
+++ b/perftests/stream/hipPerfStreamConcurrency.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/perftests/stream/hipPerfStreamCreateCopyDestroy.cpp b/perftests/stream/hipPerfStreamCreateCopyDestroy.cpp
index d582c9489b..1a58f7e045 100644
--- a/perftests/stream/hipPerfStreamCreateCopyDestroy.cpp
+++ b/perftests/stream/hipPerfStreamCreateCopyDestroy.cpp
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
diff --git a/samples/0_Intro/bit_extract/CMakeLists.txt b/samples/0_Intro/bit_extract/CMakeLists.txt
index 9902bb3b41..bffb2f1abe 100644
--- a/samples/0_Intro/bit_extract/CMakeLists.txt
+++ b/samples/0_Intro/bit_extract/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/bit_extract/Makefile b/samples/0_Intro/bit_extract/Makefile
index 139977df5c..023259d24f 100644
--- a/samples/0_Intro/bit_extract/Makefile
+++ b/samples/0_Intro/bit_extract/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/bit_extract/bit_extract.cpp b/samples/0_Intro/bit_extract/bit_extract.cpp
index dad27f759d..c0d1f84486 100644
--- a/samples/0_Intro/bit_extract/bit_extract.cpp
+++ b/samples/0_Intro/bit_extract/bit_extract.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/CMakeLists.txt b/samples/0_Intro/module_api/CMakeLists.txt
index ae1eac4930..2e389e210b 100644
--- a/samples/0_Intro/module_api/CMakeLists.txt
+++ b/samples/0_Intro/module_api/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/Makefile b/samples/0_Intro/module_api/Makefile
index f1e103267b..b1baa1849c 100644
--- a/samples/0_Intro/module_api/Makefile
+++ b/samples/0_Intro/module_api/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/defaultDriver.cpp b/samples/0_Intro/module_api/defaultDriver.cpp
index af8b413ac2..9443842026 100644
--- a/samples/0_Intro/module_api/defaultDriver.cpp
+++ b/samples/0_Intro/module_api/defaultDriver.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/launchKernelHcc.cpp b/samples/0_Intro/module_api/launchKernelHcc.cpp
index 5bb1bd3e96..39d3bd31d2 100644
--- a/samples/0_Intro/module_api/launchKernelHcc.cpp
+++ b/samples/0_Intro/module_api/launchKernelHcc.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/runKernel.cpp b/samples/0_Intro/module_api/runKernel.cpp
index 1093b0dd54..c2de0c6c0d 100644
--- a/samples/0_Intro/module_api/runKernel.cpp
+++ b/samples/0_Intro/module_api/runKernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api/vcpy_kernel.cpp b/samples/0_Intro/module_api/vcpy_kernel.cpp
index afcc50838a..4e1fa558f6 100644
--- a/samples/0_Intro/module_api/vcpy_kernel.cpp
+++ b/samples/0_Intro/module_api/vcpy_kernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api_global/CMakeLists.txt b/samples/0_Intro/module_api_global/CMakeLists.txt
index 0d3aad718d..c4a8b01347 100644
--- a/samples/0_Intro/module_api_global/CMakeLists.txt
+++ b/samples/0_Intro/module_api_global/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api_global/Makefile b/samples/0_Intro/module_api_global/Makefile
index c72342f49f..212bbae5ec 100644
--- a/samples/0_Intro/module_api_global/Makefile
+++ b/samples/0_Intro/module_api_global/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api_global/runKernel.cpp b/samples/0_Intro/module_api_global/runKernel.cpp
index 4a2d49144c..23f4ec2750 100644
--- a/samples/0_Intro/module_api_global/runKernel.cpp
+++ b/samples/0_Intro/module_api_global/runKernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2017-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/module_api_global/vcpy_kernel.cpp b/samples/0_Intro/module_api_global/vcpy_kernel.cpp
index 9e8d7c9e29..e7886d0b8e 100644
--- a/samples/0_Intro/module_api_global/vcpy_kernel.cpp
+++ b/samples/0_Intro/module_api_global/vcpy_kernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2017-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/square/CMakeLists.txt b/samples/0_Intro/square/CMakeLists.txt
index cdb1a88760..4bcc2ec158 100644
--- a/samples/0_Intro/square/CMakeLists.txt
+++ b/samples/0_Intro/square/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/square/Makefile b/samples/0_Intro/square/Makefile
index cd395bc2a0..3cefbe6d25 100644
--- a/samples/0_Intro/square/Makefile
+++ b/samples/0_Intro/square/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/square/square.cu b/samples/0_Intro/square/square.cu
index dd0692fc65..eba054b353 100644
--- a/samples/0_Intro/square/square.cu
+++ b/samples/0_Intro/square/square.cu
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/0_Intro/square/square.hipref.cpp b/samples/0_Intro/square/square.hipref.cpp
index 300a875997..7c2f794e8b 100644
--- a/samples/0_Intro/square/square.hipref.cpp
+++ b/samples/0_Intro/square/square.hipref.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipBusBandwidth/CMakeLists.txt b/samples/1_Utils/hipBusBandwidth/CMakeLists.txt
index 3246080243..5ec0c2ff50 100644
--- a/samples/1_Utils/hipBusBandwidth/CMakeLists.txt
+++ b/samples/1_Utils/hipBusBandwidth/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipBusBandwidth/Makefile b/samples/1_Utils/hipBusBandwidth/Makefile
index b793cd7396..8a45e5f130 100644
--- a/samples/1_Utils/hipBusBandwidth/Makefile
+++ b/samples/1_Utils/hipBusBandwidth/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipCommander/CMakeLists.txt b/samples/1_Utils/hipCommander/CMakeLists.txt
index 974efb6133..d071a84c40 100644
--- a/samples/1_Utils/hipCommander/CMakeLists.txt
+++ b/samples/1_Utils/hipCommander/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipCommander/Makefile b/samples/1_Utils/hipCommander/Makefile
index 3564dacef1..55dc844d1d 100644
--- a/samples/1_Utils/hipCommander/Makefile
+++ b/samples/1_Utils/hipCommander/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipDispatchLatency/CMakeLists.txt b/samples/1_Utils/hipDispatchLatency/CMakeLists.txt
index 80fe4695ef..096edae9bc 100644
--- a/samples/1_Utils/hipDispatchLatency/CMakeLists.txt
+++ b/samples/1_Utils/hipDispatchLatency/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipDispatchLatency/Makefile b/samples/1_Utils/hipDispatchLatency/Makefile
index 96849e19aa..969557ae84 100644
--- a/samples/1_Utils/hipDispatchLatency/Makefile
+++ b/samples/1_Utils/hipDispatchLatency/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipDispatchLatency/hipDispatchEnqueueRateMT.cpp b/samples/1_Utils/hipDispatchLatency/hipDispatchEnqueueRateMT.cpp
index 6584f70b84..9bc3258b4d 100644
--- a/samples/1_Utils/hipDispatchLatency/hipDispatchEnqueueRateMT.cpp
+++ b/samples/1_Utils/hipDispatchLatency/hipDispatchEnqueueRateMT.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp b/samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp
index f34c6852bd..1e04cb9c52 100644
--- a/samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp
+++ b/samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/1_Utils/hipDispatchLatency/test_kernel.cpp b/samples/1_Utils/hipDispatchLatency/test_kernel.cpp
index 23ef426730..c396b711fd 100644
--- a/samples/1_Utils/hipDispatchLatency/test_kernel.cpp
+++ b/samples/1_Utils/hipDispatchLatency/test_kernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/1_Utils/hipInfo/CMakeLists.txt b/samples/1_Utils/hipInfo/CMakeLists.txt
index aaa56d6b63..2cfc0cb6ce 100644
--- a/samples/1_Utils/hipInfo/CMakeLists.txt
+++ b/samples/1_Utils/hipInfo/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipInfo/Makefile b/samples/1_Utils/hipInfo/Makefile
index 0c3d8e46d6..d8cdf32188 100644
--- a/samples/1_Utils/hipInfo/Makefile
+++ b/samples/1_Utils/hipInfo/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/1_Utils/hipInfo/hipInfo.cpp b/samples/1_Utils/hipInfo/hipInfo.cpp
index 7bdf7e7b54..53c841280b 100644
--- a/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt b/samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt
index 7b290d1f97..6d12e24dc0 100644
--- a/samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt
+++ b/samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/0_MatrixTranspose/Makefile b/samples/2_Cookbook/0_MatrixTranspose/Makefile
index 03b6d42eb6..f691f5003e 100644
--- a/samples/2_Cookbook/0_MatrixTranspose/Makefile
+++ b/samples/2_Cookbook/0_MatrixTranspose/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/0_MatrixTranspose/MatrixTranspose.cpp b/samples/2_Cookbook/0_MatrixTranspose/MatrixTranspose.cpp
index f369cc3095..2457505908 100644
--- a/samples/2_Cookbook/0_MatrixTranspose/MatrixTranspose.cpp
+++ b/samples/2_Cookbook/0_MatrixTranspose/MatrixTranspose.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/10_inline_asm/CMakeLists.txt b/samples/2_Cookbook/10_inline_asm/CMakeLists.txt
index 0516e9f5d6..e4a8a4eb87 100644
--- a/samples/2_Cookbook/10_inline_asm/CMakeLists.txt
+++ b/samples/2_Cookbook/10_inline_asm/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/10_inline_asm/Makefile b/samples/2_Cookbook/10_inline_asm/Makefile
index 4ceb3210c7..fcdb849c87 100644
--- a/samples/2_Cookbook/10_inline_asm/Makefile
+++ b/samples/2_Cookbook/10_inline_asm/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/10_inline_asm/inline_asm.cpp b/samples/2_Cookbook/10_inline_asm/inline_asm.cpp
index 89cfbaddbf..7c4b77da34 100644
--- a/samples/2_Cookbook/10_inline_asm/inline_asm.cpp
+++ b/samples/2_Cookbook/10_inline_asm/inline_asm.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/11_texture_driver/CMakeLists.txt b/samples/2_Cookbook/11_texture_driver/CMakeLists.txt
index 3307188d85..d8475b9c2f 100644
--- a/samples/2_Cookbook/11_texture_driver/CMakeLists.txt
+++ b/samples/2_Cookbook/11_texture_driver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/11_texture_driver/Makefile b/samples/2_Cookbook/11_texture_driver/Makefile
index 4dfb294808..ea284a8e1f 100644
--- a/samples/2_Cookbook/11_texture_driver/Makefile
+++ b/samples/2_Cookbook/11_texture_driver/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/11_texture_driver/tex2dKernel.cpp b/samples/2_Cookbook/11_texture_driver/tex2dKernel.cpp
index 5831da0e9d..613db7ff01 100644
--- a/samples/2_Cookbook/11_texture_driver/tex2dKernel.cpp
+++ b/samples/2_Cookbook/11_texture_driver/tex2dKernel.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp b/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
index 01729222ee..1e27b14008 100644
--- a/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
+++ b/samples/2_Cookbook/11_texture_driver/texture2dDrv.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt b/samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt
index 6d1b5f2067..04d327efc7 100644
--- a/samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt
+++ b/samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/12_cmake_hip_add_executable/MatrixTranspose.cpp b/samples/2_Cookbook/12_cmake_hip_add_executable/MatrixTranspose.cpp
index f369cc3095..2457505908 100644
--- a/samples/2_Cookbook/12_cmake_hip_add_executable/MatrixTranspose.cpp
+++ b/samples/2_Cookbook/12_cmake_hip_add_executable/MatrixTranspose.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/13_occupancy/CMakeLists.txt b/samples/2_Cookbook/13_occupancy/CMakeLists.txt
index 771a6a5cd3..d69c22fd9b 100644
--- a/samples/2_Cookbook/13_occupancy/CMakeLists.txt
+++ b/samples/2_Cookbook/13_occupancy/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/13_occupancy/Makefile b/samples/2_Cookbook/13_occupancy/Makefile
index 67551517f7..bb19856d12 100644
--- a/samples/2_Cookbook/13_occupancy/Makefile
+++ b/samples/2_Cookbook/13_occupancy/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2019 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/13_occupancy/occupancy.cpp b/samples/2_Cookbook/13_occupancy/occupancy.cpp
index 7b32b6d0fa..98728f8124 100644
--- a/samples/2_Cookbook/13_occupancy/occupancy.cpp
+++ b/samples/2_Cookbook/13_occupancy/occupancy.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-Present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/2_Cookbook/14_gpu_arch/CMakeLists.txt b/samples/2_Cookbook/14_gpu_arch/CMakeLists.txt
index 099ef1ccbd..58c2f372d3 100644
--- a/samples/2_Cookbook/14_gpu_arch/CMakeLists.txt
+++ b/samples/2_Cookbook/14_gpu_arch/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/14_gpu_arch/Makefile b/samples/2_Cookbook/14_gpu_arch/Makefile
index 6480b70be3..eebb86d7ce 100644
--- a/samples/2_Cookbook/14_gpu_arch/Makefile
+++ b/samples/2_Cookbook/14_gpu_arch/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/14_gpu_arch/gpuarch.cpp b/samples/2_Cookbook/14_gpu_arch/gpuarch.cpp
index 8d629b3015..ca312c0146 100644
--- a/samples/2_Cookbook/14_gpu_arch/gpuarch.cpp
+++ b/samples/2_Cookbook/14_gpu_arch/gpuarch.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2020-Present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/2_Cookbook/15_static_library/device_functions/hipDevice.cpp b/samples/2_Cookbook/15_static_library/device_functions/hipDevice.cpp
index bafbc41373..ff4fe85bdb 100644
--- a/samples/2_Cookbook/15_static_library/device_functions/hipDevice.cpp
+++ b/samples/2_Cookbook/15_static_library/device_functions/hipDevice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/15_static_library/device_functions/hipMain2.cpp b/samples/2_Cookbook/15_static_library/device_functions/hipMain2.cpp
index b041becf22..a93eb141ac 100644
--- a/samples/2_Cookbook/15_static_library/device_functions/hipMain2.cpp
+++ b/samples/2_Cookbook/15_static_library/device_functions/hipMain2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/15_static_library/host_functions/hipMain1.cpp b/samples/2_Cookbook/15_static_library/host_functions/hipMain1.cpp
index 5bb6a1e3fb..52b7ce4169 100644
--- a/samples/2_Cookbook/15_static_library/host_functions/hipMain1.cpp
+++ b/samples/2_Cookbook/15_static_library/host_functions/hipMain1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/15_static_library/host_functions/hipOptLibrary.cpp b/samples/2_Cookbook/15_static_library/host_functions/hipOptLibrary.cpp
index b969109f13..68f54184b4 100644
--- a/samples/2_Cookbook/15_static_library/host_functions/hipOptLibrary.cpp
+++ b/samples/2_Cookbook/15_static_library/host_functions/hipOptLibrary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/16_assembly_to_executable/Makefile b/samples/2_Cookbook/16_assembly_to_executable/Makefile
index 61e1062fa0..f221bb97cb 100644
--- a/samples/2_Cookbook/16_assembly_to_executable/Makefile
+++ b/samples/2_Cookbook/16_assembly_to_executable/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/16_assembly_to_executable/square.cpp b/samples/2_Cookbook/16_assembly_to_executable/square.cpp
index 6f591092d0..a04bf625ca 100644
--- a/samples/2_Cookbook/16_assembly_to_executable/square.cpp
+++ b/samples/2_Cookbook/16_assembly_to_executable/square.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/2_Cookbook/17_llvm_ir_to_executable/Makefile b/samples/2_Cookbook/17_llvm_ir_to_executable/Makefile
index 1ffcd38868..8b89638d8d 100644
--- a/samples/2_Cookbook/17_llvm_ir_to_executable/Makefile
+++ b/samples/2_Cookbook/17_llvm_ir_to_executable/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/17_llvm_ir_to_executable/square.cpp b/samples/2_Cookbook/17_llvm_ir_to_executable/square.cpp
index e730a6a62f..7ffc8d0916 100644
--- a/samples/2_Cookbook/17_llvm_ir_to_executable/square.cpp
+++ b/samples/2_Cookbook/17_llvm_ir_to_executable/square.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2020-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/2_Cookbook/1_hipEvent/CMakeLists.txt b/samples/2_Cookbook/1_hipEvent/CMakeLists.txt
index a185b054b8..f4b6029943 100644
--- a/samples/2_Cookbook/1_hipEvent/CMakeLists.txt
+++ b/samples/2_Cookbook/1_hipEvent/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/1_hipEvent/Makefile b/samples/2_Cookbook/1_hipEvent/Makefile
index affcaa20da..563702e6fb 100644
--- a/samples/2_Cookbook/1_hipEvent/Makefile
+++ b/samples/2_Cookbook/1_hipEvent/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/1_hipEvent/hipEvent.cpp b/samples/2_Cookbook/1_hipEvent/hipEvent.cpp
index b9d6c41b8d..a83b99beb6 100644
--- a/samples/2_Cookbook/1_hipEvent/hipEvent.cpp
+++ b/samples/2_Cookbook/1_hipEvent/hipEvent.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/3_shared_memory/CMakeLists.txt b/samples/2_Cookbook/3_shared_memory/CMakeLists.txt
index d8edeb697d..41fdd78250 100644
--- a/samples/2_Cookbook/3_shared_memory/CMakeLists.txt
+++ b/samples/2_Cookbook/3_shared_memory/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/3_shared_memory/Makefile b/samples/2_Cookbook/3_shared_memory/Makefile
index 242703af83..7227b9b9a6 100644
--- a/samples/2_Cookbook/3_shared_memory/Makefile
+++ b/samples/2_Cookbook/3_shared_memory/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/3_shared_memory/sharedMemory.cpp b/samples/2_Cookbook/3_shared_memory/sharedMemory.cpp
index fb47494e03..cff03f0a72 100644
--- a/samples/2_Cookbook/3_shared_memory/sharedMemory.cpp
+++ b/samples/2_Cookbook/3_shared_memory/sharedMemory.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/4_shfl/CMakeLists.txt b/samples/2_Cookbook/4_shfl/CMakeLists.txt
index a6ac349887..d0fd286ffe 100644
--- a/samples/2_Cookbook/4_shfl/CMakeLists.txt
+++ b/samples/2_Cookbook/4_shfl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/4_shfl/Makefile b/samples/2_Cookbook/4_shfl/Makefile
index 29bd021765..1b470f1d57 100644
--- a/samples/2_Cookbook/4_shfl/Makefile
+++ b/samples/2_Cookbook/4_shfl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/4_shfl/shfl.cpp b/samples/2_Cookbook/4_shfl/shfl.cpp
index 8026c34f3e..7902fd153a 100644
--- a/samples/2_Cookbook/4_shfl/shfl.cpp
+++ b/samples/2_Cookbook/4_shfl/shfl.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/5_2dshfl/2dshfl.cpp b/samples/2_Cookbook/5_2dshfl/2dshfl.cpp
index 456d00eec0..d2c26e7933 100644
--- a/samples/2_Cookbook/5_2dshfl/2dshfl.cpp
+++ b/samples/2_Cookbook/5_2dshfl/2dshfl.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/5_2dshfl/CMakeLists.txt b/samples/2_Cookbook/5_2dshfl/CMakeLists.txt
index 6f929a4dda..1fc362dedb 100644
--- a/samples/2_Cookbook/5_2dshfl/CMakeLists.txt
+++ b/samples/2_Cookbook/5_2dshfl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/5_2dshfl/Makefile b/samples/2_Cookbook/5_2dshfl/Makefile
index bcdad167d1..9e67c3e589 100644
--- a/samples/2_Cookbook/5_2dshfl/Makefile
+++ b/samples/2_Cookbook/5_2dshfl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt b/samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt
index 19674dbe3f..8dba51a666 100644
--- a/samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt
+++ b/samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/6_dynamic_shared/Makefile b/samples/2_Cookbook/6_dynamic_shared/Makefile
index 5b1e2268c6..f35de1d0ec 100644
--- a/samples/2_Cookbook/6_dynamic_shared/Makefile
+++ b/samples/2_Cookbook/6_dynamic_shared/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/6_dynamic_shared/dynamic_shared.cpp b/samples/2_Cookbook/6_dynamic_shared/dynamic_shared.cpp
index 65922afc86..3e1c0f4b8c 100644
--- a/samples/2_Cookbook/6_dynamic_shared/dynamic_shared.cpp
+++ b/samples/2_Cookbook/6_dynamic_shared/dynamic_shared.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/7_streams/CMakeLists.txt b/samples/2_Cookbook/7_streams/CMakeLists.txt
index f4fbc18c87..9aa963f870 100644
--- a/samples/2_Cookbook/7_streams/CMakeLists.txt
+++ b/samples/2_Cookbook/7_streams/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/7_streams/Makefile b/samples/2_Cookbook/7_streams/Makefile
index 8ff2e49466..dcf679f9b8 100644
--- a/samples/2_Cookbook/7_streams/Makefile
+++ b/samples/2_Cookbook/7_streams/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/7_streams/stream.cpp b/samples/2_Cookbook/7_streams/stream.cpp
index f2bf289c9d..b534b46b02 100644
--- a/samples/2_Cookbook/7_streams/stream.cpp
+++ b/samples/2_Cookbook/7_streams/stream.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/8_peer2peer/CMakeLists.txt b/samples/2_Cookbook/8_peer2peer/CMakeLists.txt
index 772d52f057..abcb2b7afd 100644
--- a/samples/2_Cookbook/8_peer2peer/CMakeLists.txt
+++ b/samples/2_Cookbook/8_peer2peer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/8_peer2peer/Makefile b/samples/2_Cookbook/8_peer2peer/Makefile
index 9bb822084c..6b07f7fa87 100644
--- a/samples/2_Cookbook/8_peer2peer/Makefile
+++ b/samples/2_Cookbook/8_peer2peer/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2016 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/8_peer2peer/peer2peer.cpp b/samples/2_Cookbook/8_peer2peer/peer2peer.cpp
index 1f61e65876..c2de71ce40 100644
--- a/samples/2_Cookbook/8_peer2peer/peer2peer.cpp
+++ b/samples/2_Cookbook/8_peer2peer/peer2peer.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/samples/2_Cookbook/9_unroll/CMakeLists.txt b/samples/2_Cookbook/9_unroll/CMakeLists.txt
index 76ce0a9365..02f900f70e 100644
--- a/samples/2_Cookbook/9_unroll/CMakeLists.txt
+++ b/samples/2_Cookbook/9_unroll/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/9_unroll/Makefile b/samples/2_Cookbook/9_unroll/Makefile
index 68b9bbfeed..138d412050 100644
--- a/samples/2_Cookbook/9_unroll/Makefile
+++ b/samples/2_Cookbook/9_unroll/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2017 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/2_Cookbook/9_unroll/unroll.cpp b/samples/2_Cookbook/9_unroll/unroll.cpp
index eeb688e296..8d659840d4 100644
--- a/samples/2_Cookbook/9_unroll/unroll.cpp
+++ b/samples/2_Cookbook/9_unroll/unroll.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-present Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal