Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 077842c7d8763d465a4900cd0693e65cd9338385)
+++ kernel/generic/src/proc/scheduler.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
@@ -205,5 +205,5 @@
 loop:
 
-	if (atomic_get(&CPU->nrdy) == 0) {
+	if (atomic_load(&CPU->nrdy) == 0) {
 		/*
 		 * For there was nothing to run, the CPU goes to sleep
@@ -327,5 +327,5 @@
 	ipl = interrupts_disable();
 
-	if (atomic_get(&haltstate))
+	if (atomic_load(&haltstate))
 		halt();
 
@@ -531,5 +531,5 @@
 	    "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
 	    ", nrdy=%zu)", CPU->id, THREAD->tid, THREAD->priority,
-	    THREAD->ticks, atomic_get(&CPU->nrdy));
+	    THREAD->ticks, atomic_load(&CPU->nrdy));
 #endif
 
@@ -587,6 +587,6 @@
 	 *
 	 */
-	average = atomic_get(&nrdy) / config.cpu_active + 1;
-	rdy = atomic_get(&CPU->nrdy);
+	average = atomic_load(&nrdy) / config.cpu_active + 1;
+	rdy = atomic_load(&CPU->nrdy);
 
 	if (average <= rdy)
@@ -616,5 +616,5 @@
 				continue;
 
-			if (atomic_get(&cpu->nrdy) <= average)
+			if (atomic_load(&cpu->nrdy) <= average)
 				continue;
 
@@ -678,6 +678,6 @@
 				    "kcpulb%u: TID %" PRIu64 " -> cpu%u, "
 				    "nrdy=%ld, avg=%ld", CPU->id, t->tid,
-				    CPU->id, atomic_get(&CPU->nrdy),
-				    atomic_get(&nrdy) / config.cpu_active);
+				    CPU->id, atomic_load(&CPU->nrdy),
+				    atomic_load(&nrdy) / config.cpu_active);
 #endif
 
@@ -705,5 +705,5 @@
 	}
 
-	if (atomic_get(&CPU->nrdy)) {
+	if (atomic_load(&CPU->nrdy)) {
 		/*
 		 * Be a little bit light-weight and let migrated threads run.
@@ -740,5 +740,5 @@
 
 		printf("cpu%u: address=%p, nrdy=%zu, needs_relink=%zu\n",
-		    cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
+		    cpus[cpu].id, &cpus[cpu], atomic_load(&cpus[cpu].nrdy),
 		    cpus[cpu].needs_relink);
 
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 077842c7d8763d465a4900cd0693e65cd9338385)
+++ kernel/generic/src/proc/task.c	(revision 036e97cf14fc9f9a4783fbb16419e5aaf0793b2d)
@@ -620,5 +620,5 @@
 	if (*additional)
 		printf("%-8" PRIu64 " %9zu", task->taskid,
-		    atomic_get(&task->refcount));
+		    atomic_load(&task->refcount));
 	else
 		printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
@@ -632,5 +632,5 @@
 		printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
 		    "%9zu\n", task->taskid, ucycles, usuffix, kcycles,
-		    ksuffix, atomic_get(&task->refcount));
+		    ksuffix, atomic_load(&task->refcount));
 	else
 		printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",