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);