diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fd3e32..3ba7843 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ set(HTTPLIB_REQUIRE_OPENSSL ON)
 add_subdirectory(lib/cpp-httplib EXCLUDE_FROM_ALL)
 target_include_directories(soundux SYSTEM PRIVATE "lib/cpp-httplib")
 
-target_link_libraries(soundux PRIVATE webview nfd tiny-process-library tray guard httplib lockpp libremidi)
+target_link_libraries(soundux PRIVATE webview nfd tiny-process-library tray guardpp httplib lockpp libremidi)
 
 if (${EMBED_PATH} STREQUAL "OFF")
     message("Web-content will not be embedded") 
diff --git a/src/core/global/globals.hpp b/src/core/global/globals.hpp
index 6978bcc..7450bd2 100644
--- a/src/core/global/globals.hpp
+++ b/src/core/global/globals.hpp
@@ -37,7 +37,7 @@ namespace Soundux
         inline std::unique_ptr<Objects::Window> gGui;
         inline std::shared_ptr<Objects::Hotkeys> gHotKeys;
 
-        inline std::shared_ptr<Instance::Guard> gGuard;
+        inline std::shared_ptr<guardpp::guard> gGuard;
 
         /* Allows for fast & easy sound access, is populated on start up */
         inline sxl::var_guard<std::map<std::uint32_t, std::reference_wrapper<Objects::Sound>>> gSounds;
diff --git a/src/main.cpp b/src/main.cpp
index 8060fb1..a8fcf00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,16 +56,16 @@ int main(int argc, char **arguments)
     }
 
     backward::SignalHandling crashHandler;
-    gGuard = std::make_shared<Instance::Guard>("soundux-guard");
+    gGuard = std::make_shared<guardpp::guard>("soundux-guard");
 
     if (std::find(args.begin(), args.end(), "--reset-mutex") != args.end())
     {
         gGuard->reset();
         gGuard.reset();
-        gGuard = std::make_shared<Instance::Guard>("soundux-guard");
+        gGuard = std::make_shared<guardpp::guard>("soundux-guard");
     }
 
-    if (gGuard->isAnotherRunning())
+    if (gGuard->other_instance())
     {
         Fancy::fancy.logTime().failure() << "Another Instance is already running!" << std::endl;
         return 1;