diff --git a/src/sys/kern/cpu.zig b/src/sys/kern/cpu.zig
index 23663b4..faef2de 100644
--- a/src/sys/kern/cpu.zig
+++ b/src/sys/kern/cpu.zig
@@ -42,7 +42,7 @@ pub fn CpuLocalType(comptime T: type, comptime init: T) type {
 }
 
 /// Wraps around CPU-local data with a designated symbol name.
-pub fn ExportedCpuLocalTypeType(
+pub fn ExportedCpuLocalType(
     comptime T: type,
     comptime init: T,
     comptime name: []const u8,
diff --git a/src/sys/kern/ipl.zig b/src/sys/kern/ipl.zig
index b7dd1db..f277226 100644
--- a/src/sys/kern/ipl.zig
+++ b/src/sys/kern/ipl.zig
@@ -33,7 +33,7 @@ const PerCpu = struct {
 };
 
 /// Current IPL on this CPU.
-pub const cpu_ipl = ke.ExportedCpuLocalTypeType(
+pub const cpu_ipl = ke.ExportedCpuLocalType(
     Ipl,
     .Passive,
     "cpu_ipl",
diff --git a/src/sys/kern/root.zig b/src/sys/kern/root.zig
index 48d3054..9607b44 100644
--- a/src/sys/kern/root.zig
+++ b/src/sys/kern/root.zig
@@ -15,12 +15,14 @@ pub const TimeCounter = p.time.TimeCounter;
 pub const Timer = p.timer.Timer;
 pub const Console = p.log.Console;
 pub const CpuLocalType = p.cpu.CpuLocalType;
-pub const ExportedCpuLocalTypeType = p.cpu.ExportedCpuLocalTypeType;
+pub const ExportedCpuLocalType = p.cpu.ExportedCpuLocalType;
 pub const CpuMask = p.cpu.CpuMask;
 pub const AtomicCpuMask = p.cpu.AtomicCpuMask;
 pub const Event = p.event.Event;
 pub const Queue = p.queue.Queue;
 pub const Mutex = p.mutex.Mutex;
+pub const RwLock = p.rwlock.RwLock;
+pub const ReadToken = p.rwlock.ReadToken;
 pub const ShootdownState = p.shootdown.ShootdownState;
 pub const TunableType = p.tunable.TunableType;
 pub const Priority = p.thread.Priority;
diff --git a/src/sys/platform/pc/smp.zig b/src/sys/platform/pc/smp.zig
index 3a93140..3d7bec3 100644
--- a/src/sys/platform/pc/smp.zig
+++ b/src/sys/platform/pc/smp.zig
@@ -19,7 +19,7 @@ extern var __percpu_end: u8;
 
 pub export var cpu_id_to_apic_id: [config.ncpus]u32 = undefined;
 
-const start_stack = ke.ExportedCpuLocalTypeType(usize, 0, "ap_start_stack");
+const start_stack = ke.ExportedCpuLocalType(usize, 0, "ap_start_stack");
 
 pub const start_thread = ke.CpuLocalType(*ke.Thread, undefined);