Index: kernel/test/atomic/atomic1.c
===================================================================
--- kernel/test/atomic/atomic1.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/atomic/atomic1.c	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -36,7 +36,7 @@
 	atomic_t a;
 
-	atomic_set(&a, 10);
+	atomic_store(&a, 10);
 	if (atomic_load(&a) != 10)
-		return "Failed atomic_set()/atomic_load()";
+		return "Failed atomic_store()/atomic_load()";
 
 	if (atomic_postinc(&a) != 10)
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/mm/falloc2.c	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -117,6 +117,6 @@
 const char *test_falloc2(void)
 {
-	atomic_set(&thread_count, THREADS);
-	atomic_set(&thread_fail, 0);
+	atomic_store(&thread_count, THREADS);
+	atomic_store(&thread_fail, 0);
 
 	for (unsigned int i = 0; i < THREADS; i++) {
Index: kernel/test/synch/rcu1.c
===================================================================
--- kernel/test/synch/rcu1.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/synch/rcu1.c	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -268,5 +268,5 @@
 static bool do_nop_callbacks(void)
 {
-	atomic_set(&nop_callbacks_cnt, 0);
+	atomic_store(&nop_callbacks_cnt, 0);
 
 	size_t exp_cnt = nop_updater_iters * get_thread_cnt();
@@ -448,5 +448,5 @@
 	seq_test_result = EOK;
 	max_upd_done_time = 0;
-	atomic_set(&cur_time, 1);
+	atomic_store(&cur_time, 1);
 
 	const size_t iters = 100;
@@ -821,5 +821,5 @@
 {
 	barrier_t *b = member_to_inst(item, barrier_t, rcu_item);
-	atomic_set(&b->done, 1);
+	atomic_store(&b->done, 1);
 }
 
@@ -835,5 +835,5 @@
 	}
 
-	atomic_set(&barrier->done, 0);
+	atomic_store(&barrier->done, 0);
 
 	rcu_call(&barrier->rcu_item, barrier_callback);
Index: kernel/test/synch/semaphore1.c
===================================================================
--- kernel/test/synch/semaphore1.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/synch/semaphore1.c	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -82,6 +82,6 @@
 		thread_t *thrd;
 
-		atomic_set(&items_produced, 0);
-		atomic_set(&items_consumed, 0);
+		atomic_store(&items_produced, 0);
+		atomic_store(&items_consumed, 0);
 
 		consumers = i * CONSUMERS;
Index: kernel/test/synch/workq-test-core.h
===================================================================
--- kernel/test/synch/workq-test-core.h	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/synch/workq-test-core.h	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -149,5 +149,5 @@
 {
 	for (int i = 0; i < WAVES; ++i) {
-		atomic_set(&call_cnt[i], 0);
+		atomic_store(&call_cnt[i], 0);
 	}
 
Index: kernel/test/thread/thread1.c
===================================================================
--- kernel/test/thread/thread1.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/thread/thread1.c	(revision 5f1d850c7ef9cee92e7484657faa82d8db56699d)
@@ -58,6 +58,6 @@
 	atomic_count_t total = 0;
 
-	atomic_set(&finish, 1);
-	atomic_set(&threads_finished, 0);
+	atomic_store(&finish, 1);
+	atomic_store(&threads_finished, 0);
 
 	for (i = 0; i < THREADS; i++) {
@@ -75,5 +75,5 @@
 	thread_sleep(10);
 
-	atomic_set(&finish, 0);
+	atomic_store(&finish, 0);
 	while (atomic_load(&threads_finished) < total) {
 		TPRINTF("Threads left: %zu\n", total - atomic_load(&threads_finished));