diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61a59fdb..d2e26274 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,8 +297,8 @@ target_sources(
           src/utils/obs-module-helper.hpp
           src/utils/osc-helpers.cpp
           src/utils/osc-helpers.hpp
-          src/utils/plugin-state-helper.cpp
-          src/utils/plugin-state-helper.hpp
+          src/utils/plugin-state-helpers.cpp
+          src/utils/plugin-state-helpers.hpp
           src/utils/priority-helper.cpp
           src/utils/priority-helper.hpp
           src/utils/process-config.cpp
@@ -329,8 +329,8 @@ target_sources(
           src/utils/striped-frame.hpp
           src/utils/switch-button.cpp
           src/utils/switch-button.hpp
-          src/utils/sync-helper.cpp
-          src/utils/sync-helper.hpp
+          src/utils/sync-helpers.cpp
+          src/utils/sync-helpers.hpp
           src/utils/temp-variable.cpp
           src/utils/temp-variable.hpp
           src/utils/transition-selection.cpp
diff --git a/src/macro-core/macro-action-plugin-state.cpp b/src/macro-core/macro-action-plugin-state.cpp
index ea22710f..68b9e095 100644
--- a/src/macro-core/macro-action-plugin-state.cpp
+++ b/src/macro-core/macro-action-plugin-state.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-plugin-state.hpp"
-#include "plugin-state-helper.hpp"
+#include "plugin-state-helpers.hpp"
 #include "utility.hpp"
 
 #include <thread>
diff --git a/src/macro-core/macro-action-scene-collection.cpp b/src/macro-core/macro-action-scene-collection.cpp
index 3ae798bf..5f261204 100644
--- a/src/macro-core/macro-action-scene-collection.cpp
+++ b/src/macro-core/macro-action-scene-collection.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-scene-collection.hpp"
-#include "plugin-state-helper.hpp"
+#include "plugin-state-helpers.hpp"
 #include "utility.hpp"
 
 namespace advss {
diff --git a/src/macro-external/midi/midi-helpers.cpp b/src/macro-external/midi/midi-helpers.cpp
index b6793805..90887bc4 100644
--- a/src/macro-external/midi/midi-helpers.cpp
+++ b/src/macro-external/midi/midi-helpers.cpp
@@ -3,8 +3,8 @@
 #include <utility.hpp>
 #include <log-helper.hpp>
 #include <obs-module-helper.hpp>
-#include <plugin-state-helper.hpp>
-#include <sync-helper.hpp>
+#include <plugin-state-helpers.hpp>
+#include <sync-helpers.hpp>
 
 namespace advss {
 
diff --git a/src/macro-external/twitch/chat-connection.cpp b/src/macro-external/twitch/chat-connection.cpp
index 5dc408c5..d73d20a7 100644
--- a/src/macro-external/twitch/chat-connection.cpp
+++ b/src/macro-external/twitch/chat-connection.cpp
@@ -3,7 +3,7 @@
 #include "twitch-helpers.hpp"
 
 #include <log-helper.hpp>
-#include <plugin-state-helper.hpp>
+#include <plugin-state-helpers.hpp>
 
 namespace advss {
 
diff --git a/src/macro-external/twitch/event-sub.cpp b/src/macro-external/twitch/event-sub.cpp
index e15887b0..bb524b77 100644
--- a/src/macro-external/twitch/event-sub.cpp
+++ b/src/macro-external/twitch/event-sub.cpp
@@ -3,7 +3,7 @@
 #include "twitch-helpers.hpp"
 
 #include <log-helper.hpp>
-#include <plugin-state-helper.hpp>
+#include <plugin-state-helpers.hpp>
 
 namespace advss {
 
diff --git a/src/macro-external/twitch/token.cpp b/src/macro-external/twitch/token.cpp
index c30e7e44..333435ba 100644
--- a/src/macro-external/twitch/token.cpp
+++ b/src/macro-external/twitch/token.cpp
@@ -1,7 +1,7 @@
 #include "token.hpp"
 #include "twitch-helpers.hpp"
 
-#include <plugin-state-helper.hpp>
+#include <plugin-state-helpers.hpp>
 #include <log-helper.hpp>
 #include <obs-module-helper.hpp>
 #include <utility.hpp>
diff --git a/src/utils/connection-manager.cpp b/src/utils/connection-manager.cpp
index bc03a77d..26c1b8ec 100644
--- a/src/utils/connection-manager.cpp
+++ b/src/utils/connection-manager.cpp
@@ -1,7 +1,7 @@
 #include "connection-manager.hpp"
 #include "utility.hpp"
 #include "obs-module-helper.hpp"
-#include "plugin-state-helper.hpp"
+#include "plugin-state-helpers.hpp"
 #include "name-dialog.hpp"
 
 #include <algorithm>
diff --git a/src/utils/plugin-state-helper.cpp b/src/utils/plugin-state-helpers.cpp
similarity index 100%
rename from src/utils/plugin-state-helper.cpp
rename to src/utils/plugin-state-helpers.cpp
diff --git a/src/utils/plugin-state-helper.hpp b/src/utils/plugin-state-helpers.hpp
similarity index 100%
rename from src/utils/plugin-state-helper.hpp
rename to src/utils/plugin-state-helpers.hpp
diff --git a/src/utils/sync-helper.cpp b/src/utils/sync-helpers.cpp
similarity index 92%
rename from src/utils/sync-helper.cpp
rename to src/utils/sync-helpers.cpp
index 7f1d801f..8edff94e 100644
--- a/src/utils/sync-helper.cpp
+++ b/src/utils/sync-helpers.cpp
@@ -1,4 +1,4 @@
-#include "sync-helper.hpp"
+#include "sync-helpers.hpp"
 
 namespace advss {
 
diff --git a/src/utils/sync-helper.hpp b/src/utils/sync-helpers.hpp
similarity index 100%
rename from src/utils/sync-helper.hpp
rename to src/utils/sync-helpers.hpp
diff --git a/src/utils/temp-variable.cpp b/src/utils/temp-variable.cpp
index 33c189bd..25c6cf4a 100644
--- a/src/utils/temp-variable.cpp
+++ b/src/utils/temp-variable.cpp
@@ -2,7 +2,7 @@
 #include "advanced-scene-switcher.hpp"
 #include "macro.hpp"
 #include "macro-segment.hpp"
-#include "plugin-state-helper.hpp"
+#include "plugin-state-helpers.hpp"
 #include "utility.hpp"
 
 #include <QVariant>
diff --git a/src/utils/websocket-helpers.cpp b/src/utils/websocket-helpers.cpp
index 2b831c91..129d60a9 100644
--- a/src/utils/websocket-helpers.cpp
+++ b/src/utils/websocket-helpers.cpp
@@ -1,8 +1,8 @@
 #include "websocket-helpers.hpp"
 #include "connection-manager.hpp"
 #include "log-helper.hpp"
-#include "plugin-state-helper.hpp"
-#include "sync-helper.hpp"
+#include "plugin-state-helpers.hpp"
+#include "sync-helpers.hpp"
 
 #include <QCryptographicHash>
 #include <obs-websocket-api.h>