diff --git a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
index 4edcc2a..70a9138 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TreeDataGridHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
-    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TreeDataGridHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
     <StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
diff --git a/src/Semi.Avalonia.TreeDataGrid/Light.axaml b/src/Semi.Avalonia.TreeDataGrid/Light.axaml
index 4edcc2a..70a9138 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Light.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Light.axaml
@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="TreeDataGridGridLinesBrush" ResourceKey="SemiColorBorder" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="TreeDataGridHeaderPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="TreeDataGridHeaderPressedBackground" ResourceKey="SemiColorFill2" />
-    <SolidColorBrush x:Key="TreeDataGridHeaderPointerOverBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeDataGridHeaderPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="TreeDataGridHeaderPressedBorderBrush" Color="Transparent" />
-    <StaticResource x:Key="TreeDataGridHeaderPointerOverForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="TreeDataGridHeaderPointeroverForeground" ResourceKey="SemiColorText1" />
     <StaticResource x:Key="TreeDataGridHeaderPressedForeground" ResourceKey="SemiColorText0" />
     <StaticResource x:Key="TreeDataGridCellSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <StaticResource x:Key="TreeDataGridColumnHeaderForeground" ResourceKey="SemiColorText2" />
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
index 615412e..4b11fd2 100644
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -113,9 +113,9 @@
         </Setter>
 
         <Style Selector="^:pointerover /template/ Border#DataGridBorder">
-            <Setter Property="Background" Value="{DynamicResource TreeDataGridHeaderPointerOverBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TreeDataGridHeaderPointerOverBorderBrush}" />
-            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeDataGridHeaderPointerOverForeground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeDataGridHeaderPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TreeDataGridHeaderPointeroverBorderBrush}" />
+            <Setter Property="TextBlock.Foreground" Value="{DynamicResource TreeDataGridHeaderPointeroverForeground}" />
         </Style>
 
         <Style Selector="^:pressed /template/ Border#DataGridBorder">
diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
index 34e56ba..8ceb872 100644
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -171,7 +171,7 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#Background">
@@ -213,8 +213,8 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index fe2d055..9ec3765 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -217,7 +217,7 @@
                 <Setter Property="Background" Value="{DynamicResource DataValidationErrorsBackground}" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#Background">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#Background">
@@ -273,8 +273,8 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#Background">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#Background">
                     <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
index d51410c..c91ed17 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -37,7 +37,7 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
diff --git a/src/Semi.Avalonia/Controls/NumericUpDown.axaml b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
index ae6d770..4686973 100644
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -57,7 +57,7 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ TextBox#PART_TextBox">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ TextBox#PART_TextBox">
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 51f7d0a..cbc6b61 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -152,7 +152,7 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
@@ -210,8 +210,8 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
                     <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
@@ -380,7 +380,7 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
@@ -438,8 +438,8 @@
                     <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
                 </Style>
                 <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
+                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointeroverBackground}" />
+                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointeroverBorderBrush}" />
                 </Style>
                 <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
                     <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
diff --git a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
index 4cf39a0..8b3635c 100644
--- a/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DataValidationErrors.axaml
@@ -2,10 +2,14 @@
     <StaticResource x:Key="DataValidationErrorsForeground" ResourceKey="SemiColorDanger" />
     <StaticResource x:Key="DataValidationErrorsBackground" ResourceKey="SemiColorDangerLight" />
     <StaticResource x:Key="DataValidationErrorsBorderBrush" ResourceKey="SemiColorDangerLight" />
-    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
-    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointeroverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointeroverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
     <StaticResource x:Key="DataValidationErrorsPressedBackground" ResourceKey="SemiColorDangerLightActive" />
     <StaticResource x:Key="DataValidationErrorsPressedBorderBrush" ResourceKey="SemiColorDangerLightActive" />
     <StaticResource x:Key="DataValidationErrorsSelectedBackground" ResourceKey="SemiColorDangerLight" />
     <StaticResource x:Key="DataValidationErrorsSelectedBorderBrush" ResourceKey="SemiColorDanger" />
+
+    <!-- Deprecated keys -->
+    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
index 40df42c..0e76a39 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
@@ -2,10 +2,14 @@
     <SolidColorBrush x:Key="DataValidationErrorsForeground" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsBackground" Opacity="0.2" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsBorderBrush" Opacity="0.2" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
-    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointeroverBackground" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointeroverBorderBrush" Opacity="0.3" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsPressedBackground" Opacity="0.4" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsPressedBorderBrush" Opacity="0.4" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBackground" Opacity="0.2" Color="#FC725A" />
     <SolidColorBrush x:Key="DataValidationErrorsSelectedBorderBrush" Color="#FC725A" />
+
+    <!-- Deprecated keys -->
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBackground" Opacity="0.3" Color="#FC725A" />
+    <SolidColorBrush x:Key="DataValidationErrorsPointerOverBorderBrush" Opacity="0.3" Color="#FC725A" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
index 4cf39a0..8b3635c 100644
--- a/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DataValidationErrors.axaml
@@ -2,10 +2,14 @@
     <StaticResource x:Key="DataValidationErrorsForeground" ResourceKey="SemiColorDanger" />
     <StaticResource x:Key="DataValidationErrorsBackground" ResourceKey="SemiColorDangerLight" />
     <StaticResource x:Key="DataValidationErrorsBorderBrush" ResourceKey="SemiColorDangerLight" />
-    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
-    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointeroverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointeroverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
     <StaticResource x:Key="DataValidationErrorsPressedBackground" ResourceKey="SemiColorDangerLightActive" />
     <StaticResource x:Key="DataValidationErrorsPressedBorderBrush" ResourceKey="SemiColorDangerLightActive" />
     <StaticResource x:Key="DataValidationErrorsSelectedBackground" ResourceKey="SemiColorDangerLight" />
     <StaticResource x:Key="DataValidationErrorsSelectedBorderBrush" ResourceKey="SemiColorDanger" />
+
+    <!-- Deprecated keys -->
+    <StaticResource x:Key="DataValidationErrorsPointerOverBackground" ResourceKey="SemiColorDangerLightPointerover" />
+    <StaticResource x:Key="DataValidationErrorsPointerOverBorderBrush" ResourceKey="SemiColorDangerLightPointerover" />
 </ResourceDictionary>
\ No newline at end of file