diff --git a/Editor/GarbageCodeGeneration/GarbageCodeGenerator.cs b/Editor/GarbageCodeGeneration/GarbageCodeGenerator.cs
index 44f5d30..2b00c44 100644
--- a/Editor/GarbageCodeGeneration/GarbageCodeGenerator.cs
+++ b/Editor/GarbageCodeGeneration/GarbageCodeGenerator.cs
@@ -14,10 +14,10 @@ namespace Obfuz.GarbageCodeGeneration
     {
         private const int CodeGenerationSecretKeyLength = 1024;
 
-        private readonly GarbageCodeGeneratorSettings _settings;
+        private readonly GarbageCodeGenerationSettings _settings;
         private readonly int[] _intGenerationSecretKey;
 
-        public GarbageCodeGenerator(GarbageCodeGeneratorSettings settings)
+        public GarbageCodeGenerator(GarbageCodeGenerationSettings settings)
         {
             _settings = settings;
 
@@ -55,14 +55,14 @@ namespace Obfuz.GarbageCodeGeneration
 
         private void GenerateTask(GarbageCodeGenerationTask task)
         {
-            Debug.Log($"Generating garbage code with seed: {task.codeGenerationRandomSeed}, class count: {task.classCount}, method count per class: {task.methodCountPerClass}, types: {task.garbageCodeTypes}, output path: {task.outputPath}");
+            Debug.Log($"Generating garbage code with seed: {task.codeGenerationRandomSeed}, class count: {task.classCount}, method count per class: {task.methodCountPerClass}, types: {task.garbageCodeType}, output path: {task.outputPath}");
 
             if (string.IsNullOrWhiteSpace(task.outputPath))
             {
                 throw new Exception("outputPath of GarbageCodeGenerationTask is empty!");
             }
 
-            var generator = CreateSpecificCodeGenerator(task.garbageCodeTypes);
+            var generator = CreateSpecificCodeGenerator(task.garbageCodeType);
 
             var parameters = new GenerationParameters
             {
diff --git a/Editor/ObfuscatorBuilder.cs b/Editor/ObfuscatorBuilder.cs
index c654c58..0aa54fe 100644
--- a/Editor/ObfuscatorBuilder.cs
+++ b/Editor/ObfuscatorBuilder.cs
@@ -189,7 +189,7 @@ namespace Obfuz
             }
             if (obfuscationPasses.HasFlag(ObfuscationPassType.ControlFlowObfus))
             {
-                builder.AddPass(new ControlFlowObfusPass(settings.controlFlowObfuscationSettings.ToFacade()));
+                builder.AddPass(new ControlFlowObfusPass(settings.controlFlowObfusSettings.ToFacade()));
             }
             if (obfuscationPasses.HasFlag(ObfuscationPassType.SymbolObfus))
             {
diff --git a/Editor/Settings/GarbageCodeGeneratorSettings.cs b/Editor/Settings/GarbageCodeGenerationSettings.cs
similarity index 86%
rename from Editor/Settings/GarbageCodeGeneratorSettings.cs
rename to Editor/Settings/GarbageCodeGenerationSettings.cs
index abd9631..b17748f 100644
--- a/Editor/Settings/GarbageCodeGeneratorSettings.cs
+++ b/Editor/Settings/GarbageCodeGenerationSettings.cs
@@ -24,13 +24,13 @@ namespace Obfuz.Settings
 
         public int fieldCountPerClass = 50;
 
-        public GarbageCodeType garbageCodeTypes = GarbageCodeType.Config;
+        public GarbageCodeType garbageCodeType = GarbageCodeType.Config;
 
         public string outputPath = "Assets/Obfuz/GarbageCode";
     }
 
     [Serializable]
-    public class GarbageCodeGeneratorSettings
+    public class GarbageCodeGenerationSettings
     {
         public string codeGenerationSecret = "Garbage Code";
 
diff --git a/Editor/Settings/GarbageCodeGeneratorSettings.cs.meta b/Editor/Settings/GarbageCodeGenerationSettings.cs.meta
similarity index 100%
rename from Editor/Settings/GarbageCodeGeneratorSettings.cs.meta
rename to Editor/Settings/GarbageCodeGenerationSettings.cs.meta
diff --git a/Editor/Settings/ObfuzSettings.cs b/Editor/Settings/ObfuzSettings.cs
index 491d225..ed4d0d9 100644
--- a/Editor/Settings/ObfuzSettings.cs
+++ b/Editor/Settings/ObfuzSettings.cs
@@ -41,10 +41,10 @@ namespace Obfuz.Settings
         public ExprObfuscationSettings exprObfusSettings;
 
         [Tooltip("control flow obfuscation settings")]
-        public ControlFlowObfuscationSettings controlFlowObfuscationSettings;
+        public ControlFlowObfuscationSettings controlFlowObfusSettings;
 
         [Tooltip("garbage code generator settings")]
-        public GarbageCodeGeneratorSettings garbageCodeGeneratorSettings;
+        public GarbageCodeGenerationSettings garbageCodeGenerationSettings;
 
         public string ObfuzRootDir => $"Library/Obfuz";
 
diff --git a/Editor/Settings/ObfuzSettingsProvider.cs b/Editor/Settings/ObfuzSettingsProvider.cs
index 8dbf04c..9e78bc0 100644
--- a/Editor/Settings/ObfuzSettingsProvider.cs
+++ b/Editor/Settings/ObfuzSettingsProvider.cs
@@ -38,7 +38,7 @@ namespace Obfuz.Settings
         private SerializedProperty _exprObfusSettings;
         private SerializedProperty _controlFlowObfusSettings;
 
-        private SerializedProperty _garbageCodeGeneratorSettings;
+        private SerializedProperty _garbageCodeGenerationSettings;
 
         public ObfuzSettingsProvider() : base("Project/Obfuz", SettingsScope.Project)
         {
@@ -73,9 +73,9 @@ namespace Obfuz.Settings
             _exprObfusSettings = _serializedObject.FindProperty("exprObfusSettings");
             _fieldEncryptSettings = _serializedObject.FindProperty("fieldEncryptSettings");
             _callObfusSettings = _serializedObject.FindProperty("callObfusSettings");
-            _controlFlowObfusSettings = _serializedObject.FindProperty("controlFlowObfuscationSettings");
+            _controlFlowObfusSettings = _serializedObject.FindProperty("controlFlowObfusSettings");
 
-            _garbageCodeGeneratorSettings = _serializedObject.FindProperty("garbageCodeGeneratorSettings");
+            _garbageCodeGenerationSettings = _serializedObject.FindProperty("garbageCodeGenerationSettings");
         }
 
         public override void OnGUI(string searchContext)
@@ -102,7 +102,7 @@ namespace Obfuz.Settings
             EditorGUILayout.PropertyField(_callObfusSettings);
             EditorGUILayout.PropertyField(_controlFlowObfusSettings);
 
-            EditorGUILayout.PropertyField(_garbageCodeGeneratorSettings);
+            EditorGUILayout.PropertyField(_garbageCodeGenerationSettings);
 
             if (EditorGUI.EndChangeCheck())
             {
diff --git a/Editor/Unity/ObfuzMenu.cs b/Editor/Unity/ObfuzMenu.cs
index 2237ba1..be1147d 100644
--- a/Editor/Unity/ObfuzMenu.cs
+++ b/Editor/Unity/ObfuzMenu.cs
@@ -42,7 +42,7 @@ namespace Obfuz.Unity
         public static void GenerateGarbageCodes()
         {
             Debug.Log($"Generating garbage codes begin.");
-            GarbageCodeGeneratorSettings settings = ObfuzSettings.Instance.garbageCodeGeneratorSettings;
+            GarbageCodeGenerationSettings settings = ObfuzSettings.Instance.garbageCodeGenerationSettings;
             var generator = new GarbageCodeGenerator(settings);
             generator.Generate();
             AssetDatabase.Refresh();
@@ -53,7 +53,7 @@ namespace Obfuz.Unity
         public static void CleanGeneratedGarbageCodes()
         {
             Debug.Log($"Clean generated garbage codes begin.");
-            GarbageCodeGeneratorSettings settings = ObfuzSettings.Instance.garbageCodeGeneratorSettings;
+            GarbageCodeGenerationSettings settings = ObfuzSettings.Instance.garbageCodeGenerationSettings;
             var generator = new GarbageCodeGenerator(settings);
             generator.CleanCodes();
             AssetDatabase.Refresh();