diff --git a/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml b/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml
index 285332a81..afea222b2 100644
--- a/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml
+++ b/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml
@@ -37,7 +37,7 @@
         <ResourceInclude Source="NavMenu/Themes/NavMenuThemes.axaml" />
         <ResourceInclude Source="Notifications/Themes/NotificationsThemes.axaml" />
         <ResourceInclude Source="NumericUpDown/Themes/NumericUpDownTheme.axaml" />
-        <ResourceInclude Source="OptionButtonBox/Themes/OptionButtonBoxThemes.axaml" />
+        <ResourceInclude Source="OptionButtonGroup/Themes/OptionButtonBoxThemes.axaml" />
         <ResourceInclude Source="Pagination/Themes/PaginationThemes.axaml" />
         <ResourceInclude Source="Popup/Themes/PopupThemes.axaml" />
         <ResourceInclude Source="PopupConfirm/Themes/PopupConfirmThemes.axaml" />
diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButton.cs b/src/AtomUI.Controls/OptionButtonGroup/OptionButton.cs
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/OptionButton.cs
rename to src/AtomUI.Controls/OptionButtonGroup/OptionButton.cs
diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs b/src/AtomUI.Controls/OptionButtonGroup/OptionButtonGroup.cs
similarity index 99%
rename from src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs
rename to src/AtomUI.Controls/OptionButtonGroup/OptionButtonGroup.cs
index a5ff373f0..8a301d441 100644
--- a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs
+++ b/src/AtomUI.Controls/OptionButtonGroup/OptionButtonGroup.cs
@@ -49,11 +49,6 @@ public class OptionButtonGroup : SelectingItemsControl,
     public static readonly StyledProperty<bool> IsWaveSpiritEnabledProperty =
         WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner<OptionButtonGroup>();
 
-    public static readonly RoutedEvent<OptionCheckedChangedEventArgs> OptionCheckedChangedEvent =
-        RoutedEvent.Register<OptionButtonGroup, OptionCheckedChangedEventArgs>(
-            nameof(OptionCheckedChanged),
-            RoutingStrategies.Bubble);
-
     public SizeType SizeType
     {
         get => GetValue(SizeTypeProperty);
@@ -77,13 +72,20 @@ public class OptionButtonGroup : SelectingItemsControl,
         get => GetValue(IsWaveSpiritEnabledProperty);
         set => SetValue(IsWaveSpiritEnabledProperty, value);
     }
+    
+    #endregion
 
+    #region 公共事件定义
+    public static readonly RoutedEvent<OptionCheckedChangedEventArgs> OptionCheckedChangedEvent =
+        RoutedEvent.Register<OptionButtonGroup, OptionCheckedChangedEventArgs>(
+            nameof(OptionCheckedChanged),
+            RoutingStrategies.Bubble);
+    
     public event EventHandler<OptionCheckedChangedEventArgs>? OptionCheckedChanged
     {
         add => AddHandler(OptionCheckedChangedEvent, value);
         remove => RemoveHandler(OptionCheckedChangedEvent, value);
     }
-
     #endregion
 
     #region 内部属性定义
@@ -127,8 +129,7 @@ public class OptionButtonGroup : SelectingItemsControl,
 
     static OptionButtonGroup()
     {
-        SelectionModeProperty.OverrideDefaultValue<OptionButtonGroup>(SelectionMode.Single |
-                                                                      SelectionMode.AlwaysSelected);
+        SelectionModeProperty.OverrideDefaultValue<OptionButtonGroup>(SelectionMode.Single | SelectionMode.AlwaysSelected);
         AutoScrollToSelectedItemProperty.OverrideDefaultValue<OptionButtonGroup>(false);
         ItemsPanelProperty.OverrideDefaultValue<OptionButtonGroup>(DefaultPanel);
         AffectsRender<OptionButtonGroup>(SelectionModeProperty);
diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButtonToken.cs b/src/AtomUI.Controls/OptionButtonGroup/OptionButtonToken.cs
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/OptionButtonToken.cs
rename to src/AtomUI.Controls/OptionButtonGroup/OptionButtonToken.cs
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxConstants.cs b/src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonBoxConstants.cs
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxConstants.cs
rename to src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonBoxConstants.cs
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.axaml b/src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonBoxThemes.axaml
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.axaml
rename to src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonBoxThemes.axaml
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.axaml b/src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonGroupTheme.axaml
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.axaml
rename to src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonGroupTheme.axaml
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.axaml b/src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonTheme.axaml
similarity index 100%
rename from src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.axaml
rename to src/AtomUI.Controls/OptionButtonGroup/Themes/OptionButtonTheme.axaml