diff --git a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake
index 1dda06bff3..04025b8ec6 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake
+++ b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/hsa_common.cmake
@@ -17,14 +17,14 @@
 ## of this software and associated documentation files (the "Software"), to
 ## deal with the Software without restriction, including without limitation
 ## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and#or sell copies of the Software, and to permit persons to whom the
+## and/or sell copies of the Software, and to permit persons to whom the
 ## Software is furnished to do so, subject to the following conditions:
 ##
 ##  - Redistributions of source code must retain the above copyright notice,
 ##    this list of conditions and the following disclaimers.
 ##  - Redistributions in binary form must reproduce the above copyright
 ##    notice, this list of conditions and the following disclaimers in
-##    the documentation and#or other materials provided with the distribution.
+##    the documentation and/or other materials provided with the distribution.
 ##  - Neither the names of Advanced Micro Devices, Inc,
 ##    nor the names of its contributors may be used to endorse or promote
 ##    products derived from this Software without specific prior written
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/utils.cmake b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/utils.cmake
index 6c88a6c144..4954514a61 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/utils.cmake
+++ b/projects/rocr-runtime/runtime/hsa-runtime/cmake_modules/utils.cmake
@@ -17,14 +17,14 @@
 ## of this software and associated documentation files (the "Software"), to
 ## deal with the Software without restriction, including without limitation
 ## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and#or sell copies of the Software, and to permit persons to whom the
+## and/or sell copies of the Software, and to permit persons to whom the
 ## Software is furnished to do so, subject to the following conditions:
 ##
 ##  - Redistributions of source code must retain the above copyright notice,
 ##    this list of conditions and the following disclaimers.
 ##  - Redistributions in binary form must reproduce the above copyright
 ##    notice, this list of conditions and the following disclaimers in
-##    the documentation and#or other materials provided with the distribution.
+##    the documentation and/or other materials provided with the distribution.
 ##  - Neither the names of Advanced Micro Devices, Inc,
 ##    nor the names of its contributors may be used to endorse or promote
 ##    products derived from this Software without specific prior written
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/hsa-runtime64-config.cmake.in b/projects/rocr-runtime/runtime/hsa-runtime/hsa-runtime64-config.cmake.in
index fb6d51fa34..8480acec11 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/hsa-runtime64-config.cmake.in
+++ b/projects/rocr-runtime/runtime/hsa-runtime/hsa-runtime64-config.cmake.in
@@ -17,14 +17,14 @@
 ## of this software and associated documentation files (the "Software"), to
 ## deal with the Software without restriction, including without limitation
 ## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and or sell copies of the Software, and to permit persons to whom the
+## and/or sell copies of the Software, and to permit persons to whom the
 ## Software is furnished to do so, subject to the following conditions:
 ##
 ##  - Redistributions of source code must retain the above copyright notice,
 ##    this list of conditions and the following disclaimers.
 ##  - Redistributions in binary form must reproduce the above copyright
 ##    notice, this list of conditions and the following disclaimers in
-##    the documentation and#or other materials provided with the distribution.
+##    the documentation and/or other materials provided with the distribution.
 ##  - Neither the names of Advanced Micro Devices, Inc,
 ##    nor the names of its contributors may be used to endorse or promote
 ##    products derived from this Software without specific prior written
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
index 0e80b0251d..92da889320 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
@@ -17,14 +17,14 @@
 ## of this software and associated documentation files (the "Software"), to
 ## deal with the Software without restriction, including without limitation
 ## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and#or sell copies of the Software, and to permit persons to whom the
+## and/or sell copies of the Software, and to permit persons to whom the
 ## Software is furnished to do so, subject to the following conditions:
 ##
 ##  - Redistributions of source code must retain the above copyright notice,
 ##    this list of conditions and the following disclaimers.
 ##  - Redistributions in binary form must reproduce the above copyright
 ##    notice, this list of conditions and the following disclaimers in
-##    the documentation and#or other materials provided with the distribution.
+##    the documentation and/or other materials provided with the distribution.
 ##  - Neither the names of Advanced Micro Devices, Inc,
 ##    nor the names of its contributors may be used to endorse or promote
 ##    products derived from this Software without specific prior written
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/create_hsaco_ascii_file.sh b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/create_hsaco_ascii_file.sh
index e3bfc52f84..3f9e51d150 100755
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/create_hsaco_ascii_file.sh
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/create_hsaco_ascii_file.sh
@@ -18,14 +18,14 @@
 ## of this software and associated documentation files (the "Software"), to
 ## deal with the Software without restriction, including without limitation
 ## the rights to use, copy, modify, merge, publish, distribute, sublicense,
-## and#or sell copies of the Software, and to permit persons to whom the
+## and/or sell copies of the Software, and to permit persons to whom the
 ## Software is furnished to do so, subject to the following conditions:
 ##
 ##  - Redistributions of source code must retain the above copyright notice,
 ##    this list of conditions and the following disclaimers.
 ##  - Redistributions in binary form must reproduce the above copyright
 ##    notice, this list of conditions and the following disclaimers in
-##    the documentation and#or other materials provided with the distribution.
+##    the documentation and/or other materials provided with the distribution.
 ##  - Neither the names of Advanced Micro Devices, Inc,
 ##    nor the names of its contributors may be used to endorse or promote
 ##    products derived from this Software without specific prior written