diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
index 9a90bfd80026a..87b2eb06766a5 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
@@ -125,6 +125,15 @@ internal static string Active {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add a naming rule.
+        /// </summary>
+        internal static string Add_a_naming_rule {
+            get {
+                return ResourceManager.GetString("Add_a_naming_rule", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Add a reference to &apos;{0}&apos;.
         /// </summary>
@@ -134,6 +143,24 @@ internal static string Add_a_reference_to_0 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add a symbol specification.
+        /// </summary>
+        internal static string Add_a_symbol_specification {
+            get {
+                return ResourceManager.GetString("Add_a_symbol_specification", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add item.
+        /// </summary>
+        internal static string Add_item {
+            get {
+                return ResourceManager.GetString("Add_item", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Add to _existing file.
         /// </summary>
@@ -559,6 +586,15 @@ internal static string DocumentPath_is_illegal {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit item.
+        /// </summary>
+        internal static string Edit_item {
+            get {
+                return ResourceManager.GetString("Edit_item", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Element is not valid..
         /// </summary>
@@ -1724,6 +1760,24 @@ internal static string Remove_0 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remove item.
+        /// </summary>
+        internal static string Remove_item {
+            get {
+                return ResourceManager.GetString("Remove_item", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove naming rule.
+        /// </summary>
+        internal static string Remove_naming_rule {
+            get {
+                return ResourceManager.GetString("Remove_naming_rule", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove suppressions.
         /// </summary>
@@ -1733,6 +1787,15 @@ internal static string Remove_suppressions {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remove symbol specification.
+        /// </summary>
+        internal static string Remove_symbol_specification {
+            get {
+                return ResourceManager.GetString("Remove_symbol_specification", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reorder.
         /// </summary>
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index d3cd253b098d0..05cd892bf26c6 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -876,4 +876,25 @@ Additional information: {1}</value>
   <data name="Unfortunately_a_process_used_by_Visual_Studio_has_encountered_an_unrecoverable_error_We_recommend_saving_your_work_and_then_closing_and_restarting_Visual Studio" xml:space="preserve">
     <value>Unfortunately, a process used by Visual Studio has encountered an unrecoverable error.  We recommend saving your work, and then closing and restarting Visual Studio.</value>
   </data>
+  <data name="Add_a_symbol_specification" xml:space="preserve">
+    <value>Add a symbol specification</value>
+  </data>
+  <data name="Remove_symbol_specification" xml:space="preserve">
+    <value>Remove symbol specification</value>
+  </data>
+  <data name="Add_item" xml:space="preserve">
+    <value>Add item</value>
+  </data>
+  <data name="Edit_item" xml:space="preserve">
+    <value>Edit item</value>
+  </data>
+  <data name="Remove_item" xml:space="preserve">
+    <value>Remove item</value>
+  </data>
+  <data name="Add_a_naming_rule" xml:space="preserve">
+    <value>Add a naming rule</value>
+  </data>
+  <data name="Remove_naming_rule" xml:space="preserve">
+    <value>Remove naming rule</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml
index ac8967b60de34..74ddea86863e7 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml
@@ -131,6 +131,7 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Click="EditButton_Click" Height="Auto" Width="Auto" Margin="5, 0, 0, 0"
+                                    AutomationProperties.Name="{Binding ElementName=dialog, Path=EditButtonAutomationText}"
                                     VerticalContentAlignment="Center"
                                     HorizontalContentAlignment="Center"
                                     HorizontalAlignment="Center"
@@ -149,6 +150,7 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Click="RemoveButton_Click"  Height="Auto" Width="Auto" Margin="5, 0, 0, 0"
+                                    AutomationProperties.Name="{Binding ElementName=dialog, Path=RemoveButtonAutomationText}"
                                     VerticalContentAlignment="Center"
                                     HorizontalContentAlignment="Center"
                                     HorizontalAlignment="Center"
@@ -173,7 +175,7 @@
                        Grid.Row="1"
                         DockPanel.Dock="Left"
                         Click="AddButton_Click" 
-                        AutomationProperties.Name="{Binding AddItemAutomationText}"
+                        AutomationProperties.Name="{Binding ElementName=dialog, Path=AddItemAutomationText}"
                         AutomationProperties.AutomationId="Add"
                         Height="24" Width="24" 
                         Margin="0 7 0 0">
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml.cs b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml.cs
index aea8fc23b7e6e..e2106e3d915f3 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml.cs
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/ManageNamingStylesInfoDialog.xaml.cs
@@ -17,6 +17,9 @@ internal partial class ManageNamingStylesInfoDialog : DialogWindow
         public string OK => ServicesVSResources.OK;
         public string Cancel => ServicesVSResources.Cancel;
         public string CannotBeDeletedExplanation => ServicesVSResources.This_item_cannot_be_deleted_because_it_is_used_by_an_existing_Naming_Rule;
+        public string AddItemAutomationText => ServicesVSResources.Add_item;
+        public string EditButtonAutomationText => ServicesVSResources.Edit_item;
+        public string RemoveButtonAutomationText => ServicesVSResources.Remove_item;
 
         internal ManageNamingStylesInfoDialog(IManageNamingStylesInfoDialogViewModel viewModel)
         {
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
index 1599e9270914f..e41010d1dbbd6 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml
@@ -159,7 +159,8 @@
                                 SelectedItem="{Binding SelectedSpecification, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
                                 VerticalContentAlignment="Center"
                                 HorizontalContentAlignment="Left"
-                                ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}">
+                                ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}"
+                                AutomationProperties.Name="{x:Static style:NamingStyleOptionPageControl.SymbolSpecificationAutomationText}">
                                 <ComboBox.ItemContainerStyle>
                                     <Style TargetType="ComboBoxItem">
                                         <Setter Property="AutomationProperties.Name" Value="{Binding Name}" />
@@ -182,7 +183,8 @@
                                     SelectedItem="{Binding SelectedStyle, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
                                     VerticalContentAlignment="Center"
                                     HorizontalContentAlignment="Left"
-                                    ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}">
+                                    ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}"
+                                    AutomationProperties.Name="{x:Static style:NamingStyleOptionPageControl.NamingStyleAutomationText}">
                                 <ComboBox.ItemContainerStyle>
                                     <Style TargetType="ComboBoxItem">
                                         <Setter Property="AutomationProperties.Name" Value="{Binding Name}" />
@@ -205,7 +207,8 @@
                                     Visibility="{Binding NotificationsAvailable, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
                                     VerticalContentAlignment="Center"
                                     HorizontalContentAlignment="Left"
-                                    ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}">
+                                    ToolTip="{Binding Path=SelectedItem.Name, RelativeSource={RelativeSource Self}}"
+                                    AutomationProperties.Name="{x:Static style:NamingStyleOptionPageControl.SeverityAutomationText}">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>
@@ -244,7 +247,7 @@
                                     HorizontalContentAlignment="Center"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    AutomationProperties.Name="{Binding RemoveAutomationText}">
+                                    AutomationProperties.Name="{x:Static style:NamingStyleOptionPageControl.RemoveAutomationText}">
                                 <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.DeleteListItem}" />
                             </Button>
                         </DataTemplate>
@@ -258,7 +261,7 @@
                         Margin="7">
                 <Button Name="AddButton" 
                         Click="AddButton_Click" 
-                        AutomationProperties.Name="{Binding AddRuleAutomationText}"
+                        AutomationProperties.Name="{x:Static style:NamingStyleOptionPageControl.AddRuleAutomationText}"
                         AutomationProperties.AutomationId="Add"
                         Height="24" Width="24"
                         Margin="0 0 0 0">
diff --git a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml.cs b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml.cs
index abbc3139a9a2b..5ed56d26a241f 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml.cs
+++ b/src/VisualStudio/Core/Impl/Options/Style/NamingPreferences/NamingStyleOptionPageControl.xaml.cs
@@ -24,6 +24,11 @@ internal partial class NamingStyleOptionPageControl : AbstractOptionPageControl
         public static string RequiredStyleHeader => ServicesVSResources.Required_Style;
         public static string SeverityHeader => ServicesVSResources.Severity;
         public static string ExplanatoryText => ServicesVSResources.For_a_given_symbol_only_the_topmost_rule_with_a_matching_Specification_will_be_applied_Violation_of_that_rules_Required_Style_will_be_reported_at_the_chosen_Severity_level;
+        public static string AddRuleAutomationText => ServicesVSResources.Add_a_naming_rule;
+        public static string RemoveAutomationText => ServicesVSResources.Remove_naming_rule;
+        public static string SymbolSpecificationAutomationText => ServicesVSResources.Symbol_Specification;
+        public static string NamingStyleAutomationText => ServicesVSResources.Naming_Style;
+        public static string SeverityAutomationText => ServicesVSResources.Severity;
 
         private NamingStyleOptionPageViewModel _viewModel;
         private readonly string _languageName;