diff --git a/src/config.cpp b/src/config.cpp
index c299471..477ab88 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -665,7 +665,9 @@ bool N64Recomp::Context::import_reference_context(const N64Recomp::Context& refe
     for (const N64Recomp::Function& func_in: reference_context.functions) {
         // Rename if necessary
         std::string name = func_in.name;
-        if (N64Recomp::renamed_funcs.contains(name)) {
+        if (N64Recomp::reimplemented_funcs.contains(name) ||
+            N64Recomp::ignored_funcs.contains(name) ||
+            N64Recomp::renamed_funcs.contains(name)) {
             name = name + "_recomp";
         }
 
diff --git a/src/elf.cpp b/src/elf.cpp
index d850f23..68f6cc7 100644
--- a/src/elf.cpp
+++ b/src/elf.cpp
@@ -417,7 +417,9 @@ ELFIO::section* read_sections(N64Recomp::Context& context, const N64Recomp::ElfP
                     // 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::renamed_funcs.contains(rel_symbol_name)) {
+                        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";
                         }