diff --git a/env/posix/ocf_env.c b/env/posix/ocf_env.c
index aae1960..6b8a6d5 100644
--- a/env/posix/ocf_env.c
+++ b/env/posix/ocf_env.c
@@ -7,6 +7,7 @@
 #include <sched.h>
 #include <execinfo.h>
 
+/* ALLOCATOR */
 struct _env_allocator {
 	/*!< Memory pool ID unique name */
 	char *name;
@@ -45,7 +46,6 @@ void *env_allocator_new(env_allocator *allocator)
 	return &item->data;
 }
 
-
 env_allocator *env_allocator_create(uint32_t size, const char *fmt_name, ...)
 {
 	char name[OCF_ALLOCATOR_NAME_MAX] = { '\0' };
@@ -110,8 +110,7 @@ void env_allocator_destroy(env_allocator *allocator)
 	}
 }
 
-/* *** DEBUGING *** */
-
+/* DEBUGING */
 #define ENV_TRACE_DEPTH	16
 
 void env_stack_trace(void)
@@ -129,13 +128,13 @@ void env_stack_trace(void)
 	free(messages);
 }
 
-/* *** CRC *** */
+/* CRC */
 uint32_t env_crc32(uint32_t crc, uint8_t const *data, size_t len)
 {
 	return crc32(crc, data, len);
 }
 
-/* *** execution contexts *** */
+/* EXECUTION CONTEXTS */
 pthread_mutex_t *exec_context_mutex;
 
 static void __attribute__((constructor)) init_execution_context(void)
diff --git a/env/posix/ocf_env_headers.h b/env/posix/ocf_env_headers.h
index 041856d..b9ba4f5 100644
--- a/env/posix/ocf_env_headers.h
+++ b/env/posix/ocf_env_headers.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 
 /* TODO: Move prefix printing to context logger. */
-#define OCF_LOGO "Intel(R) OCF"
+#define OCF_LOGO "OCF"
 #define OCF_PREFIX_SHORT "[" OCF_LOGO "] "
 #define OCF_PREFIX_LONG "Open CAS Framework"
 
diff --git a/inc/ocf_cache.h b/inc/ocf_cache.h
index 13d08ba..80860dc 100644
--- a/inc/ocf_cache.h
+++ b/inc/ocf_cache.h
@@ -12,7 +12,6 @@
  * @brief OCF cache API
  */
 
-#include "ocf_types.h"
 #include "ocf_volume.h"
 #include "ocf_ctx.h"
 #include "ocf_def.h"
diff --git a/inc/ocf_core.h b/inc/ocf_core.h
index 1973be5..acabd39 100644
--- a/inc/ocf_core.h
+++ b/inc/ocf_core.h
@@ -11,7 +11,6 @@
 #ifndef __OCF_CORE_H__
 #define __OCF_CORE_H__
 
-#include "ocf_types.h"
 #include "ocf_volume.h"
 #include "ocf_io.h"
 #include "ocf_mngt.h"
diff --git a/inc/ocf_ctx.h b/inc/ocf_ctx.h
index d97c1c3..b12cc3c 100644
--- a/inc/ocf_ctx.h
+++ b/inc/ocf_ctx.h
@@ -11,7 +11,6 @@
  * @brief OCF library context API
  */
 
-#include "ocf_types.h"
 #include "ocf_volume.h"
 #include "ocf_logger.h"
 
diff --git a/inc/ocf_mngt.h b/inc/ocf_mngt.h
index 69582d4..e4dd0cb 100644
--- a/inc/ocf_mngt.h
+++ b/inc/ocf_mngt.h
@@ -6,7 +6,6 @@
 #ifndef __OCF_MNGT_H__
 #define __OCF_MNGT_H__
 
-#include "ocf_types.h"
 #include "ocf_cache.h"
 #include "ocf_core.h"
 
diff --git a/inc/ocf_volume.h b/inc/ocf_volume.h
index bcc703f..24456c7 100644
--- a/inc/ocf_volume.h
+++ b/inc/ocf_volume.h
@@ -13,7 +13,6 @@
 
 #include "ocf_types.h"
 #include "ocf_env.h"
-#include "ocf_err.h"
 
 struct ocf_io;
 
diff --git a/tests/unit/framework/add_new_test_file.py b/tests/unit/framework/add_new_test_file.py
index 45ffb33..20c46d1 100755
--- a/tests/unit/framework/add_new_test_file.py
+++ b/tests/unit/framework/add_new_test_file.py
@@ -90,7 +90,7 @@ class TestGenerator(object):
     def get_autowrap_file_include(self, test_file_path):
         autowrap_file = test_file_path.rsplit(".", 1)[0]
         autowrap_file = autowrap_file.replace(self.main_UT_dir, "")
-        autowrap_file += "_generated_warps.c"
+        autowrap_file += "_generated_wraps.c"
         return "#include \"" + autowrap_file + "\"\n\n"
 
     def get_includes(self, abs_path_to_tested_file):
diff --git a/tests/unit/tests/add_new_test_file.py b/tests/unit/tests/add_new_test_file.py
index 1e79136..cb6a672 100755
--- a/tests/unit/tests/add_new_test_file.py
+++ b/tests/unit/tests/add_new_test_file.py
@@ -15,7 +15,7 @@ framework_script_path = os.path.join(script_path, "../framework/add_new_test_fil
 framework_script_path = os.path.normpath(framework_script_path)
 status, output = commands.getstatusoutput(framework_script_path + " " + args)
 
-print output
+print(output)
 
 if status == 0:
     path = output.split(" ", 1)[0]
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 ea603b1..295ac69 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
@@ -35,7 +35,7 @@
 #include "../mngt/ocf_mngt_common.h"
 #include "../metadata/metadata.h"
 
-#include "cleaning/cleaning.c/ocf_cleaner_run_test_generated_warps.c"
+#include "cleaning/cleaning.c/ocf_cleaner_run_test_generated_wraps.c"
 
 /*
  * Mocked functions. Here we must deliver functions definitions which are not
diff --git a/tests/unit/tests/concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency.c b/tests/unit/tests/concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency.c
index 23096f3..5638d32 100644
--- a/tests/unit/tests/concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency.c
+++ b/tests/unit/tests/concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency.c
@@ -21,7 +21,7 @@
 #include "ocf_metadata_concurrency.h"
 #include "../metadata/metadata_misc.h"
 
-#include "concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency_generated_warps.c"
+#include "concurrency/ocf_metadata_concurrency.c/ocf_metadata_concurrency_generated_wraps.c"
 
 void __wrap_ocf_metadata_hash_lock(struct ocf_metadata_lock *metadata_lock,
 		ocf_cache_line_t hash, int rw)
diff --git a/tests/unit/tests/metadata/metadata_collision.c/metadata_collision.c b/tests/unit/tests/metadata/metadata_collision.c/metadata_collision.c
index a07dce4..2f7309a 100644
--- a/tests/unit/tests/metadata/metadata_collision.c/metadata_collision.c
+++ b/tests/unit/tests/metadata/metadata_collision.c/metadata_collision.c
@@ -21,7 +21,7 @@
 #include "metadata.h"
 #include "../utils/utils_cache_line.h"
 
-#include "metadata/metadata_collision.c/metadata_collision_generated_warps.c"
+#include "metadata/metadata_collision.c/metadata_collision_generated_wraps.c"
 
 static void metadata_hash_func_test01(void **state)
 {
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 1d5baf7..7b61e14 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
@@ -40,7 +40,7 @@ ocf_mngt_cache_mode_has_lazy_write
 #include "../ocf_ctx_priv.h"
 #include "../cleaning/cleaning.h"
 
-#include "mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test_generated_warps.c"
+#include "mngt/ocf_mngt_cache.c/_cache_mngt_set_cache_mode_test_generated_wraps.c"
 /*
  * Mocked functions
  */
diff --git a/tests/unit/tests/mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold.c b/tests/unit/tests/mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold.c
index a5a0a43..dbf0e5b 100644
--- a/tests/unit/tests/mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold.c
+++ b/tests/unit/tests/mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold.c
@@ -34,7 +34,7 @@
 #include "../ocf_ctx_priv.h"
 #include "../cleaning/cleaning.h"
 
-#include "mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold_generated_warps.c"
+#include "mngt/ocf_mngt_cache.c/ocf_mngt_cache_set_fallback_pt_error_threshold_generated_wraps.c"
 
 int __wrap_ocf_log_raw(ocf_logger_t logger, ocf_logger_lvl_t lvl,
 		const char *fmt, ...)
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 126dbe6..f5e1d0f 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
@@ -35,7 +35,7 @@
 #include "../eviction/ops.h"
 #include "ocf_env.h"
 
-#include "mngt/ocf_mngt_io_class.c/ocf_mngt_io_class_generated_warps.c"
+#include "mngt/ocf_mngt_io_class.c/ocf_mngt_io_class_generated_wraps.c"
 
 /* Functions mocked for testing purposes */
 bool __wrap_ocf_part_is_added(struct ocf_user_part *part)
diff --git a/tests/unit/tests/ocf_freelist.c/ocf_freelist_get_put.c b/tests/unit/tests/ocf_freelist.c/ocf_freelist_get_put.c
index 7ee9181..cc9eed3 100644
--- a/tests/unit/tests/ocf_freelist.c/ocf_freelist_get_put.c
+++ b/tests/unit/tests/ocf_freelist.c/ocf_freelist_get_put.c
@@ -33,7 +33,7 @@
 #include "ocf/ocf.h"
 #include "metadata/metadata.h"
 
-#include "ocf_freelist.c/ocf_freelist_get_put_generated_warps.c"
+#include "ocf_freelist.c/ocf_freelist_get_put_generated_wraps.c"
 
 ocf_cache_line_t __wrap_ocf_metadata_collision_table_entries(ocf_cache_t cache)
 {
diff --git a/tests/unit/tests/ocf_freelist.c/ocf_freelist_init.c b/tests/unit/tests/ocf_freelist.c/ocf_freelist_init.c
index c81cf83..387bbe8 100644
--- a/tests/unit/tests/ocf_freelist.c/ocf_freelist_init.c
+++ b/tests/unit/tests/ocf_freelist.c/ocf_freelist_init.c
@@ -21,7 +21,7 @@
 #include "ocf/ocf.h"
 #include "metadata/metadata.h"
 
-#include "ocf_freelist.c/ocf_freelist_init_generated_warps.c"
+#include "ocf_freelist.c/ocf_freelist_init_generated_wraps.c"
 
 ocf_cache_line_t __wrap_ocf_metadata_collision_table_entries(ocf_cache_t cache)
 {
diff --git a/tests/unit/tests/ocf_freelist.c/ocf_freelist_locks.c b/tests/unit/tests/ocf_freelist.c/ocf_freelist_locks.c
index 0a05094..b4a2b56 100644
--- a/tests/unit/tests/ocf_freelist.c/ocf_freelist_locks.c
+++ b/tests/unit/tests/ocf_freelist.c/ocf_freelist_locks.c
@@ -31,7 +31,7 @@
 #include "ocf/ocf.h"
 #include "metadata/metadata.h"
 
-#include "ocf_freelist.c/ocf_freelist_get_put_generated_warps.c"
+#include "ocf_freelist.c/ocf_freelist_get_put_generated_wraps.c"
 
 ocf_cache_line_t __wrap_ocf_metadata_collision_table_entries(ocf_cache_t cache)
 {
diff --git a/tests/unit/tests/ocf_freelist.c/ocf_freelist_populate.c b/tests/unit/tests/ocf_freelist.c/ocf_freelist_populate.c
index 419f240..4780667 100644
--- a/tests/unit/tests/ocf_freelist.c/ocf_freelist_populate.c
+++ b/tests/unit/tests/ocf_freelist.c/ocf_freelist_populate.c
@@ -23,7 +23,7 @@
 #include "ocf/ocf.h"
 #include "metadata/metadata.h"
 
-#include "ocf_freelist.c/ocf_freelist_populate_generated_warps.c"
+#include "ocf_freelist.c/ocf_freelist_populate_generated_wraps.c"
 
 ocf_cache_line_t __wrap_ocf_metadata_collision_table_entries(ocf_cache_t cache)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_dec.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_dec.c
index bc07663..8bd40fc 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_dec.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_dec.c
@@ -20,7 +20,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_dec_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_dec_generated_wraps.c"
 
 static void ocf_refcnt_dec_test01(void **state)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_freeze.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_freeze.c
index 1046a68..a1385f3 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_freeze.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_freeze.c
@@ -21,7 +21,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_freeze_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_freeze_generated_wraps.c"
 
 static void ocf_refcnt_freeze_test01(void **state)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_inc.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_inc.c
index e47b657..d1b6133 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_inc.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_inc.c
@@ -20,7 +20,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_inc_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_inc_generated_wraps.c"
 
 static void ocf_refcnt_inc_test(void **state)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_init.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_init.c
index 2675990..3f28207 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_init.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_init.c
@@ -20,7 +20,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_init_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_init_generated_wraps.c"
 
 static void ocf_refcnt_init_test(void **state)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_register_zero_cb.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_register_zero_cb.c
index 05357a3..fcb260c 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_register_zero_cb.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_register_zero_cb.c
@@ -22,7 +22,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_register_zero_cb_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_register_zero_cb_generated_wraps.c"
 
 static void zero_cb(void *ctx)
 {
diff --git a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_unfreeze.c b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_unfreeze.c
index 748c6ca..2a2e10b 100644
--- a/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_unfreeze.c
+++ b/tests/unit/tests/utils/utils_refcnt.c/utils_refcnt_unfreeze.c
@@ -22,7 +22,7 @@
 
 #include "../utils/utils_refcnt.h"
 
-#include "utils/utils_refcnt.c/utils_refcnt_unfreeze_generated_warps.c"
+#include "utils/utils_refcnt.c/utils_refcnt_unfreeze_generated_wraps.c"
 
 static void ocf_refcnt_unfreeze_test01(void **state)
 {