diff --git a/LICENSE b/LICENSE
index 2c3f9da0..87bf4f50 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,11 @@
-The Clear BSD License
-
 Copyright(c) 2019-2021 Intel Corporation
-All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-        * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-        * Neither the name of Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile b/Makefile
index 162d9714..e5cb3f3c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 PWD:=$(shell pwd)
diff --git a/env/posix/ocf_env_headers.h b/env/posix/ocf_env_headers.h
index dcb43d1d..b9841610 100644
--- a/env/posix/ocf_env_headers.h
+++ b/env/posix/ocf_env_headers.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_ENV_HEADERS_H__
diff --git a/env/posix/ocf_env_list.h b/env/posix/ocf_env_list.h
index c1acef31..90348af5 100644
--- a/env/posix/ocf_env_list.h
+++ b/env/posix/ocf_env_list.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_ENV_LIST__
diff --git a/env/posix/utils_mpool.c b/env/posix/utils_mpool.c
index 50dfe865..44140022 100644
--- a/env/posix/utils_mpool.c
+++ b/env/posix/utils_mpool.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "utils_mpool.h"
diff --git a/env/posix/utils_mpool.h b/env/posix/utils_mpool.h
index 5b122dbd..75bb8427 100644
--- a/env/posix/utils_mpool.h
+++ b/env/posix/utils_mpool.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_MPOOL_H_
diff --git a/example/simple/Makefile b/example/simple/Makefile
index cd5edbe6..31a71393 100644
--- a/example/simple/Makefile
+++ b/example/simple/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 OCFDIR=../../
diff --git a/example/simple/src/ctx.c b/example/simple/src/ctx.c
index 20735c77..9b39ac10 100644
--- a/example/simple/src/ctx.c
+++ b/example/simple/src/ctx.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <execinfo.h>
diff --git a/example/simple/src/ctx.h b/example/simple/src/ctx.h
index 01b59211..57d4f8b3 100644
--- a/example/simple/src/ctx.h
+++ b/example/simple/src/ctx.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __CTX_H__
diff --git a/example/simple/src/data.h b/example/simple/src/data.h
index 203eb84d..53968c43 100644
--- a/example/simple/src/data.h
+++ b/example/simple/src/data.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __DATA_H__
diff --git a/example/simple/src/main.c b/example/simple/src/main.c
index d8aec22f..00c05e71 100644
--- a/example/simple/src/main.c
+++ b/example/simple/src/main.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <stdio.h>
diff --git a/example/simple/src/volume.c b/example/simple/src/volume.c
index 7f0c66a7..2eab9d75 100644
--- a/example/simple/src/volume.c
+++ b/example/simple/src/volume.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <ocf/ocf.h>
diff --git a/example/simple/src/volume.h b/example/simple/src/volume.h
index 54142f99..69484c5a 100644
--- a/example/simple/src/volume.h
+++ b/example/simple/src/volume.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __VOLUME_H__
diff --git a/inc/cleaning/acp.h b/inc/cleaning/acp.h
index 554fef23..4db74925 100644
--- a/inc/cleaning/acp.h
+++ b/inc/cleaning/acp.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __OCF_CLEANING_ACP_H__
 #define __OCF_CLEANING_ACP_H__
diff --git a/inc/cleaning/alru.h b/inc/cleaning/alru.h
index 64aeb98a..4847b6c9 100644
--- a/inc/cleaning/alru.h
+++ b/inc/cleaning/alru.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __OCF_CLEANING_ALRU_H__
 #define __OCF_CLEANING_ALRU_H__
diff --git a/inc/ocf.h b/inc/ocf.h
index 888b9c5c..bcd60fd7 100644
--- a/inc/ocf.h
+++ b/inc/ocf.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_H__
diff --git a/inc/ocf_cache.h b/inc/ocf_cache.h
index f712351d..17018537 100644
--- a/inc/ocf_cache.h
+++ b/inc/ocf_cache.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 
diff --git a/inc/ocf_cfg.h b/inc/ocf_cfg.h
index 7b44eef3..2cf73e55 100644
--- a/inc/ocf_cfg.h
+++ b/inc/ocf_cfg.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 
diff --git a/inc/ocf_cleaner.h b/inc/ocf_cleaner.h
index ba9bd1aa..43e46733 100644
--- a/inc/ocf_cleaner.h
+++ b/inc/ocf_cleaner.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_CLEANER_H_
diff --git a/inc/ocf_core.h b/inc/ocf_core.h
index 4e9505cc..cd3fe4a8 100644
--- a/inc/ocf_core.h
+++ b/inc/ocf_core.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /**
diff --git a/inc/ocf_ctx.h b/inc/ocf_ctx.h
index ebfff906..0b6b5fcd 100644
--- a/inc/ocf_ctx.h
+++ b/inc/ocf_ctx.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_CTX_H__
diff --git a/inc/ocf_debug.h b/inc/ocf_debug.h
index 1eac42dc..5b8ec527 100644
--- a/inc/ocf_debug.h
+++ b/inc/ocf_debug.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_DEBUG_H__
diff --git a/inc/ocf_def.h b/inc/ocf_def.h
index 913807da..20631dd4 100644
--- a/inc/ocf_def.h
+++ b/inc/ocf_def.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 
diff --git a/inc/ocf_err.h b/inc/ocf_err.h
index 7fd0b7bb..513e428c 100644
--- a/inc/ocf_err.h
+++ b/inc/ocf_err.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_ERR_H__
diff --git a/inc/ocf_io.h b/inc/ocf_io.h
index b41bc363..f5e69b4d 100644
--- a/inc/ocf_io.h
+++ b/inc/ocf_io.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 
diff --git a/inc/ocf_io_class.h b/inc/ocf_io_class.h
index 6e923fdf..7371ef02 100644
--- a/inc/ocf_io_class.h
+++ b/inc/ocf_io_class.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /**
diff --git a/inc/ocf_logger.h b/inc/ocf_logger.h
index 94c22bcc..7b9cc6af 100644
--- a/inc/ocf_logger.h
+++ b/inc/ocf_logger.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_LOGGER_H__
diff --git a/inc/ocf_metadata.h b/inc/ocf_metadata.h
index d63ba020..cd4798ac 100644
--- a/inc/ocf_metadata.h
+++ b/inc/ocf_metadata.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_METADATA_H__
diff --git a/inc/ocf_mngt.h b/inc/ocf_mngt.h
index 176c0ddb..c8a0f963 100644
--- a/inc/ocf_mngt.h
+++ b/inc/ocf_mngt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_MNGT_H__
diff --git a/inc/ocf_queue.h b/inc/ocf_queue.h
index 096793c5..3c20c2e2 100644
--- a/inc/ocf_queue.h
+++ b/inc/ocf_queue.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_QUEUE_H_
diff --git a/inc/ocf_stats.h b/inc/ocf_stats.h
index 16448bed..2e846104 100644
--- a/inc/ocf_stats.h
+++ b/inc/ocf_stats.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /**
diff --git a/inc/ocf_types.h b/inc/ocf_types.h
index 113492bf..1dca3d77 100644
--- a/inc/ocf_types.h
+++ b/inc/ocf_types.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /**
diff --git a/inc/ocf_volume.h b/inc/ocf_volume.h
index 7331bb69..a2e05919 100644
--- a/inc/ocf_volume.h
+++ b/inc/ocf_volume.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_VOLUME_H__
diff --git a/inc/promotion/nhit.h b/inc/promotion/nhit.h
index 9ab84a0c..4cfd3e16 100644
--- a/inc/promotion/nhit.h
+++ b/inc/promotion/nhit.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_PROMOTION_NHIT_H__
diff --git a/src/cleaning/acp.h b/src/cleaning/acp.h
index 970d6fba..01142f53 100644
--- a/src/cleaning/acp.h
+++ b/src/cleaning/acp.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __LAYER_CLEANING_POLICY_AGGRESSIVE_H__
 
diff --git a/src/cleaning/acp_structs.h b/src/cleaning/acp_structs.h
index 7d089f46..b4d21549 100644
--- a/src/cleaning/acp_structs.h
+++ b/src/cleaning/acp_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __CLEANING_AGGRESSIVE_STRUCTS_H__
 #define __CLEANING_AGGRESSIVE_STRUCTS_H__
diff --git a/src/cleaning/alru.c b/src/cleaning/alru.c
index 219b6de5..86ef0e41 100644
--- a/src/cleaning/alru.c
+++ b/src/cleaning/alru.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/cleaning/alru.h b/src/cleaning/alru.h
index 54d68516..c87dbe9e 100644
--- a/src/cleaning/alru.h
+++ b/src/cleaning/alru.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __LAYER_CLEANING_POLICY_ALRU_H__
 
diff --git a/src/cleaning/alru_structs.h b/src/cleaning/alru_structs.h
index dc56c7b0..a88b9a33 100644
--- a/src/cleaning/alru_structs.h
+++ b/src/cleaning/alru_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __CLEANING_ALRU_STRUCTS_H__
 #define __CLEANING_ALRU_STRUCTS_H__
diff --git a/src/cleaning/cleaning.c b/src/cleaning/cleaning.c
index 94421f0e..20d6cab3 100644
--- a/src/cleaning/cleaning.c
+++ b/src/cleaning/cleaning.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "cleaning.h"
diff --git a/src/cleaning/cleaning.h b/src/cleaning/cleaning.h
index 007dac03..5eee0b8c 100644
--- a/src/cleaning/cleaning.h
+++ b/src/cleaning/cleaning.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __LAYER_CLEANING_POLICY_H__
diff --git a/src/cleaning/cleaning_ops.h b/src/cleaning/cleaning_ops.h
index f700dc86..3f72f025 100644
--- a/src/cleaning/cleaning_ops.h
+++ b/src/cleaning/cleaning_ops.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "alru.h"
diff --git a/src/cleaning/cleaning_priv.h b/src/cleaning/cleaning_priv.h
index 38fd7d66..d43144cd 100644
--- a/src/cleaning/cleaning_priv.h
+++ b/src/cleaning/cleaning_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 static inline void cleaning_policy_param_error(ocf_cache_t cache,
diff --git a/src/cleaning/nop.c b/src/cleaning/nop.c
index 82448c14..9edbaa38 100644
--- a/src/cleaning/nop.c
+++ b/src/cleaning/nop.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/cleaning/nop.h b/src/cleaning/nop.h
index 20e2d429..599ec97b 100644
--- a/src/cleaning/nop.h
+++ b/src/cleaning/nop.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __LAYER_CLEANING_POLICY_NOP_H__
diff --git a/src/cleaning/nop_structs.h b/src/cleaning/nop_structs.h
index 351d51d0..636ba666 100644
--- a/src/cleaning/nop_structs.h
+++ b/src/cleaning/nop_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __LAYER_CLEANING_POLICY_NOP_STRUCTS_H__
 
diff --git a/src/concurrency/ocf_cache_line_concurrency.h b/src/concurrency/ocf_cache_line_concurrency.h
index 02009286..b42d1647 100644
--- a/src/concurrency/ocf_cache_line_concurrency.h
+++ b/src/concurrency/ocf_cache_line_concurrency.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_CACHE_CONCURRENCY_H_
diff --git a/src/concurrency/ocf_concurrency.c b/src/concurrency/ocf_concurrency.c
index f469f7c8..594983af 100644
--- a/src/concurrency/ocf_concurrency.c
+++ b/src/concurrency/ocf_concurrency.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_concurrency.h"
diff --git a/src/concurrency/ocf_concurrency.h b/src/concurrency/ocf_concurrency.h
index 2c8e2d09..8ec6bf1b 100644
--- a/src/concurrency/ocf_concurrency.h
+++ b/src/concurrency/ocf_concurrency.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_CONCURRENCY_H_
diff --git a/src/concurrency/ocf_mio_concurrency.c b/src/concurrency/ocf_mio_concurrency.c
index f34aeb04..aebc6ff9 100644
--- a/src/concurrency/ocf_mio_concurrency.c
+++ b/src/concurrency/ocf_mio_concurrency.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_concurrency.h"
diff --git a/src/concurrency/ocf_mio_concurrency.h b/src/concurrency/ocf_mio_concurrency.h
index d3726c42..f285ac08 100644
--- a/src/concurrency/ocf_mio_concurrency.h
+++ b/src/concurrency/ocf_mio_concurrency.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2021-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_MIO_CONCURRENCY_H_
diff --git a/src/engine/cache_engine.c b/src/engine/cache_engine.c
index 1dac7355..dc726698 100644
--- a/src/engine/cache_engine.c
+++ b/src/engine/cache_engine.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/cache_engine.h b/src/engine/cache_engine.h
index 91c440b3..f98dbb0d 100644
--- a/src/engine/cache_engine.h
+++ b/src/engine/cache_engine.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __CACHE_ENGINE_H_
diff --git a/src/engine/engine_bf.c b/src/engine/engine_bf.c
index 3f9c0669..250b809a 100644
--- a/src/engine/engine_bf.c
+++ b/src/engine/engine_bf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_bf.h b/src/engine/engine_bf.h
index cf0593c1..17d17c9b 100644
--- a/src/engine/engine_bf.h
+++ b/src/engine/engine_bf.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_BF_H_
diff --git a/src/engine/engine_common.c b/src/engine/engine_common.c
index a789b13f..926911ac 100644
--- a/src/engine/engine_common.c
+++ b/src/engine/engine_common.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_common.h b/src/engine/engine_common.h
index 06f54db1..fbff231e 100644
--- a/src/engine/engine_common.h
+++ b/src/engine/engine_common.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_COMMON_H_
diff --git a/src/engine/engine_d2c.c b/src/engine/engine_d2c.c
index 64e522d1..9f7351a5 100644
--- a/src/engine/engine_d2c.c
+++ b/src/engine/engine_d2c.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "../ocf_cache_priv.h"
diff --git a/src/engine/engine_d2c.h b/src/engine/engine_d2c.h
index bf92fe36..3bd69eff 100644
--- a/src/engine/engine_d2c.h
+++ b/src/engine/engine_d2c.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_2DC_H_
diff --git a/src/engine/engine_debug.h b/src/engine/engine_debug.h
index b06d277b..fb72e7b7 100644
--- a/src/engine/engine_debug.h
+++ b/src/engine/engine_debug.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_DEBUG_H_
diff --git a/src/engine/engine_discard.c b/src/engine/engine_discard.c
index 93808322..0966aa12 100644
--- a/src/engine/engine_discard.c
+++ b/src/engine/engine_discard.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "../ocf_cache_priv.h"
diff --git a/src/engine/engine_discard.h b/src/engine/engine_discard.h
index 1b558120..d04676b1 100644
--- a/src/engine/engine_discard.h
+++ b/src/engine/engine_discard.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __ENGINE_DISCARD_H__
diff --git a/src/engine/engine_fast.c b/src/engine/engine_fast.c
index 3e7b6d37..f878f073 100644
--- a/src/engine/engine_fast.c
+++ b/src/engine/engine_fast.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_fast.h b/src/engine/engine_fast.h
index e086dc3c..1767f3cb 100644
--- a/src/engine/engine_fast.h
+++ b/src/engine/engine_fast.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_FAST_H_
diff --git a/src/engine/engine_inv.c b/src/engine/engine_inv.c
index 84b5fe6b..608f951c 100644
--- a/src/engine/engine_inv.c
+++ b/src/engine/engine_inv.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_inv.h b/src/engine/engine_inv.h
index 652fc135..cb28a733 100644
--- a/src/engine/engine_inv.h
+++ b/src/engine/engine_inv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_INV_H_
diff --git a/src/engine/engine_ops.c b/src/engine/engine_ops.c
index ad893948..a0b9beb9 100644
--- a/src/engine/engine_ops.c
+++ b/src/engine/engine_ops.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "../ocf_cache_priv.h"
diff --git a/src/engine/engine_ops.h b/src/engine/engine_ops.h
index 6b1fcd9f..fb502b05 100644
--- a/src/engine/engine_ops.h
+++ b/src/engine/engine_ops.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __CACHE_ENGINE_OPS_H_
diff --git a/src/engine/engine_pt.c b/src/engine/engine_pt.c
index 422010a0..10bffa06 100644
--- a/src/engine/engine_pt.c
+++ b/src/engine/engine_pt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "../ocf_cache_priv.h"
diff --git a/src/engine/engine_pt.h b/src/engine/engine_pt.h
index 13a6f381..59da6ce4 100644
--- a/src/engine/engine_pt.h
+++ b/src/engine/engine_pt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_OFF_H_
diff --git a/src/engine/engine_rd.c b/src/engine/engine_rd.c
index 3e04b1a3..e1278b9a 100644
--- a/src/engine/engine_rd.c
+++ b/src/engine/engine_rd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_rd.h b/src/engine/engine_rd.h
index 4cda50c1..8cb4007a 100644
--- a/src/engine/engine_rd.h
+++ b/src/engine/engine_rd.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_RD_H_
diff --git a/src/engine/engine_wa.c b/src/engine/engine_wa.c
index 089e671a..2a716df8 100644
--- a/src/engine/engine_wa.c
+++ b/src/engine/engine_wa.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "../ocf_cache_priv.h"
diff --git a/src/engine/engine_wa.h b/src/engine/engine_wa.h
index f08c5176..0c39916c 100644
--- a/src/engine/engine_wa.h
+++ b/src/engine/engine_wa.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_WA_H_
diff --git a/src/engine/engine_wb.c b/src/engine/engine_wb.c
index 284a0d56..d5d8d4ba 100644
--- a/src/engine/engine_wb.c
+++ b/src/engine/engine_wb.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_wb.h b/src/engine/engine_wb.h
index 9efcab6e..3c22c58e 100644
--- a/src/engine/engine_wb.h
+++ b/src/engine/engine_wb.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef ENGINE_WB_H_
 #define ENGINE_WB_H_
diff --git a/src/engine/engine_wi.c b/src/engine/engine_wi.c
index 320f7639..fea1c50c 100644
--- a/src/engine/engine_wi.c
+++ b/src/engine/engine_wi.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_wi.h b/src/engine/engine_wi.h
index 5a86ba06..624336ac 100644
--- a/src/engine/engine_wi.h
+++ b/src/engine/engine_wi.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_WI_H_
diff --git a/src/engine/engine_wo.c b/src/engine/engine_wo.c
index 0521ad3e..1b6f61ea 100644
--- a/src/engine/engine_wo.c
+++ b/src/engine/engine_wo.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_wo.h b/src/engine/engine_wo.h
index e5bfecee..31a7c746 100644
--- a/src/engine/engine_wo.h
+++ b/src/engine/engine_wo.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_WO_H_
diff --git a/src/engine/engine_wt.c b/src/engine/engine_wt.c
index 4714325a..f626f2a0 100644
--- a/src/engine/engine_wt.c
+++ b/src/engine/engine_wt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_wt.h b/src/engine/engine_wt.h
index 432f1f2b..6d609eeb 100644
--- a/src/engine/engine_wt.h
+++ b/src/engine/engine_wt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_WT_H_
diff --git a/src/engine/engine_zero.c b/src/engine/engine_zero.c
index 36158ddc..3c7ce5a9 100644
--- a/src/engine/engine_zero.c
+++ b/src/engine/engine_zero.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/engine/engine_zero.h b/src/engine/engine_zero.h
index 94ae1b82..5a24336a 100644
--- a/src/engine/engine_zero.h
+++ b/src/engine/engine_zero.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef ENGINE_ZERO_H_
diff --git a/src/metadata/metadata.h b/src/metadata/metadata.h
index 6b2d4fad..f6db6ea7 100644
--- a/src/metadata/metadata.h
+++ b/src/metadata/metadata.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_H__
diff --git a/src/metadata/metadata_bit.h b/src/metadata/metadata_bit.h
index 77085b6d..a58dd95b 100644
--- a/src/metadata/metadata_bit.h
+++ b/src/metadata/metadata_bit.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /*******************************************************************************
diff --git a/src/metadata/metadata_cache_line.h b/src/metadata/metadata_cache_line.h
index 48331745..fa7230ac 100644
--- a/src/metadata/metadata_cache_line.h
+++ b/src/metadata/metadata_cache_line.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_CACHE_LINE_H__
diff --git a/src/metadata/metadata_cleaning_policy.c b/src/metadata/metadata_cleaning_policy.c
index 98a25893..1f52943a 100644
--- a/src/metadata/metadata_cleaning_policy.c
+++ b/src/metadata/metadata_cleaning_policy.c
@@ -1,6 +1,6 @@
 /*
- * copyright(c) 2020 intel corporation
- * spdx-license-identifier: bsd-3-clause-clear
+ * Copyright(c) 2020-2021 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_cleaning_policy.h b/src/metadata/metadata_cleaning_policy.h
index 74f43550..f5ae1c0c 100644
--- a/src/metadata/metadata_cleaning_policy.h
+++ b/src/metadata/metadata_cleaning_policy.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_CLEANING_POLICY_H__
diff --git a/src/metadata/metadata_collision.c b/src/metadata/metadata_collision.c
index e8e51d88..65320109 100644
--- a/src/metadata/metadata_collision.c
+++ b/src/metadata/metadata_collision.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_collision.h b/src/metadata/metadata_collision.h
index debc1858..7e8bca76 100644
--- a/src/metadata/metadata_collision.h
+++ b/src/metadata/metadata_collision.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_COLLISION_H__
diff --git a/src/metadata/metadata_common.h b/src/metadata/metadata_common.h
index 02c9adda..24ca28ca 100644
--- a/src/metadata/metadata_common.h
+++ b/src/metadata/metadata_common.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_COMMON_H__
diff --git a/src/metadata/metadata_core.c b/src/metadata/metadata_core.c
index 51cb9a11..a2701d67 100644
--- a/src/metadata/metadata_core.c
+++ b/src/metadata/metadata_core.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_core.h b/src/metadata/metadata_core.h
index 3e23e03d..11186b30 100644
--- a/src/metadata/metadata_core.h
+++ b/src/metadata/metadata_core.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_CORE_H__
diff --git a/src/metadata/metadata_eviction_policy.c b/src/metadata/metadata_eviction_policy.c
index 19fb3abc..ea42eb2e 100644
--- a/src/metadata/metadata_eviction_policy.c
+++ b/src/metadata/metadata_eviction_policy.c
@@ -1,6 +1,6 @@
 /*
- * copyright(c )2020 intel corporation
- * spdx-license-identifier: bsd-3-clause-clear
+ * Copyright(c) 2020-2021 Intel Corporation
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_eviction_policy.h b/src/metadata/metadata_eviction_policy.h
index b1e74435..d01fc152 100644
--- a/src/metadata/metadata_eviction_policy.h
+++ b/src/metadata/metadata_eviction_policy.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_EVICTION_H__
diff --git a/src/metadata/metadata_internal.h b/src/metadata/metadata_internal.h
index ebb228db..fa38117a 100644
--- a/src/metadata/metadata_internal.h
+++ b/src/metadata/metadata_internal.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_INTERNAL_H__
diff --git a/src/metadata/metadata_io.c b/src/metadata/metadata_io.c
index eae45d07..9d6a9111 100644
--- a/src/metadata/metadata_io.c
+++ b/src/metadata/metadata_io.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "metadata.h"
 #include "metadata_io.h"
diff --git a/src/metadata/metadata_io.h b/src/metadata/metadata_io.h
index 526a9fdf..9fe455a5 100644
--- a/src/metadata/metadata_io.h
+++ b/src/metadata/metadata_io.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_IO_H__
diff --git a/src/metadata/metadata_misc.c b/src/metadata/metadata_misc.c
index 2e373029..294fe28b 100644
--- a/src/metadata/metadata_misc.c
+++ b/src/metadata/metadata_misc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_misc.h b/src/metadata/metadata_misc.h
index 7e89949b..ab068d32 100644
--- a/src/metadata/metadata_misc.h
+++ b/src/metadata/metadata_misc.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_MISC_H__
diff --git a/src/metadata/metadata_partition.c b/src/metadata/metadata_partition.c
index ea2c3be1..6754a487 100644
--- a/src/metadata/metadata_partition.c
+++ b/src/metadata/metadata_partition.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/metadata/metadata_partition.h b/src/metadata/metadata_partition.h
index be66901c..e05001e8 100644
--- a/src/metadata/metadata_partition.h
+++ b/src/metadata/metadata_partition.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_PARTITION_H__
diff --git a/src/metadata/metadata_partition_structs.h b/src/metadata/metadata_partition_structs.h
index d99ab520..2b685281 100644
--- a/src/metadata/metadata_partition_structs.h
+++ b/src/metadata/metadata_partition_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_PARTITION_STRUCTS_H__
diff --git a/src/metadata/metadata_raw.c b/src/metadata/metadata_raw.c
index b7ee15c0..59331014 100644
--- a/src/metadata/metadata_raw.c
+++ b/src/metadata/metadata_raw.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "metadata.h"
diff --git a/src/metadata/metadata_raw.h b/src/metadata/metadata_raw.h
index d8cf9bdb..b63512cf 100644
--- a/src/metadata/metadata_raw.h
+++ b/src/metadata/metadata_raw.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_RAW_H__
diff --git a/src/metadata/metadata_raw_atomic.c b/src/metadata/metadata_raw_atomic.c
index 617dbb94..1b77c569 100644
--- a/src/metadata/metadata_raw_atomic.c
+++ b/src/metadata/metadata_raw_atomic.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "metadata.h"
diff --git a/src/metadata/metadata_raw_atomic.h b/src/metadata/metadata_raw_atomic.h
index 4cddea9c..7305b0d0 100644
--- a/src/metadata/metadata_raw_atomic.h
+++ b/src/metadata/metadata_raw_atomic.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_RAW_ATOMIC_H__
diff --git a/src/metadata/metadata_raw_dynamic.h b/src/metadata/metadata_raw_dynamic.h
index 714896db..b83298a6 100644
--- a/src/metadata/metadata_raw_dynamic.h
+++ b/src/metadata/metadata_raw_dynamic.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_RAW_DYNAMIC_H__
diff --git a/src/metadata/metadata_raw_volatile.c b/src/metadata/metadata_raw_volatile.c
index ec55fcb9..82129fb1 100644
--- a/src/metadata/metadata_raw_volatile.c
+++ b/src/metadata/metadata_raw_volatile.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "metadata.h"
diff --git a/src/metadata/metadata_raw_volatile.h b/src/metadata/metadata_raw_volatile.h
index 24286e08..f3a37de2 100644
--- a/src/metadata/metadata_raw_volatile.h
+++ b/src/metadata/metadata_raw_volatile.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_RAW_VOLATILE_H__
diff --git a/src/metadata/metadata_segment.c b/src/metadata/metadata_segment.c
index c2c8deb9..bd7d58de 100644
--- a/src/metadata/metadata_segment.c
+++ b/src/metadata/metadata_segment.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "metadata_internal.h"
 #include "metadata_superblock.h"
diff --git a/src/metadata/metadata_segment.h b/src/metadata/metadata_segment.h
index 12470fda..51dcea38 100644
--- a/src/metadata/metadata_segment.h
+++ b/src/metadata/metadata_segment.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_SEGMENT_OPS_H__
diff --git a/src/metadata/metadata_segment_id.h b/src/metadata/metadata_segment_id.h
index 4e8e9aa9..8d08877e 100644
--- a/src/metadata/metadata_segment_id.h
+++ b/src/metadata/metadata_segment_id.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_HASH_H__
diff --git a/src/metadata/metadata_status.h b/src/metadata/metadata_status.h
index 661591c5..cc888b67 100644
--- a/src/metadata/metadata_status.h
+++ b/src/metadata/metadata_status.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_STATUS_H__
diff --git a/src/metadata/metadata_structs.h b/src/metadata/metadata_structs.h
index a9dda878..ee2fddd7 100644
--- a/src/metadata/metadata_structs.h
+++ b/src/metadata/metadata_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_STRUCTS_H__
diff --git a/src/metadata/metadata_superblock.c b/src/metadata/metadata_superblock.c
index 76f9095a..da5d656d 100644
--- a/src/metadata/metadata_superblock.c
+++ b/src/metadata/metadata_superblock.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "metadata.h"
diff --git a/src/metadata/metadata_superblock.h b/src/metadata/metadata_superblock.h
index 290bb24a..87528f5b 100644
--- a/src/metadata/metadata_superblock.h
+++ b/src/metadata/metadata_superblock.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __METADATA_SUPERBLOCK_H__
diff --git a/src/mngt/ocf_mngt_cache.c b/src/mngt/ocf_mngt_cache.c
index 4285237e..f221cb51 100644
--- a/src/mngt/ocf_mngt_cache.c
+++ b/src/mngt/ocf_mngt_cache.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/mngt/ocf_mngt_common.h b/src/mngt/ocf_mngt_common.h
index 61eec762..5e8b301d 100644
--- a/src/mngt/ocf_mngt_common.h
+++ b/src/mngt/ocf_mngt_common.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 
diff --git a/src/mngt/ocf_mngt_core.c b/src/mngt/ocf_mngt_core.c
index b31c6708..68902494 100644
--- a/src/mngt/ocf_mngt_core.c
+++ b/src/mngt/ocf_mngt_core.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/mngt/ocf_mngt_core_pool.c b/src/mngt/ocf_mngt_core_pool.c
index 57b451c7..5555d585 100644
--- a/src/mngt/ocf_mngt_core_pool.c
+++ b/src/mngt/ocf_mngt_core_pool.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/mngt/ocf_mngt_core_pool_priv.h b/src/mngt/ocf_mngt_core_pool_priv.h
index 1558b11d..e89c18f1 100644
--- a/src/mngt/ocf_mngt_core_pool_priv.h
+++ b/src/mngt/ocf_mngt_core_pool_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_MNGT_CORE_POOL_PRIV_H__
diff --git a/src/mngt/ocf_mngt_core_priv.h b/src/mngt/ocf_mngt_core_priv.h
index dde90dbf..1784ad02 100644
--- a/src/mngt/ocf_mngt_core_priv.h
+++ b/src/mngt/ocf_mngt_core_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_MNGT_CORE_PRIV_H__
diff --git a/src/mngt/ocf_mngt_flush.c b/src/mngt/ocf_mngt_flush.c
index 007a8bdb..4e5ec6aa 100644
--- a/src/mngt/ocf_mngt_flush.c
+++ b/src/mngt/ocf_mngt_flush.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/mngt/ocf_mngt_io_class.c b/src/mngt/ocf_mngt_io_class.c
index 9cd57b83..b9241c63 100644
--- a/src/mngt/ocf_mngt_io_class.c
+++ b/src/mngt/ocf_mngt_io_class.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/mngt/ocf_mngt_misc.c b/src/mngt/ocf_mngt_misc.c
index 5ef54adb..272f75ab 100644
--- a/src/mngt/ocf_mngt_misc.c
+++ b/src/mngt/ocf_mngt_misc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_cache.c b/src/ocf_cache.c
index 84f67086..f0fe2bb8 100644
--- a/src/ocf_cache.c
+++ b/src/ocf_cache.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_cache_priv.h b/src/ocf_cache_priv.h
index e829db0a..6771f0ea 100644
--- a/src/ocf_cache_priv.h
+++ b/src/ocf_cache_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_CACHE_PRIV_H__
diff --git a/src/ocf_core.c b/src/ocf_core.c
index 0653f429..56cb0547 100644
--- a/src/ocf_core.c
+++ b/src/ocf_core.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_core_priv.h b/src/ocf_core_priv.h
index 766f71aa..68bb8796 100644
--- a/src/ocf_core_priv.h
+++ b/src/ocf_core_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_CORE_PRIV_H__
diff --git a/src/ocf_ctx_priv.h b/src/ocf_ctx_priv.h
index baf1cc56..1132bf67 100644
--- a/src/ocf_ctx_priv.h
+++ b/src/ocf_ctx_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_CTX_PRIV_H__
diff --git a/src/ocf_def_priv.h b/src/ocf_def_priv.h
index 7a8e164b..98ba8ce9 100644
--- a/src/ocf_def_priv.h
+++ b/src/ocf_def_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_DEF_PRIV_H__
diff --git a/src/ocf_io_class.c b/src/ocf_io_class.c
index 008cba81..3a3554ab 100644
--- a/src/ocf_io_class.c
+++ b/src/ocf_io_class.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_io_priv.h b/src/ocf_io_priv.h
index 4b2fffab..0e219f77 100644
--- a/src/ocf_io_priv.h
+++ b/src/ocf_io_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_IO_PRIV_H__
diff --git a/src/ocf_logger.c b/src/ocf_logger.c
index 56fa10d7..68b4576e 100644
--- a/src/ocf_logger.c
+++ b/src/ocf_logger.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_env.h"
diff --git a/src/ocf_logger_priv.h b/src/ocf_logger_priv.h
index b7254eb9..a9ffa22d 100644
--- a/src/ocf_logger_priv.h
+++ b/src/ocf_logger_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_LOGGER_PRIV_H__
diff --git a/src/ocf_lru.c b/src/ocf_lru.c
index e9c3882f..171151f7 100644
--- a/src/ocf_lru.c
+++ b/src/ocf_lru.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_space.h"
diff --git a/src/ocf_lru.h b/src/ocf_lru.h
index a71b5fd6..4b7dabed 100644
--- a/src/ocf_lru.h
+++ b/src/ocf_lru.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __EVICTION_LRU_H__
 #define __EVICTION_LRU_H__
diff --git a/src/ocf_lru_structs.h b/src/ocf_lru_structs.h
index c153d264..c5bfc1b6 100644
--- a/src/ocf_lru_structs.h
+++ b/src/ocf_lru_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __EVICTION_LRU_STRUCTS_H__
 
diff --git a/src/ocf_metadata.c b/src/ocf_metadata.c
index 0071d366..a6305a37 100644
--- a/src/ocf_metadata.c
+++ b/src/ocf_metadata.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf_priv.h"
 #include "ocf_cache_priv.h"
diff --git a/src/ocf_priv.h b/src/ocf_priv.h
index 5f505594..4b7fb7e0 100644
--- a/src/ocf_priv.h
+++ b/src/ocf_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __OCF_PRIV_H__
 #define __OCF_PRIV_H__
diff --git a/src/ocf_queue_priv.h b/src/ocf_queue_priv.h
index def5d084..50160c3a 100644
--- a/src/ocf_queue_priv.h
+++ b/src/ocf_queue_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef OCF_QUEUE_PRIV_H_
diff --git a/src/ocf_request.c b/src/ocf_request.c
index 5b55245b..5905b74f 100644
--- a/src/ocf_request.c
+++ b/src/ocf_request.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_request.h b/src/ocf_request.h
index a704d546..59a73905 100644
--- a/src/ocf_request.h
+++ b/src/ocf_request.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_REQUEST_H__
diff --git a/src/ocf_seq_cutoff.c b/src/ocf_seq_cutoff.c
index b6f4e332..1c8e8119 100644
--- a/src/ocf_seq_cutoff.c
+++ b/src/ocf_seq_cutoff.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_seq_cutoff.h"
diff --git a/src/ocf_seq_cutoff.h b/src/ocf_seq_cutoff.h
index fce56afa..df3139e0 100644
--- a/src/ocf_seq_cutoff.h
+++ b/src/ocf_seq_cutoff.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_SEQ_CUTOFF_H__
diff --git a/src/ocf_space.c b/src/ocf_space.c
index d0c639b6..f24e12b9 100644
--- a/src/ocf_space.c
+++ b/src/ocf_space.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf_space.h"
diff --git a/src/ocf_space.h b/src/ocf_space.h
index 61383dbb..1b893dd6 100644
--- a/src/ocf_space.h
+++ b/src/ocf_space.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __LAYER_EVICTION_POLICY_H__
diff --git a/src/ocf_stats.c b/src/ocf_stats.c
index f4641017..f8bbef5a 100644
--- a/src/ocf_stats.c
+++ b/src/ocf_stats.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_stats_builder.c b/src/ocf_stats_builder.c
index 6990ea03..07aae64a 100644
--- a/src/ocf_stats_builder.c
+++ b/src/ocf_stats_builder.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/ocf_stats_priv.h b/src/ocf_stats_priv.h
index 4fb933d6..706844b4 100644
--- a/src/ocf_stats_priv.h
+++ b/src/ocf_stats_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_STATS_PRIV_H__
diff --git a/src/ocf_volume_priv.h b/src/ocf_volume_priv.h
index cf361be5..08b70e0c 100644
--- a/src/ocf_volume_priv.h
+++ b/src/ocf_volume_priv.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_VOLUME_PRIV_H__
diff --git a/src/promotion/nhit/nhit.c b/src/promotion/nhit/nhit.c
index 04f07631..009a1611 100644
--- a/src/promotion/nhit/nhit.c
+++ b/src/promotion/nhit/nhit.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "nhit_hash.h"
diff --git a/src/promotion/nhit/nhit.h b/src/promotion/nhit/nhit.h
index 412375c4..567bc49d 100644
--- a/src/promotion/nhit/nhit.h
+++ b/src/promotion/nhit/nhit.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef NHIT_PROMOTION_POLICY_H_
diff --git a/src/promotion/nhit/nhit_hash.c b/src/promotion/nhit/nhit_hash.c
index 2ef77ea2..8710ab93 100644
--- a/src/promotion/nhit/nhit_hash.c
+++ b/src/promotion/nhit/nhit_hash.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../../ocf_priv.h"
diff --git a/src/promotion/nhit/nhit_hash.h b/src/promotion/nhit/nhit_hash.h
index bf282524..71d8e0cd 100644
--- a/src/promotion/nhit/nhit_hash.h
+++ b/src/promotion/nhit/nhit_hash.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef NHIT_HASH_H_
diff --git a/src/promotion/nhit/nhit_structs.h b/src/promotion/nhit/nhit_structs.h
index 2faf792f..69ddce9e 100644
--- a/src/promotion/nhit/nhit_structs.h
+++ b/src/promotion/nhit/nhit_structs.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef __PROMOTION_NHIT_STRUCTS_H_
 #define __PROMOTION_NHIT_STRUCTS_H_
diff --git a/src/promotion/ops.h b/src/promotion/ops.h
index cd336714..41f0593a 100644
--- a/src/promotion/ops.h
+++ b/src/promotion/ops.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef PROMOTION_OPS_H_
diff --git a/src/promotion/promotion.c b/src/promotion/promotion.c
index 9b606416..07d9cc30 100644
--- a/src/promotion/promotion.c
+++ b/src/promotion/promotion.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../metadata/metadata.h"
diff --git a/src/promotion/promotion.h b/src/promotion/promotion.h
index 7afa4173..f4005181 100644
--- a/src/promotion/promotion.h
+++ b/src/promotion/promotion.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef PROMOTION_H_
diff --git a/src/utils/utils_alock.c b/src/utils/utils_alock.c
index 25f41a62..e36e9db9 100644
--- a/src/utils/utils_alock.c
+++ b/src/utils/utils_alock.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../ocf_cache_priv.h"
diff --git a/src/utils/utils_alock.h b/src/utils/utils_alock.h
index 2d3df97d..4568808e 100644
--- a/src/utils/utils_alock.h
+++ b/src/utils/utils_alock.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #ifndef OCF_UTILS_ALOCK_H_
 #define OCF_UTILS_ALOCK_H_
diff --git a/src/utils/utils_async_lock.h b/src/utils/utils_async_lock.h
index 464671c8..db3d3520 100644
--- a/src/utils/utils_async_lock.h
+++ b/src/utils/utils_async_lock.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_ASYNC_LOCK_H__
diff --git a/src/utils/utils_cache_line.c b/src/utils/utils_cache_line.c
index 281ff59b..8dfbae24 100644
--- a/src/utils/utils_cache_line.c
+++ b/src/utils/utils_cache_line.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "utils_cache_line.h"
diff --git a/src/utils/utils_cache_line.h b/src/utils/utils_cache_line.h
index 9ce8894e..ccfafac9 100644
--- a/src/utils/utils_cache_line.h
+++ b/src/utils/utils_cache_line.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_CACHE_LINE_H_
diff --git a/src/utils/utils_cleaner.c b/src/utils/utils_cleaner.c
index c9e285da..4b2e8ffe 100644
--- a/src/utils/utils_cleaner.c
+++ b/src/utils/utils_cleaner.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../metadata/metadata.h"
diff --git a/src/utils/utils_cleaner.h b/src/utils/utils_cleaner.h
index 40bfe114..005a4916 100644
--- a/src/utils/utils_cleaner.h
+++ b/src/utils/utils_cleaner.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_CLEANER_H_
diff --git a/src/utils/utils_io.c b/src/utils/utils_io.c
index b078e42d..50f15bd3 100644
--- a/src/utils/utils_io.c
+++ b/src/utils/utils_io.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/utils/utils_io.h b/src/utils/utils_io.h
index 27ddc060..c24c1d92 100644
--- a/src/utils/utils_io.h
+++ b/src/utils/utils_io.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_IO_H_
diff --git a/src/utils/utils_io_allocator.h b/src/utils/utils_io_allocator.h
index 7639f48b..f45f6ccd 100644
--- a/src/utils/utils_io_allocator.h
+++ b/src/utils/utils_io_allocator.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_IO_ALLOCATOR_H__
diff --git a/src/utils/utils_list.c b/src/utils/utils_list.c
index 431067fd..e7e78e59 100644
--- a/src/utils/utils_list.c
+++ b/src/utils/utils_list.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/utils/utils_list.h b/src/utils/utils_list.h
index c8a069d6..6a8d069e 100644
--- a/src/utils/utils_list.h
+++ b/src/utils/utils_list.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_LIST_H__
diff --git a/src/utils/utils_pipeline.c b/src/utils/utils_pipeline.c
index 938f934d..bb7cd040 100644
--- a/src/utils/utils_pipeline.c
+++ b/src/utils/utils_pipeline.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/utils/utils_pipeline.h b/src/utils/utils_pipeline.h
index 5d4e8012..1b03ae3e 100644
--- a/src/utils/utils_pipeline.h
+++ b/src/utils/utils_pipeline.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_PIPELINE_H__
diff --git a/src/utils/utils_rbtree.c b/src/utils/utils_rbtree.c
index 7f20ad00..0d7b4f58 100644
--- a/src/utils/utils_rbtree.c
+++ b/src/utils/utils_rbtree.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "utils_rbtree.h"
diff --git a/src/utils/utils_rbtree.h b/src/utils/utils_rbtree.h
index 70a36e98..9ee99133 100644
--- a/src/utils/utils_rbtree.h
+++ b/src/utils/utils_rbtree.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2020-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_RBTREE_H__
diff --git a/src/utils/utils_realloc.c b/src/utils/utils_realloc.c
index b1de6995..bed4e0f4 100644
--- a/src/utils/utils_realloc.c
+++ b/src/utils/utils_realloc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "ocf/ocf.h"
 #include "utils_realloc.h"
diff --git a/src/utils/utils_realloc.h b/src/utils/utils_realloc.h
index 3ba90505..e538c285 100644
--- a/src/utils/utils_realloc.h
+++ b/src/utils/utils_realloc.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_REALLOC_H_
diff --git a/src/utils/utils_refcnt.c b/src/utils/utils_refcnt.c
index 8bc7a1af..ced88ad0 100644
--- a/src/utils/utils_refcnt.c
+++ b/src/utils/utils_refcnt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../utils/utils_refcnt.h"
diff --git a/src/utils/utils_refcnt.h b/src/utils/utils_refcnt.h
index df7588d8..eca22cc0 100644
--- a/src/utils/utils_refcnt.h
+++ b/src/utils/utils_refcnt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2019-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __OCF_REFCNT_H__
diff --git a/src/utils/utils_request.c b/src/utils/utils_request.c
index de0d979c..405111f8 100644
--- a/src/utils/utils_request.c
+++ b/src/utils/utils_request.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2020 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_REQUEST_H_
diff --git a/src/utils/utils_request.h b/src/utils/utils_request.h
index 3d752b59..3cfab590 100644
--- a/src/utils/utils_request.h
+++ b/src/utils/utils_request.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../ocf_request.h"
diff --git a/src/utils/utils_stats.h b/src/utils/utils_stats.h
index 0726cf56..b5a690cf 100644
--- a/src/utils/utils_stats.h
+++ b/src/utils/utils_stats.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef UTILS_STATS_H_
diff --git a/src/utils/utils_user_part.c b/src/utils/utils_user_part.c
index 056f8a08..6cd5a402 100644
--- a/src/utils/utils_user_part.c
+++ b/src/utils/utils_user_part.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf.h"
diff --git a/src/utils/utils_user_part.h b/src/utils/utils_user_part.h
index a64a8a45..17ccdc6f 100644
--- a/src/utils/utils_user_part.h
+++ b/src/utils/utils_user_part.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __UTILS_PARTITION_H__
diff --git a/tests/build/Makefile b/tests/build/Makefile
index 77b970f0..f287e993 100644
--- a/tests/build/Makefile
+++ b/tests/build/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 #
diff --git a/tests/functional/Makefile b/tests/functional/Makefile
index a3cb08ec..16d28b41 100755
--- a/tests/functional/Makefile
+++ b/tests/functional/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 PWD=$(shell pwd)
diff --git a/tests/functional/pyocf/ocf.py b/tests/functional/pyocf/ocf.py
index 0ed33f05..1ca4f5ae 100644
--- a/tests/functional/pyocf/ocf.py
+++ b/tests/functional/pyocf/ocf.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 from ctypes import c_void_p, cdll
 import inspect
diff --git a/tests/functional/pyocf/types/cache.py b/tests/functional/pyocf/types/cache.py
index 90741e9c..2cf86cc6 100644
--- a/tests/functional/pyocf/types/cache.py
+++ b/tests/functional/pyocf/types/cache.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import (
diff --git a/tests/functional/pyocf/types/cleaner.py b/tests/functional/pyocf/types/cleaner.py
index 2def1568..0315b175 100644
--- a/tests/functional/pyocf/types/cleaner.py
+++ b/tests/functional/pyocf/types/cleaner.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_void_p, CFUNCTYPE, Structure, c_int
diff --git a/tests/functional/pyocf/types/core.py b/tests/functional/pyocf/types/core.py
index 44e657aa..9e1f663a 100644
--- a/tests/functional/pyocf/types/core.py
+++ b/tests/functional/pyocf/types/core.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/pyocf/types/ctx.py b/tests/functional/pyocf/types/ctx.py
index 17e14d20..7a5e4de2 100644
--- a/tests/functional/pyocf/types/ctx.py
+++ b/tests/functional/pyocf/types/ctx.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_void_p, Structure, c_char_p, cast, pointer, byref, c_int
diff --git a/tests/functional/pyocf/types/data.py b/tests/functional/pyocf/types/data.py
index 789f2469..6e142663 100644
--- a/tests/functional/pyocf/types/data.py
+++ b/tests/functional/pyocf/types/data.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import (
diff --git a/tests/functional/pyocf/types/io.py b/tests/functional/pyocf/types/io.py
index 8a3daa84..467e3a85 100644
--- a/tests/functional/pyocf/types/io.py
+++ b/tests/functional/pyocf/types/io.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import (
diff --git a/tests/functional/pyocf/types/ioclass.py b/tests/functional/pyocf/types/ioclass.py
index 2d03c08f..1d9f9f8a 100644
--- a/tests/functional/pyocf/types/ioclass.py
+++ b/tests/functional/pyocf/types/ioclass.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_uint8, c_uint32, c_int, c_int16, c_uint16, c_char, c_char_p, Structure
diff --git a/tests/functional/pyocf/types/logger.py b/tests/functional/pyocf/types/logger.py
index 7ba71399..9518bb07 100644
--- a/tests/functional/pyocf/types/logger.py
+++ b/tests/functional/pyocf/types/logger.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import (
diff --git a/tests/functional/pyocf/types/queue.py b/tests/functional/pyocf/types/queue.py
index f65a6c49..eed3c5f2 100644
--- a/tests/functional/pyocf/types/queue.py
+++ b/tests/functional/pyocf/types/queue.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_void_p, CFUNCTYPE, Structure, byref
diff --git a/tests/functional/pyocf/types/shared.py b/tests/functional/pyocf/types/shared.py
index cdd637b6..c1fd5829 100644
--- a/tests/functional/pyocf/types/shared.py
+++ b/tests/functional/pyocf/types/shared.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/pyocf/types/stats/cache.py b/tests/functional/pyocf/types/stats/cache.py
index bc009d84..3aaaaf51 100644
--- a/tests/functional/pyocf/types/stats/cache.py
+++ b/tests/functional/pyocf/types/stats/cache.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_uint8, c_uint32, c_uint64, c_bool, c_int, Structure
diff --git a/tests/functional/pyocf/types/stats/core.py b/tests/functional/pyocf/types/stats/core.py
index 1ba4bab0..4eaed5ad 100644
--- a/tests/functional/pyocf/types/stats/core.py
+++ b/tests/functional/pyocf/types/stats/core.py
@@ -1,7 +1,7 @@
 
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_uint32, c_uint64, Structure
diff --git a/tests/functional/pyocf/types/stats/shared.py b/tests/functional/pyocf/types/stats/shared.py
index 40e9addb..172b207a 100644
--- a/tests/functional/pyocf/types/stats/shared.py
+++ b/tests/functional/pyocf/types/stats/shared.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_uint64, c_uint32, Structure
diff --git a/tests/functional/pyocf/types/volume.py b/tests/functional/pyocf/types/volume.py
index 29bf0909..c983c603 100644
--- a/tests/functional/pyocf/types/volume.py
+++ b/tests/functional/pyocf/types/volume.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import (
diff --git a/tests/functional/pyocf/utils.py b/tests/functional/pyocf/utils.py
index 04f20a5e..0c86ae1a 100644
--- a/tests/functional/pyocf/utils.py
+++ b/tests/functional/pyocf/utils.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import string_at
diff --git a/tests/functional/pyocf/wrappers/ocf_io_wrappers.c b/tests/functional/pyocf/wrappers/ocf_io_wrappers.c
index f85f59df..776de724 100644
--- a/tests/functional/pyocf/wrappers/ocf_io_wrappers.c
+++ b/tests/functional/pyocf/wrappers/ocf_io_wrappers.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf_io.h"
diff --git a/tests/functional/pyocf/wrappers/ocf_logger_wrappers.c b/tests/functional/pyocf/wrappers/ocf_logger_wrappers.c
index e36836c0..c412356e 100644
--- a/tests/functional/pyocf/wrappers/ocf_logger_wrappers.c
+++ b/tests/functional/pyocf/wrappers/ocf_logger_wrappers.c
@@ -1,7 +1,7 @@
 
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <ocf/ocf_types.h>
diff --git a/tests/functional/pyocf/wrappers/ocf_volume_wrappers.c b/tests/functional/pyocf/wrappers/ocf_volume_wrappers.c
index 558e7eab..f541dc84 100644
--- a/tests/functional/pyocf/wrappers/ocf_volume_wrappers.c
+++ b/tests/functional/pyocf/wrappers/ocf_volume_wrappers.c
@@ -1,7 +1,7 @@
 
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "ocf/ocf_io.h"
diff --git a/tests/functional/tests/basic/test_pyocf.py b/tests/functional/tests/basic/test_pyocf.py
index 7657f0d6..a1530c81 100644
--- a/tests/functional/tests/basic/test_pyocf.py
+++ b/tests/functional/tests/basic/test_pyocf.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import pytest
diff --git a/tests/functional/tests/conftest.py b/tests/functional/tests/conftest.py
index ba9f3fdc..01c0f413 100644
--- a/tests/functional/tests/conftest.py
+++ b/tests/functional/tests/conftest.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import os
diff --git a/tests/functional/tests/engine/test_io_flags.py b/tests/functional/tests/engine/test_io_flags.py
index 7c8decef..5b76ade6 100644
--- a/tests/functional/tests/engine/test_io_flags.py
+++ b/tests/functional/tests/engine/test_io_flags.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2020-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int, memmove, cast, c_void_p
diff --git a/tests/functional/tests/engine/test_pp.py b/tests/functional/tests/engine/test_pp.py
index 80accafc..b73f124d 100644
--- a/tests/functional/tests/engine/test_pp.py
+++ b/tests/functional/tests/engine/test_pp.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int
diff --git a/tests/functional/tests/engine/test_read.py b/tests/functional/tests/engine/test_read.py
index f2ebc784..d875f4ba 100644
--- a/tests/functional/tests/engine/test_read.py
+++ b/tests/functional/tests/engine/test_read.py
@@ -1,5 +1,5 @@
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int, memmove, cast, c_void_p
diff --git a/tests/functional/tests/engine/test_seq_cutoff.py b/tests/functional/tests/engine/test_seq_cutoff.py
index 9d11dd71..fca4ffa0 100644
--- a/tests/functional/tests/engine/test_seq_cutoff.py
+++ b/tests/functional/tests/engine/test_seq_cutoff.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2020-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int
diff --git a/tests/functional/tests/eviction/test_eviction.py b/tests/functional/tests/eviction/test_eviction.py
index 55dc0a6d..539b3587 100644
--- a/tests/functional/tests/eviction/test_eviction.py
+++ b/tests/functional/tests/eviction/test_eviction.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/tests/flush/test_flush_after_mngmt.py b/tests/functional/tests/flush/test_flush_after_mngmt.py
index b9064e34..3cb03b34 100644
--- a/tests/functional/tests/flush/test_flush_after_mngmt.py
+++ b/tests/functional/tests/flush/test_flush_after_mngmt.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2020-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int, memmove, cast, c_void_p
diff --git a/tests/functional/tests/management/test_add_remove.py b/tests/functional/tests/management/test_add_remove.py
index f720ef19..d5e2dd0f 100644
--- a/tests/functional/tests/management/test_add_remove.py
+++ b/tests/functional/tests/management/test_add_remove.py
@@ -1,5 +1,5 @@
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import pytest
diff --git a/tests/functional/tests/management/test_attach_cache.py b/tests/functional/tests/management/test_attach_cache.py
index 1cd9d170..8150b3bf 100644
--- a/tests/functional/tests/management/test_attach_cache.py
+++ b/tests/functional/tests/management/test_attach_cache.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/tests/management/test_change_params.py b/tests/functional/tests/management/test_change_params.py
index a9df4cec..7f32bb17 100644
--- a/tests/functional/tests/management/test_change_params.py
+++ b/tests/functional/tests/management/test_change_params.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import pytest
diff --git a/tests/functional/tests/management/test_start_stop.py b/tests/functional/tests/management/test_start_stop.py
index 7edef737..bfe4c268 100644
--- a/tests/functional/tests/management/test_start_stop.py
+++ b/tests/functional/tests/management/test_start_stop.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/tests/security/conftest.py b/tests/functional/tests/security/conftest.py
index a38ec408..0381999b 100644
--- a/tests/functional/tests/security/conftest.py
+++ b/tests/functional/tests/security/conftest.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import os
diff --git a/tests/functional/tests/security/test_management_fuzzy.py b/tests/functional/tests/security/test_management_fuzzy.py
index b8f59584..dbe39500 100644
--- a/tests/functional/tests/security/test_management_fuzzy.py
+++ b/tests/functional/tests/security/test_management_fuzzy.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import pytest
diff --git a/tests/functional/tests/security/test_management_start_fuzzy.py b/tests/functional/tests/security/test_management_start_fuzzy.py
index 49b78dcd..11a8764e 100644
--- a/tests/functional/tests/security/test_management_start_fuzzy.py
+++ b/tests/functional/tests/security/test_management_start_fuzzy.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import logging
diff --git a/tests/functional/tests/security/test_negative_io.py b/tests/functional/tests/security/test_negative_io.py
index 566f8d79..2eefc160 100644
--- a/tests/functional/tests/security/test_negative_io.py
+++ b/tests/functional/tests/security/test_negative_io.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 from ctypes import c_int
diff --git a/tests/functional/tests/security/test_secure_erase.py b/tests/functional/tests/security/test_secure_erase.py
index 085625dd..181bd92c 100644
--- a/tests/functional/tests/security/test_secure_erase.py
+++ b/tests/functional/tests/security/test_secure_erase.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import pytest
diff --git a/tests/functional/tests/utils/random.py b/tests/functional/tests/utils/random.py
index 1d4d2f28..1b7d175c 100644
--- a/tests/functional/tests/utils/random.py
+++ b/tests/functional/tests/utils/random.py
@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import random
diff --git a/tests/functional/utils/configure_random.py b/tests/functional/utils/configure_random.py
index 9543d86f..b1d0dedb 100755
--- a/tests/functional/utils/configure_random.py
+++ b/tests/functional/utils/configure_random.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import sys
diff --git a/tests/unit/framework/add_new_test_file.py b/tests/unit/framework/add_new_test_file.py
index e17da411..012706f8 100755
--- a/tests/unit/framework/add_new_test_file.py
+++ b/tests/unit/framework/add_new_test_file.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import tests_config
diff --git a/tests/unit/framework/prepare_sources_for_testing.py b/tests/unit/framework/prepare_sources_for_testing.py
index 6652dec0..0f478ad5 100755
--- a/tests/unit/framework/prepare_sources_for_testing.py
+++ b/tests/unit/framework/prepare_sources_for_testing.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import shutil
diff --git a/tests/unit/framework/run_unit_tests.py b/tests/unit/framework/run_unit_tests.py
index 1fffcc73..55ad7926 100755
--- a/tests/unit/framework/run_unit_tests.py
+++ b/tests/unit/framework/run_unit_tests.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import tests_config
diff --git a/tests/unit/framework/tests_config.py b/tests/unit/framework/tests_config.py
index 2c3a794b..427f8629 100644
--- a/tests/unit/framework/tests_config.py
+++ b/tests/unit/framework/tests_config.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 # ALL PATHS SHOULD BE ENDED WITH "/" CHARACTER
diff --git a/tests/unit/tests/add_new_test_file.py b/tests/unit/tests/add_new_test_file.py
index a015d796..9d0a7459 100755
--- a/tests/unit/tests/add_new_test_file.py
+++ b/tests/unit/tests/add_new_test_file.py
@@ -2,7 +2,7 @@
 
 #
 # Copyright(c) 2012-2021 Intel Corporation
-# SPDX-License-Identifier: BSD-3-Clause-Clear
+# SPDX-License-Identifier: BSD-3-Clause
 #
 
 import subprocess
diff --git a/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c b/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
index 323091c8..a2c38234 100644
--- a/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
+++ b/tests/unit/tests/cleaning/alru.c/cleaning_policy_alru_initialize_part_test.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 /*
 <tested_file_path>src/cleaning/alru.c</tested_file_path>
diff --git a/tests/unit/tests/cleaning/cleaning.c/ocf_cleaner_run_test.c b/tests/unit/tests/cleaning/cleaning.c/ocf_cleaner_run_test.c
index 42db6f50..d5cab951 100644
--- a/tests/unit/tests/cleaning/cleaning.c/ocf_cleaner_run_test.c
+++ b/tests/unit/tests/cleaning/cleaning.c/ocf_cleaner_run_test.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /*
diff --git a/tests/unit/tests/header.c b/tests/unit/tests/header.c
index 6d7505f5..1fd26429 100644
--- a/tests/unit/tests/header.c
+++ b/tests/unit/tests/header.c
@@ -1,5 +1,5 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
diff --git a/tests/unit/tests/mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test.c b/tests/unit/tests/mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test.c
index 2dd93c98..543ab226 100644
--- a/tests/unit/tests/mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test.c
+++ b/tests/unit/tests/mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 //<tested_file_path>src/mngt/ocf_mngt_cache.c</tested_file_path>
diff --git a/tests/unit/tests/mngt/ocf_mngt_io_class.c/ocf_mngt_io_class.c b/tests/unit/tests/mngt/ocf_mngt_io_class.c/ocf_mngt_io_class.c
index abcf3f96..0bb75bbf 100644
--- a/tests/unit/tests/mngt/ocf_mngt_io_class.c/ocf_mngt_io_class.c
+++ b/tests/unit/tests/mngt/ocf_mngt_io_class.c/ocf_mngt_io_class.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /*
diff --git a/tests/unit/tests/print_desc.h b/tests/unit/tests/print_desc.h
index 8c7703e7..39bb6b7d 100644
--- a/tests/unit/tests/print_desc.h
+++ b/tests/unit/tests/print_desc.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #define print_test_description(description) print_message("[   DESC   ] %s\n", description);
diff --git a/tests/unit/tests/utils/utils_rbtree.c/utils_rbtree.c b/tests/unit/tests/utils/utils_rbtree.c/utils_rbtree.c
index ccfbde9a..68112b36 100644
--- a/tests/unit/tests/utils/utils_rbtree.c/utils_rbtree.c
+++ b/tests/unit/tests/utils/utils_rbtree.c/utils_rbtree.c
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2012-2021 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause-Clear
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 /*