Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/arch/mips32/src/debugger.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -412,5 +412,5 @@
 		 *   so this is a good idea
 		 */
-		atomic_set(&haltstate, 1);
+		atomic_store(&haltstate, 1);
 		irq_spinlock_unlock(&bkpoint_lock, false);
 
@@ -418,5 +418,5 @@
 
 		irq_spinlock_lock(&bkpoint_lock, false);
-		atomic_set(&haltstate, 0);
+		atomic_store(&haltstate, 0);
 #endif
 	}
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -230,5 +230,5 @@
 				exec_units[i].exec_unit_id = exec_unit_id;
 				exec_units[i].strand_count = 0;
-				atomic_set(&(exec_units[i].nrdy), 0);
+				atomic_store(&(exec_units[i].nrdy), 0);
 				spinlock_initialize(&(exec_units[i].proposed_nrdy_lock), "exec_units[].proposed_nrdy_lock");
 				exec_unit_count++;
@@ -270,5 +270,5 @@
 		exec_units[0].exec_unit_id = 1;
 		spinlock_initialize(&(exec_units[0].proposed_nrdy_lock), "exec_units[0].proposed_nrdy_lock");
-		atomic_set(&(exec_units[0].nrdy), 0);
+		atomic_store(&(exec_units[0].nrdy), 0);
 		max_core_strands = cpu_count;
 
Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/include/atomic.h	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -44,9 +44,4 @@
 typedef atomic_size_t atomic_t;
 
-static inline void atomic_set(atomic_t *val, atomic_count_t i)
-{
-	atomic_store(val, i);
-}
-
 static inline size_t atomic_predec(atomic_t *val)
 {
Index: kernel/generic/src/adt/cht.c
===================================================================
--- kernel/generic/src/adt/cht.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/adt/cht.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -537,6 +537,6 @@
 	h->new_b = NULL;
 	h->op = op;
-	atomic_set(&h->item_cnt, 0);
-	atomic_set(&h->resize_reqs, 0);
+	atomic_store(&h->item_cnt, 0);
+	atomic_store(&h->resize_reqs, 0);
 
 	if (NULL == op->remove_callback) {
Index: kernel/generic/src/cap/cap.c
===================================================================
--- kernel/generic/src/cap/cap.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/cap/cap.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -353,5 +353,5 @@
     kobject_ops_t *ops)
 {
-	atomic_set(&kobj->refcnt, 1);
+	atomic_store(&kobj->refcnt, 1);
 	kobj->type = type;
 	kobj->raw = raw;
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/console/console.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -202,5 +202,5 @@
 
 	event_set_unmask_callback(EVENT_KIO, kio_update);
-	atomic_set(&kio_inited, true);
+	atomic_store(&kio_inited, true);
 }
 
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/ipc/ipc.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -154,5 +154,5 @@
 	list_initialize(&box->answers);
 	list_initialize(&box->irq_notifs);
-	atomic_set(&box->active_calls, 0);
+	atomic_store(&box->active_calls, 0);
 	box->task = task;
 }
@@ -204,5 +204,5 @@
 	phone->callee = NULL;
 	phone->state = IPC_PHONE_FREE;
-	atomic_set(&phone->active_calls, 0);
+	atomic_store(&phone->active_calls, 0);
 	phone->kobject = NULL;
 }
Index: kernel/generic/src/lib/halt.c
===================================================================
--- kernel/generic/src/lib/halt.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/lib/halt.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -57,9 +57,9 @@
 
 	if (!atomic_load(&haltstate)) {
-		atomic_set(&haltstate, 1);
+		atomic_store(&haltstate, 1);
 		rundebugger = true;
 	}
 #else
-	atomic_set(&haltstate, 1);
+	atomic_store(&haltstate, 1);
 #endif
 
Index: kernel/generic/src/log/log.c
===================================================================
--- kernel/generic/src/log/log.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/log/log.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -94,5 +94,5 @@
 {
 	event_set_unmask_callback(EVENT_KLOG, log_update);
-	atomic_set(&log_inited, true);
+	atomic_store(&log_inited, true);
 }
 
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/proc/task.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -166,6 +166,6 @@
 		return rc;
 
-	atomic_set(&task->refcount, 0);
-	atomic_set(&task->lifecount, 0);
+	atomic_store(&task->refcount, 0);
+	atomic_store(&task->lifecount, 0);
 
 	irq_spinlock_initialize(&task->lock, "task_t_lock");
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/proc/thread.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -240,5 +240,5 @@
 	THREAD = NULL;
 
-	atomic_set(&nrdy, 0);
+	atomic_store(&nrdy, 0);
 	thread_cache = slab_cache_create("thread_t", sizeof(thread_t), 0,
 	    thr_constructor, thr_destructor, 0);
Index: kernel/generic/src/smp/smp_call.c
===================================================================
--- kernel/generic/src/smp/smp_call.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/smp/smp_call.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -246,5 +246,5 @@
 	 * messing up the preemption count).
 	 */
-	atomic_set(&call_info->pending, 1);
+	atomic_store(&call_info->pending, 1);
 
 	/* Let initialization complete before continuing. */
@@ -259,5 +259,5 @@
 	 */
 	memory_barrier();
-	atomic_set(&call_info->pending, 0);
+	atomic_store(&call_info->pending, 0);
 }
 
Index: kernel/generic/src/synch/rcu.c
===================================================================
--- kernel/generic/src/synch/rcu.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/generic/src/synch/rcu.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -312,5 +312,5 @@
 
 	mutex_initialize(&rcu.barrier_mtx, MUTEX_PASSIVE);
-	atomic_set(&rcu.barrier_wait_cnt, 0);
+	atomic_store(&rcu.barrier_wait_cnt, 0);
 	waitq_initialize(&rcu.barrier_wq);
 
@@ -322,5 +322,5 @@
 	rcu.req_gp_end_cnt = 0;
 	rcu.req_expedited_cnt = 0;
-	atomic_set(&rcu.delaying_cpu_cnt, 0);
+	atomic_store(&rcu.delaying_cpu_cnt, 0);
 #endif
 
@@ -594,5 +594,5 @@
 	 * enqueued barrier callbacks start signaling completion.
 	 */
-	atomic_set(&rcu.barrier_wait_cnt, 1);
+	atomic_store(&rcu.barrier_wait_cnt, 1);
 
 	DEFINE_CPU_MASK(cpu_mask);
@@ -1412,5 +1412,5 @@
 static void interrupt_delaying_cpus(cpu_mask_t *cpu_mask)
 {
-	atomic_set(&rcu.delaying_cpu_cnt, 0);
+	atomic_store(&rcu.delaying_cpu_cnt, 0);
 
 	sample_cpus(cpu_mask, NULL);
Index: kernel/test/atomic/atomic1.c
===================================================================
--- kernel/test/atomic/atomic1.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
+++ kernel/test/atomic/atomic1.c	(revision e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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 e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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 e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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 e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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 e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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 e3306d0477902705968eca74bbf2f4b766535c78)
@@ -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));