diff --git a/About.xaml.cs b/About.xaml.cs
index 9701fb3..b28e71d 100644
--- a/About.xaml.cs
+++ b/About.xaml.cs
@@ -14,7 +14,7 @@ namespace AnotherReplayReader
             _idBox.Text = Auth.Id;
         }
 
-        private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
+        private void OnHyperlinkRequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
         {
             Process.Start(e.Uri.ToString());
         }
diff --git a/Debug.xaml b/Debug.xaml
index c45e0ee..b26d5c2 100644
--- a/Debug.xaml
+++ b/Debug.xaml
@@ -13,10 +13,10 @@
             <Button Padding="8,2"
                     Margin="0,0,10,0"
                     Content="导出日志"
-                    Click="OnExport_Click" />
+                    Click="OnExportButtonClick" />
             <Button Padding="8,2"
                     Content="清空日志"
-                    Click="OnClear_Click" />
+                    Click="OnClearButtonClick" />
         </StackPanel>
         <TextBox x:Name="_textBox"
                  TextWrapping="Wrap"
diff --git a/Debug.xaml.cs b/Debug.xaml.cs
index 017c47d..7306957 100644
--- a/Debug.xaml.cs
+++ b/Debug.xaml.cs
@@ -88,9 +88,9 @@ namespace AnotherReplayReader
 
         private Debug() { }
 
-        private void OnExport_Click(object sender, RoutedEventArgs e) => Export(this);
+        private void OnExportButtonClick(object sender, RoutedEventArgs e) => Export(this);
 
-        private void OnClear_Click(object sender, RoutedEventArgs e) => _textBox.Clear();
+        private void OnClearButtonClick(object sender, RoutedEventArgs e) => _textBox.Clear();
 
         private void AppendText(string s) => Dispatcher.InvokeAsync(() => _textBox.AppendText(s));
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index b3204a8..a4e59d9 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -23,8 +23,8 @@
             </Grid.ColumnDefinitions>
             <Label x:Name="label" Content="录像文件夹" Grid.Column="0" Margin="0,-3,5,8" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="75"/>
             <TextBox x:Name="_replayFolderPathBox" Grid.Column="1" TextWrapping="Wrap" Text="{Binding Path=ReplayFolderPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextChanged="OnReplayFolderPathBoxTextChanged" Margin="0,0,0,10" Grid.ColumnSpan="2" />
-            <Button x:Name="_browseButton" Content="浏览..." Grid.Column="3" Margin="10,0,5,11" Click="OnBrowseButton_Click"/>
-            <Button x:Name="_aboutButton" Content="关于..." Click="OnAboutButton_Click" Grid.Column="4" Margin="5,0,12,11"/>
+            <Button x:Name="_browseButton" Content="浏览..." Grid.Column="3" Margin="10,0,5,11" Click="OnBrowseButtonClick"/>
+            <Button x:Name="_aboutButton" Content="关于..." Click="OnAboutButtonClick" Grid.Column="4" Margin="5,0,12,11"/>
         </Grid>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
@@ -42,7 +42,7 @@
                   Height="20"
                   VerticalAlignment="Top">
                 <TextBox x:Name="_replayFilterBox"
-                         TextChanged="ReplayFilterBox_TextChanged" />
+                         TextChanged="OnReplayFilterBoxTextChanged" />
                 <TextBlock IsHitTestVisible="False"
                            Text="输入录像名称、玩家名称或地图名称等 可以筛选录像"
                            VerticalAlignment="Center"
@@ -78,15 +78,15 @@
                     <DataGridTextColumn Header="录像日期" Binding="{Binding Path=Date, StringFormat='{}{0:yyyy/MM/dd HH:mm:SS}'}" Width="3*" IsReadOnly="True" />
                 </DataGrid.Columns>
             </DataGrid>
-            <Button x:Name="_debugButton" Content="调试信息" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"  Click="OnDebugButton_Click" Margin="20,6,0,0" HorizontalAlignment="Left" Width="80"/>
+            <Button x:Name="_debugButton" Content="调试信息" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top"  Click="OnDebugButtonClick" Margin="20,6,0,0" HorizontalAlignment="Left" Width="80"/>
             <TextBox x:Name="_replayDetailsBox" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="20,30,20,0" Text="{Binding Path=ReplayDetails}"  TextWrapping="Wrap"/>
             <Image x:Name="_image" Grid.Row="1" Grid.Column="0" Margin="18,20,0,0" Stretch="Uniform" HorizontalAlignment="Left" Width="120" Height="120" VerticalAlignment="Top" />
             <Button x:Name="_playButton" Grid.Row="1" Grid.Column="1" Content="播放录像"
                     Margin="10,0,20,96"
-                    Height="35" VerticalAlignment="Bottom" IsEnabled="{Binding Path=ReplayPlayable}" Click="OnPlayReplayButton_Click"/>
+                    Height="35" VerticalAlignment="Bottom" IsEnabled="{Binding Path=ReplayPlayable}" Click="OnPlayReplayButtonClick"/>
             <Button x:Name="_saveAsButton" Grid.Row="1" Grid.Column="1" Content="修复录像"
                     Margin="10,0,20,56"
-                    Height="35" VerticalAlignment="Bottom" IsEnabled="{Binding Path=ReplayDamaged}" Click="OnFixReplayButton_Click"/>
+                    Height="35" VerticalAlignment="Bottom" IsEnabled="{Binding Path=ReplayDamaged}" Click="OnFixReplayButtonClick"/>
             <Button x:Name="_detailsButton"
                     Grid.Row="1"
                     Grid.Column="1"
@@ -95,7 +95,7 @@
                     Height="35"
                     VerticalAlignment="Bottom"
                     IsEnabled="{Binding Path=ReplaySelected}"
-                    Click="OnDetailsButton_Click" />
+                    Click="OnDetailsButtonClick" />
         </Grid>
 
     </Grid>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4811415..2ec01ad 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -332,13 +332,13 @@ namespace AnotherReplayReader
             await _taskQueue.Enqueue(() => DisplayReplayDetail(replay, _properties.ReplayDetails, token), token);
         }
 
-        private void OnAboutButton_Click(object sender, RoutedEventArgs e)
+        private void OnAboutButtonClick(object sender, RoutedEventArgs e)
         {
             var aboutWindow = new About();
             aboutWindow.ShowDialog();
         }
 
-        private void OnBrowseButton_Click(object sender, RoutedEventArgs e)
+        private void OnBrowseButtonClick(object sender, RoutedEventArgs e)
         {
             try
             {
@@ -362,20 +362,20 @@ namespace AnotherReplayReader
             }
         }
 
-        private void OnDetailsButton_Click(object sender, RoutedEventArgs e)
+        private void OnDetailsButtonClick(object sender, RoutedEventArgs e)
         {
             var detailsWindow = new ApmWindow(_properties.CurrentReplay!, _playerIdentity);
             detailsWindow.ShowDialog();
         }
 
-        private void OnDebugButton_Click(object sender, RoutedEventArgs e) => Debug.ShowDialog();
+        private void OnDebugButtonClick(object sender, RoutedEventArgs e) => Debug.ShowDialog();
 
-        private void OnPlayReplayButton_Click(object sender, RoutedEventArgs e)
+        private void OnPlayReplayButtonClick(object sender, RoutedEventArgs e)
         {
             Process.Start(_properties.RA3Exe, $" -replayGame \"{_properties.CurrentReplay}\"  ");
         }
 
-        private async void OnFixReplayButton_Click(object sender, RoutedEventArgs e)
+        private async void OnFixReplayButtonClick(object sender, RoutedEventArgs e)
         {
             var replay = _properties.CurrentReplay ?? throw new InvalidOperationException("Trying to fix a null replay");
 
@@ -406,7 +406,7 @@ namespace AnotherReplayReader
             await _taskQueue.Enqueue(() => LoadReplays(replay.Path, token), token);
         }
 
-        private async void ReplayFilterBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        private async void OnReplayFilterBoxTextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
             _filterStrings = _replayFilterBox.Text
                 .Split(',', ' ', '，')
diff --git a/Window1.xaml b/Window1.xaml
index 7920edd..2ef0f10 100644
--- a/Window1.xaml
+++ b/Window1.xaml
@@ -15,7 +15,7 @@
         <Button x:Name="_setIPButton" Content="上传" Margin="705,26,12,0" VerticalAlignment="Top" Click="OnClick"/>
         <DataGrid x:Name="_dataGrid"
                   Margin="20,60,12,19"
-                  MouseDoubleClick="DataGrid_MouseDoubleClick"
+                  MouseDoubleClick="OnDataGridMouseDoubleClick"
                   IsReadOnly="True"
                   AutoGenerateColumns="False">
             <DataGrid.Columns>
diff --git a/Window1.xaml.cs b/Window1.xaml.cs
index 7049328..b9ed94e 100644
--- a/Window1.xaml.cs
+++ b/Window1.xaml.cs
@@ -133,7 +133,7 @@ namespace AnotherReplayReader
             await Display(ipText, idText);
         }
 
-        private void DataGrid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        private void OnDataGridMouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
 
         }