diff --git a/lib/codegen/src/context.rs b/lib/codegen/src/context.rs
index 6e8c54051b..fa8b761ad4 100644
--- a/lib/codegen/src/context.rs
+++ b/lib/codegen/src/context.rs
@@ -168,7 +168,7 @@ impl Context {
         traps: &mut TrapSink,
     ) {
         let _tt = timing::binemit();
-        isa.emit_function(&self.func, &mut MemoryCodeSink::new(mem, relocs, traps));
+        isa.emit_function_to_memory(&self.func, &mut MemoryCodeSink::new(mem, relocs, traps));
     }
 
     /// Run the verifier on the function.
diff --git a/lib/codegen/src/isa/arm32/mod.rs b/lib/codegen/src/isa/arm32/mod.rs
index bb0214b3ec..3606c18676 100644
--- a/lib/codegen/src/isa/arm32/mod.rs
+++ b/lib/codegen/src/isa/arm32/mod.rs
@@ -121,7 +121,7 @@ impl TargetIsa for Isa {
         binemit::emit_inst(func, inst, divert, sink)
     }
 
-    fn emit_function(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
+    fn emit_function_to_memory(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
         emit_function(func, binemit::emit_inst, sink)
     }
 }
diff --git a/lib/codegen/src/isa/arm64/mod.rs b/lib/codegen/src/isa/arm64/mod.rs
index 50a43b13fc..96e62a9e37 100644
--- a/lib/codegen/src/isa/arm64/mod.rs
+++ b/lib/codegen/src/isa/arm64/mod.rs
@@ -108,7 +108,7 @@ impl TargetIsa for Isa {
         binemit::emit_inst(func, inst, divert, sink)
     }
 
-    fn emit_function(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
+    fn emit_function_to_memory(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
         emit_function(func, binemit::emit_inst, sink)
     }
 }
diff --git a/lib/codegen/src/isa/mod.rs b/lib/codegen/src/isa/mod.rs
index d85f0c3e10..56ff2b5f4a 100644
--- a/lib/codegen/src/isa/mod.rs
+++ b/lib/codegen/src/isa/mod.rs
@@ -303,8 +303,8 @@ pub trait TargetIsa: fmt::Display {
 
     /// Emit binary machine code for a single instruction into the `sink` trait object.
     ///
-    /// Note that this will call `put*` methods on the trait object via its vtable which is not the
-    /// fastest way of emitting code.
+    /// Note that this will call `put*` methods on the `sink` trait object via its vtable which
+    /// is not the fastest way of emitting code.
     fn emit_inst(
         &self,
         func: &ir::Function,
@@ -316,5 +316,5 @@ pub trait TargetIsa: fmt::Display {
     /// Emit a whole function into memory.
     ///
     /// This is more performant than calling `emit_inst` for each instruction.
-    fn emit_function(&self, func: &ir::Function, sink: &mut binemit::MemoryCodeSink);
+    fn emit_function_to_memory(&self, func: &ir::Function, sink: &mut binemit::MemoryCodeSink);
 }
diff --git a/lib/codegen/src/isa/riscv/mod.rs b/lib/codegen/src/isa/riscv/mod.rs
index aff23390e5..1a09f89bc1 100644
--- a/lib/codegen/src/isa/riscv/mod.rs
+++ b/lib/codegen/src/isa/riscv/mod.rs
@@ -115,7 +115,7 @@ impl TargetIsa for Isa {
         binemit::emit_inst(func, inst, divert, sink)
     }
 
-    fn emit_function(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
+    fn emit_function_to_memory(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
         emit_function(func, binemit::emit_inst, sink)
     }
 }
diff --git a/lib/codegen/src/isa/x86/mod.rs b/lib/codegen/src/isa/x86/mod.rs
index 2681e044d6..0546c648cd 100644
--- a/lib/codegen/src/isa/x86/mod.rs
+++ b/lib/codegen/src/isa/x86/mod.rs
@@ -125,7 +125,7 @@ impl TargetIsa for Isa {
         binemit::emit_inst(func, inst, divert, sink)
     }
 
-    fn emit_function(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
+    fn emit_function_to_memory(&self, func: &ir::Function, sink: &mut MemoryCodeSink) {
         emit_function(func, binemit::emit_inst, sink)
     }