diff --git a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
index db59dbdb4a..fb27feb521 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePicker.cs
@@ -15,14 +15,14 @@ namespace Avalonia.Controls
     /// A control to allow the user to select a date
     /// </summary>
     [TemplatePart("PART_ButtonContentGrid", typeof(Grid))]
-    [TemplatePart("PART_DayText",           typeof(TextBlock))]
+    [TemplatePart("PART_DayTextBlock",      typeof(TextBlock))]
     [TemplatePart("PART_FirstSpacer",       typeof(Rectangle))]
     [TemplatePart("PART_FlyoutButton",      typeof(Button))]
-    [TemplatePart("PART_MonthText",         typeof(TextBlock))]
+    [TemplatePart("PART_MonthTextBlock",    typeof(TextBlock))]
     [TemplatePart("PART_PickerPresenter",   typeof(DatePickerPresenter))]
     [TemplatePart("PART_Popup",             typeof(Popup))]
     [TemplatePart("PART_SecondSpacer",      typeof(Rectangle))]
-    [TemplatePart("PART_YearText",          typeof(TextBlock))]
+    [TemplatePart("PART_YearTextBlock",     typeof(TextBlock))]
     [PseudoClasses(":hasnodate")]
     public class DatePicker : TemplatedControl
     {
@@ -281,9 +281,9 @@ namespace Avalonia.Controls
 
             base.OnApplyTemplate(e);
             _flyoutButton = e.NameScope.Find<Button>("PART_FlyoutButton");
-            _dayText = e.NameScope.Find<TextBlock>("PART_DayText");
-            _monthText = e.NameScope.Find<TextBlock>("PART_MonthText");
-            _yearText = e.NameScope.Find<TextBlock>("PART_YearText");
+            _dayText = e.NameScope.Find<TextBlock>("PART_DayTextBlock");
+            _monthText = e.NameScope.Find<TextBlock>("PART_MonthTextBlock");
+            _yearText = e.NameScope.Find<TextBlock>("PART_YearTextBlock");
             _container = e.NameScope.Find<Grid>("PART_ButtonContentGrid");
             _spacer1 = e.NameScope.Find<Rectangle>("PART_FirstSpacer");
             _spacer2 = e.NameScope.Find<Rectangle>("PART_SecondSpacer");
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index ea9474762c..6eb62bcd33 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -116,17 +116,17 @@
                     VerticalAlignment="Stretch"
                     TemplatedControl.IsTemplateFocusTarget="True">
               <Grid Name="PART_ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
-                <TextBlock Name="PART_DayText" Text="day" HorizontalAlignment="Center"
+                <TextBlock Name="PART_DayTextBlock" Text="day" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
                            FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="PART_MonthText" Text="month" TextAlignment="Left"
+                <TextBlock Name="PART_MonthTextBlock" Text="month" TextAlignment="Left"
                            Padding="{DynamicResource DatePickerHostMonthPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
                            FontSize="{TemplateBinding FontSize}"/>
-                <TextBlock Name="PART_YearText" Text="year" HorizontalAlignment="Center"
+                <TextBlock Name="PART_YearTextBlock" Text="year" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontWeight="{TemplateBinding FontWeight}"
diff --git a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
index af35ac57af..317a27435a 100644
--- a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
@@ -118,21 +118,21 @@
                     Theme="{StaticResource SimpleDatePickerFlyoutButton}">
               <Grid Name="PART_ButtonContentGrid"
                     ColumnDefinitions="78*,Auto,132*,Auto,78*">
-                <TextBlock Name="PART_DayText"
+                <TextBlock Name="PART_DayTextBlock"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            HorizontalAlignment="Center"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontSize="{TemplateBinding FontSize}"
                            FontWeight="{TemplateBinding FontWeight}"
                            Text="day" />
-                <TextBlock Name="PART_MonthText"
+                <TextBlock Name="PART_MonthTextBlock"
                            Padding="{DynamicResource DatePickerHostMonthPadding}"
                            FontFamily="{TemplateBinding FontFamily}"
                            FontSize="{TemplateBinding FontSize}"
                            FontWeight="{TemplateBinding FontWeight}"
                            Text="month"
                            TextAlignment="Left" />
-                <TextBlock Name="PART_YearText"
+                <TextBlock Name="PART_YearTextBlock"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            HorizontalAlignment="Center"
                            FontFamily="{TemplateBinding FontFamily}"