diff --git a/LICENSE b/LICENSE
index 2c3f9da..87bf4f5 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:
 
-        * 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.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-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.
+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.
 
+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 162d971..e5cb3f3 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 dcb43d1..b984161 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 c1acef3..90348af 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 50dfe86..4414002 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 5b122db..75bb842 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 cd5edbe..31a7139 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 20735c7..9b39ac1 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 01b5921..57d4f8b 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 203eb84..53968c4 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 d8aec22..00c05e7 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 7f0c66a..2eab9d7 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 54142f9..69484c5 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 554fef2..4db7492 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 64aeb98..4847b6c 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 888b9c5..bcd60fd 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 f712351..1701853 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 7b44eef..2cf73e5 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 ba9bd1a..43e4673 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 4e9505c..cd3fe4a 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 ebfff90..0b6b5fc 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 1eac42d..5b8ec52 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 913807d..20631dd 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 7fd0b7b..513e428 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 b41bc36..f5e69b4 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 6e923fd..7371ef0 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 94c22bc..7b9cc6a 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 d63ba02..cd4798a 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 176c0dd..c8a0f96 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 096793c..3c20c2e 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 16448be..2e84610 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 113492b..1dca3d7 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 7331bb6..a2e0591 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 9ab84a0..4cfd3e1 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 970d6fb..01142f5 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 7d089f4..b4d2154 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 219b6de..86ef0e4 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 54d6851..c87dbe9 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 dc56c7b..a88b9a3 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 94421f0..20d6cab 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 007dac0..5eee0b8 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 f700dc8..3f72f02 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 38fd7d6..d43144c 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 82448c1..9edbaa3 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 20e2d42..599ec97 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 351d51d..636ba66 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 0200928..b42d164 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 f469f7c..594983a 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 2c8e2d0..8ec6bf1 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 f34aeb0..aebc6ff 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 d3726c4..f285ac0 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 1dac735..dc72669 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 91c440b..f98dbb0 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 3f9c066..250b809 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 cf0593c..17d17c9 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 a789b13..926911a 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 06f54db..fbff231 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 64e522d..9f7351a 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 bf92fe3..3bd69ef 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 b06d277..fb72e7b 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 9380832..0966aa1 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 1b55812..d04676b 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 3e7b6d3..f878f07 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 e086dc3..1767f3c 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 84b5fe6..608f951 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 652fc13..cb28a73 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 ad89394..a0b9beb 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 6b1fcd9..fb502b0 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 422010a..10bffa0 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 13a6f38..59da6ce 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 3e04b1a..e1278b9 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 4cda50c..8cb4007 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 089e671..2a716df 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 f08c517..0c39916 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 284a0d5..d5d8d4b 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 9efcab6..3c22c58 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 320f763..fea1c50 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 5a86ba0..624336a 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 0521ad3..1b6f61e 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 e5bfece..31a7c74 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 4714325..f626f2a 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 432f1f2..6d609ee 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 36158dd..3c7ce5a 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 94ae1b8..5a24336 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 6b2d4fa..f6db6ea 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 77085b6..a58dd95 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 4833174..fa7230a 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 98a2589..1f52943 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 74f4355..f5ae1c0 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 e8e51d8..6532010 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 debc185..7e8bca7 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 02c9add..24ca28c 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 51cb9a1..a2701d6 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 3e23e03..11186b3 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 19fb3ab..ea42eb2 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 b1e7443..d01fc15 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 ebb228d..fa38117 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 eae45d0..9d6a911 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 526a9fd..9fe455a 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 2e37302..294fe28 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 7e89949..ab068d3 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 ea2c3be..6754a48 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 be66901..e05001e 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 d99ab52..2b68528 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 b7ee15c..5933101 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 d8cf9bd..b63512c 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 617dbb9..1b77c56 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 4cddea9..7305b0d 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 714896d..b83298a 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 ec55fcb..82129fb 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 24286e0..f3a37de 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 c2c8deb..bd7d58d 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 12470fd..51dcea3 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 4e8e9aa..8d08877 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 661591c..cc888b6 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 a9dda87..ee2fddd 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 76f9095..da5d656 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 290bb24..87528f5 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 4285237..f221cb5 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 61eec76..5e8b301 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 b31c670..6890249 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 57b451c..5555d58 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 1558b11..e89c18f 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 dde90db..1784ad0 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 007a8bd..4e5ec6a 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 9cd57b8..b9241c6 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 5ef54ad..272f75a 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 84f6708..f0fe2bb 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 e829db0..6771f0e 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 0653f42..56cb054 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 766f71a..68bb879 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 baf1cc5..1132bf6 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 7a8e164..98ba8ce 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 008cba8..3a3554a 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 4b2fffa..0e219f7 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 56fa10d..68b4576 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 b7254eb..a9ffa22 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 e9c3882..171151f 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 a71b5fd..4b7dabe 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 c153d26..c5bfc1b 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 0071d36..a6305a3 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 5f50559..4b7fb7e 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 def5d08..50160c3 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 5b55245..5905b74 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 a704d54..59a7390 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 b6f4e33..1c8e811 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 fce56af..df3139e 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 d0c639b..f24e12b 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 61383db..1b893dd 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 f464101..f8bbef5 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 6990ea0..07aae64 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 4fb933d..706844b 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 cf361be..08b70e0 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 04f0763..009a161 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 412375c..567bc49 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 2ef77ea..8710ab9 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 bf28252..71d8e0c 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 2faf792..69ddce9 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 cd33671..41f0593 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 9b60641..07d9cc3 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 7afa417..f400518 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 25f41a6..e36e9db 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 2d3df97..4568808 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 464671c..db3d352 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 281ff59..8dfbae2 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 9ce8894..ccfafac 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 c9e285d..4b2e8ff 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 40bfe11..005a491 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 b078e42..50f15bd 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 27ddc06..c24c1d9 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 7639f48..f45f6cc 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 431067f..e7e78e5 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 c8a069d..6a8d069 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 938f934..bb7cd04 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 5d4e801..1b03ae3 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 7f20ad0..0d7b4f5 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 70a36e9..9ee9913 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 b1de699..bed4e0f 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 3ba9050..e538c28 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 8bc7a1a..ced88ad 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 df7588d..eca22cc 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 de0d979..405111f 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 3d752b5..3cfab59 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 0726cf5..b5a690c 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 056f8a0..6cd5a40 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 a64a8a4..17ccdc6 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 77b970f..f287e99 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 a3cb08e..16d28b4 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 0ed33f0..1ca4f5a 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 90741e9..2cf86cc 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 2def156..0315b17 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 44e657a..9e1f663 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 17e14d2..7a5e4de 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 789f246..6e14266 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 8a3daa8..467e3a8 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 2d03c08..1d9f9f8 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 7ba7139..9518bb0 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 f65a6c4..eed3c5f 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 cdd637b..c1fd582 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 bc009d8..3aaaaf5 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 1ba4bab..4eaed5a 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 40e9add..172b207 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 29bf090..c983c60 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 04f20a5..0c86ae1 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 f85f59d..776de72 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 e36836c..c412356 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 558e7ea..f541dc8 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 7657f0d..a1530c8 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 ba9f3fd..01c0f41 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 7c8dece..5b76ade 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 80accaf..b73f124 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 f2ebc78..d875f4b 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 9d11dd7..fca4ffa 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 55dc0a6..539b358 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 b9064e3..3cb03b3 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 f720ef1..d5e2dd0 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 1cd9d17..8150b3b 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 a9df4ce..7f32bb1 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 7edef73..bfe4c26 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 a38ec40..0381999 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 b8f5958..dbe3950 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 49b78dc..11a8764 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 566f8d7..2eefc16 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 085625d..181bd92 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 1d4d2f2..1b7d175 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 9543d86..b1d0ded 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 e17da41..012706f 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 6652dec..0f478ad 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 1fffcc7..55ad792 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 2c3a794..427f862 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 a015d79..9d0a745 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 323091c..a2c3823 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 42db6f5..d5cab95 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 6d7505f..1fd2642 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 2dd93c9..543ab22 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 abcf3f9..0bb75bb 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 8c7703e..39bb6b7 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 ccfbde9..68112b3 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
  */
 
 /*