diff --git a/Source/Logging/Logger.cpp b/Source/Logging/Logger.cpp
index b2c4002d..958574e5 100644
--- a/Source/Logging/Logger.cpp
+++ b/Source/Logging/Logger.cpp
@@ -264,7 +264,7 @@ namespace Aurora::Logging
         }
 
         {
-            AuTryDeleteList(gFlushableLoggers, this);
+            AuTryRemove(gFlushableLoggers, this);
         }
     }
 
diff --git a/Source/Registry/Registry.cpp b/Source/Registry/Registry.cpp
index 31f6edf7..417b4dbc 100644
--- a/Source/Registry/Registry.cpp
+++ b/Source/Registry/Registry.cpp
@@ -354,7 +354,7 @@ namespace Aurora::Registry
     void FSRegistry::UnlockKey(const AuString &str)
     {
         AU_LOCK_GUARD(lock_->AsWritable());
-        AuTryDeleteList(restrictedKeys_, str);
+        AuTryRemove(restrictedKeys_, str);
     }
 
     bool FSRegistry::Save()
diff --git a/Source/Threading/Threads/TLSView.cpp b/Source/Threading/Threads/TLSView.cpp
index 0e2aaf68..1ea06996 100644
--- a/Source/Threading/Threads/TLSView.cpp
+++ b/Source/Threading/Threads/TLSView.cpp
@@ -66,7 +66,7 @@ namespace Aurora::Threading::Threads
                 return nullptr;
             }
 
-            auto ok = AuTryInsertNoEnd(tls_, AuMakePair(key, AuMakePair(buf, TlsCb {})));
+            auto ok = AuTryInsert(tls_, key, AuMakePair(buf, TlsCb {}));
             if (!ok)
             {
                 AuMemory::Free(buf);
@@ -103,7 +103,7 @@ namespace Aurora::Threading::Threads
         }
 
         TlsCb deinitcb = deinit;
-        auto ok = AuTryInsertNoEnd(tls_, AuMakePair(key, AuMakePair(buf, deinitcb)));
+        auto ok = AuTryInsert(tls_, key, AuMakePair(buf, deinitcb));
         if (!ok)
         {
             AuMemory::Free(buf);
diff --git a/Source/Threading/Threads/ThreadHandles.cpp b/Source/Threading/Threads/ThreadHandles.cpp
index 5d084743..b594f89d 100644
--- a/Source/Threading/Threads/ThreadHandles.cpp
+++ b/Source/Threading/Threads/ThreadHandles.cpp
@@ -61,9 +61,9 @@ namespace Aurora::Threading::Threads
     {
         AU_LOCK_GUARD(gMutex);
     #if defined(AURORA_IS_POSIX_DERIVED)
-        AuTryDelete(gUnixHandlesToThreads, id.unixThreadId);
+        AuTryRemove(gUnixHandlesToThreads, id.unixThreadId);
     #endif
-        AuTryDelete(gNativeHandlesToThreads, id.threadId);
+        AuTryRemove(gNativeHandlesToThreads, id.threadId);
     }
 
     struct OSFallbackThread : BasicThreadId