diff --git a/modules/cas_cache/threads.c b/modules/cas_cache/threads.c
index be283d2..f27cbda 100644
--- a/modules/cas_cache/threads.c
+++ b/modules/cas_cache/threads.c
@@ -250,7 +250,7 @@ int cas_create_cleaner_thread(ocf_cleaner_t c)
 	int result;
 
 	result = _cas_create_thread(&info, _cas_cleaner_thread, c,
-			CAS_CPUS_ALL, "cas_clean_%s",
+			CAS_CPUS_ALL, "cas_cl_%s",
 			ocf_cache_get_name(cache));
 	if (!result) {
 		ocf_cleaner_set_priv(c, info);
diff --git a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py
index 072deda..71adb9f 100644
--- a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py
+++ b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py
@@ -33,7 +33,7 @@ io_size = Size(10000, Unit.Blocks4096)
 time_to_wait = 30
 
 # Name of CAS cleaner to search for in running processes:
-cas_cleaner_process_name = "cas_clean"
+cas_cleaner_process_name = "cas_cl_"
 
 
 @pytest.mark.parametrize("cleaning_policy", CleaningPolicy)