diff --git a/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs b/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
index b120d9a..d6618ff 100644
--- a/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/JumpLinkBuilderTool.cs
@@ -63,7 +63,7 @@ public class JumpLinkBuilderTool : IRcTool
         var option = _impl.GetOption();
         var annotationBuilder = _impl.GetAnnotationBuilder();
 
-        if ((option.flags & JumpLinkBuilderToolOptions.DRAW_WALKABLE_BORDER) != 0)
+        if ((option.flags & JumpLinkBuilderToolOption.DRAW_WALKABLE_BORDER) != 0)
         {
             if (annotationBuilder != null)
             {
@@ -121,7 +121,7 @@ public class JumpLinkBuilderTool : IRcTool
             }
         }
 
-        if ((option.flags & JumpLinkBuilderToolOptions.DRAW_ANNOTATIONS) != 0)
+        if ((option.flags & JumpLinkBuilderToolOption.DRAW_ANNOTATIONS) != 0)
         {
             dd.Begin(QUADS);
             foreach (JumpLink link in _impl.GetLinks())
@@ -172,7 +172,7 @@ public class JumpLinkBuilderTool : IRcTool
         {
             foreach (JumpLink link in _impl.GetLinks())
             {
-                if ((option.flags & JumpLinkBuilderToolOptions.DRAW_ANIM_TRAJECTORY) != 0)
+                if ((option.flags & JumpLinkBuilderToolOption.DRAW_ANIM_TRAJECTORY) != 0)
                 {
                     float r = link.start.height;
 
@@ -238,7 +238,7 @@ public class JumpLinkBuilderTool : IRcTool
                     dd.End();
                 }
 
-                if ((option.flags & JumpLinkBuilderToolOptions.DRAW_LAND_SAMPLES) != 0)
+                if ((option.flags & JumpLinkBuilderToolOption.DRAW_LAND_SAMPLES) != 0)
                 {
                     dd.Begin(POINTS, 8.0f);
                     for (int i = 0; i < link.start.gsamples.Length; ++i)
@@ -386,11 +386,11 @@ public class JumpLinkBuilderTool : IRcTool
         ImGui.Text("Debug Draw Options");
         ImGui.Separator();
         //int newFlags = 0;
-        ImGui.CheckboxFlags("Walkable Border", ref option.flags, JumpLinkBuilderToolOptions.DRAW_WALKABLE_BORDER);
-        ImGui.CheckboxFlags("Selected Edge", ref option.flags, JumpLinkBuilderToolOptions.DRAW_SELECTED_EDGE);
-        ImGui.CheckboxFlags("Anim Trajectory", ref option.flags, JumpLinkBuilderToolOptions.DRAW_ANIM_TRAJECTORY);
-        ImGui.CheckboxFlags("Land Samples", ref option.flags, JumpLinkBuilderToolOptions.DRAW_LAND_SAMPLES);
-        ImGui.CheckboxFlags("All Annotations", ref option.flags, JumpLinkBuilderToolOptions.DRAW_ANNOTATIONS);
+        ImGui.CheckboxFlags("Walkable Border", ref option.flags, JumpLinkBuilderToolOption.DRAW_WALKABLE_BORDER);
+        ImGui.CheckboxFlags("Selected Edge", ref option.flags, JumpLinkBuilderToolOption.DRAW_SELECTED_EDGE);
+        ImGui.CheckboxFlags("Anim Trajectory", ref option.flags, JumpLinkBuilderToolOption.DRAW_ANIM_TRAJECTORY);
+        ImGui.CheckboxFlags("Land Samples", ref option.flags, JumpLinkBuilderToolOption.DRAW_LAND_SAMPLES);
+        ImGui.CheckboxFlags("All Annotations", ref option.flags, JumpLinkBuilderToolOption.DRAW_ANNOTATIONS);
         //option.flags = newFlags;
     }
 
diff --git a/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs b/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
index 0e00c0e..452b410 100644
--- a/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/OffMeshConnectionTool.cs
@@ -103,7 +103,7 @@ public class OffMeshConnectionTool : IRcTool
 
     public void Layout()
     {
-        var options = _impl.GetOptions();
+        var options = _impl.GetOption();
         ImGui.RadioButton("One Way", ref options.bidir, 0);
         ImGui.RadioButton("Bidirectional", ref options.bidir, 1);
     }
diff --git a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs b/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs
index df7e67d..878a0c1 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs
+++ b/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolImpl.cs
@@ -13,12 +13,12 @@ namespace DotRecast.Recast.DemoTool.Tools
         private readonly List<JumpLink> _links;
         private JumpLinkBuilder _annotationBuilder;
         private readonly int _selEdge = -1;
-        private readonly JumpLinkBuilderToolOptions _option;
+        private readonly JumpLinkBuilderToolOption _option;
 
         public JumpLinkBuilderToolImpl()
         {
             _links = new List<JumpLink>();
-            _option = new JumpLinkBuilderToolOptions();
+            _option = new JumpLinkBuilderToolOption();
         }
 
 
@@ -42,7 +42,7 @@ namespace DotRecast.Recast.DemoTool.Tools
             _annotationBuilder = null;
         }
 
-        public JumpLinkBuilderToolOptions GetOption()
+        public JumpLinkBuilderToolOption GetOption()
         {
             return _option;
         }
diff --git a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOptions.cs b/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs
similarity index 97%
rename from src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOptions.cs
rename to src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs
index 149dfd2..db8a691 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOptions.cs
+++ b/src/DotRecast.Recast.DemoTool/Tools/JumpLinkBuilderToolOption.cs
@@ -20,7 +20,7 @@ using DotRecast.Detour.Extras.Jumplink;
 
 namespace DotRecast.Recast.DemoTool.Tools
 {
-    public class JumpLinkBuilderToolOptions
+    public class JumpLinkBuilderToolOption
     {
         public const int DRAW_WALKABLE_SURFACE = 1 << 0;
         public const int DRAW_WALKABLE_BORDER = 1 << 1;
diff --git a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs b/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs
index 4818c38..6518f78 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs
+++ b/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolImpl.cs
@@ -8,11 +8,11 @@ namespace DotRecast.Recast.DemoTool.Tools
     public class OffMeshConnectionToolImpl : ISampleTool
     {
         private Sample _sample;
-        private readonly OffMeshConnectionToolOptions _options;
+        private readonly OffMeshConnectionToolOption _option;
 
         public OffMeshConnectionToolImpl()
         {
-            _options = new OffMeshConnectionToolOptions();
+            _option = new OffMeshConnectionToolOption();
         }
 
         public string GetName()
@@ -31,9 +31,9 @@ namespace DotRecast.Recast.DemoTool.Tools
         }
 
 
-        public OffMeshConnectionToolOptions GetOptions()
+        public OffMeshConnectionToolOption GetOption()
         {
-            return _options;
+            return _option;
         }
 
         public void Add(RcVec3f start, RcVec3f end)
@@ -44,7 +44,7 @@ namespace DotRecast.Recast.DemoTool.Tools
 
             int area = SampleAreaModifications.SAMPLE_POLYAREA_TYPE_JUMP;
             int flags = SampleAreaModifications.SAMPLE_POLYFLAGS_JUMP;
-            geom.AddOffMeshConnection(start, end, _sample.GetSettings().agentRadius, 0 == _options.bidir, area, flags);
+            geom.AddOffMeshConnection(start, end, _sample.GetSettings().agentRadius, 0 == _option.bidir, area, flags);
         }
 
         public void Remove(RcVec3f p)
diff --git a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOptions.cs b/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs
similarity index 64%
rename from src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOptions.cs
rename to src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs
index 5742fe0..d12d67b 100644
--- a/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOptions.cs
+++ b/src/DotRecast.Recast.DemoTool/Tools/OffMeshConnectionToolOption.cs
@@ -1,6 +1,6 @@
 namespace DotRecast.Recast.DemoTool.Tools
 {
-    public class OffMeshConnectionToolOptions
+    public class OffMeshConnectionToolOption
     {
         public int bidir;
     }