diff --git a/src/config.cpp b/src/config.cpp
index 1066aff..5df8873 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -719,7 +719,15 @@ bool N64Recomp::Context::import_reference_context(const N64Recomp::Context& refe
 
     // Copy the functions from the reference context into the reference context's function map.
     for (const N64Recomp::Function& func_in: reference_context.functions) {
-        if (!add_reference_symbol(func_in.name, func_in.section_index, func_in.vram, true)) {
+        // Rename if necessary
+        std::string name = func_in.name;
+        if (N64Recomp::reimplemented_funcs.contains(name) ||
+            N64Recomp::ignored_funcs.contains(name) ||
+            N64Recomp::renamed_funcs.contains(name)) {
+            name = name + "_recomp";
+        }
+
+        if (!add_reference_symbol(name, func_in.section_index, func_in.vram, true)) {
             return false;
         }
     }
diff --git a/src/elf.cpp b/src/elf.cpp
index 4fbd1ce..f0ab22f 100644
--- a/src/elf.cpp
+++ b/src/elf.cpp
@@ -425,6 +425,13 @@ ELFIO::section* read_sections(N64Recomp::Context& context, ELFIO::section*& mdeb
 
                     // Check if the symbol is undefined and to know whether to look for it in the reference symbols.
                     if (rel_symbol_section_index == ELFIO::SHN_UNDEF) {
+                        // Get renamed version of symbol name if necessary
+                        if (N64Recomp::reimplemented_funcs.contains(rel_symbol_name) ||
+                            N64Recomp::ignored_funcs.contains(rel_symbol_name) ||
+                            N64Recomp::renamed_funcs.contains(rel_symbol_name)) {
+                            rel_symbol_name = rel_symbol_name + "_recomp";
+                        }
+
                         // Undefined sym, check the reference symbols.
                         N64Recomp::SymbolReference sym_ref;
                         if (!context.find_reference_symbol(rel_symbol_name, sym_ref)) {