diff --git a/Assets/_Scripts/Managers/GameStateManager/GameStateManagerController.cs b/Assets/_Scripts/Managers/GameStateManager/GameStateController.cs
similarity index 71%
rename from Assets/_Scripts/Managers/GameStateManager/GameStateManagerController.cs
rename to Assets/_Scripts/Managers/GameStateManager/GameStateController.cs
index 05275b9..93dd11c 100644
--- a/Assets/_Scripts/Managers/GameStateManager/GameStateManagerController.cs
+++ b/Assets/_Scripts/Managers/GameStateManager/GameStateController.cs
@@ -1,11 +1,10 @@
-using System;
 using UnityEngine;
 
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
-public class GameStateManagerController : MonoBehaviour
+public class GameStateController : MonoBehaviour
 {
     [Tooltip("Selected state will be applied when the game starts or on the button press")]
     public GameState ChangeToState;
@@ -24,20 +23,20 @@ public class GameStateManagerController : MonoBehaviour
 }
 
 #if UNITY_EDITOR
-[CustomEditor(typeof(GameStateManagerController))]
-class GameStateManagerControllerEditor : Editor
+[CustomEditor(typeof(GameStateController))]
+class GameStateControllerEditor : Editor
 {
     public override void OnInspectorGUI()
     {
         DrawDefaultInspector();
 
-        var gameStateManagerController = (GameStateManagerController)target;
-        if (gameStateManagerController == null) return;
+        var gameStateController = (GameStateController)target;
+        if (gameStateController == null) return;
         
         //Custom button to change game state from inspector during runtime
         if (GUILayout.Button("Change State"))
         {
-            if (Application.isPlaying) GameStateManager.Instance.ChangeState(gameStateManagerController.ChangeToState);
+            if (Application.isPlaying) GameStateManager.Instance.ChangeState(gameStateController.ChangeToState);
         }
     }
 }
diff --git a/Assets/_Scripts/Managers/GameStateManager/GameStateManagerController.cs.meta b/Assets/_Scripts/Managers/GameStateManager/GameStateController.cs.meta
similarity index 100%
rename from Assets/_Scripts/Managers/GameStateManager/GameStateManagerController.cs.meta
rename to Assets/_Scripts/Managers/GameStateManager/GameStateController.cs.meta
diff --git a/Assets/_Scripts/Managers/GameStateManager/GameStateManager.cs b/Assets/_Scripts/Managers/GameStateManager/GameStateManager.cs
index b0a8d2e..48f9998 100644
--- a/Assets/_Scripts/Managers/GameStateManager/GameStateManager.cs
+++ b/Assets/_Scripts/Managers/GameStateManager/GameStateManager.cs
@@ -20,7 +20,7 @@ public class GameStateManager
     //Current game state
     public GameState CurrentGameState { get; private set; }
 
-    //Create a delegate and event to be able to easily react on change of game state from any script
+    //Create an event to be able to easily react on change of game state from any script
     public event Action<GameState> OnGameStateChange;
     
     public void ChangeState(GameState newGameState)