From c5381f7f025a3e5d2eb88c994e1c53b461de7f30 Mon Sep 17 00:00:00 2001
From: Lance McCarthy <lance.mccarthy@progress.com>
Date: Thu, 4 Apr 2019 16:43:55 -0400
Subject: [PATCH] Completed View (Calculator.xaml)

Completed View (CalculatorProgrammerDisplayBoard)

Completed View (CalculatorProgrammerOperators)

Completed View (CalculatorProgrammerRadixOperators.xaml)

Completed View (CaclulatorScientificAngleButtons)

Completed View (CaclulatorScientificOperators.xaml)

Completed View (CalculatorStandardOperators)

Completed View (HistoryList)

Completed View (MainPage)

Completed View (NumberPad)

Completed View (UnitConverter)

Cleared all remaining camel-case x:Names
---
 src/Calculator/App.xaml                       | 196 +++++++++-
 src/Calculator/Controls/CalculationResult.cpp |  10 +-
 src/Calculator/Controls/OverflowTextBlock.cpp |  10 +-
 src/Calculator/Views/Calculator.xaml          | 123 +++++-
 src/Calculator/Views/Calculator.xaml.cpp      |   6 +-
 .../CalculatorProgrammerDisplayPanel.xaml     |  20 +-
 .../CalculatorProgrammerDisplayPanel.xaml.cpp |  24 +-
 .../Views/CalculatorProgrammerOperators.xaml  |  10 +-
 .../CalculatorProgrammerOperators.xaml.cpp    |   8 +-
 .../CalculatorProgrammerRadixOperators.xaml   | 138 +++----
 ...alculatorProgrammerRadixOperators.xaml.cpp |  22 +-
 .../CalculatorScientificAngleButtons.xaml     |  30 +-
 .../CalculatorScientificAngleButtons.xaml.cpp |  18 +-
 .../Views/CalculatorScientificOperators.xaml  | 358 +++++++++---------
 .../CalculatorScientificOperators.xaml.cpp    |   8 +-
 .../Views/CalculatorStandardOperators.xaml    | 246 ++++++------
 src/Calculator/Views/HistoryList.xaml         |   4 +-
 src/Calculator/Views/MainPage.xaml            |  10 +-
 src/Calculator/Views/NumberPad.xaml           |  24 +-
 src/Calculator/Views/NumberPad.xaml.cpp       |  62 +--
 src/Calculator/Views/UnitConverter.xaml       |  38 +-
 src/Calculator/Views/UnitConverter.xaml.cpp   |   4 +-
 22 files changed, 825 insertions(+), 544 deletions(-)

diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index cec835fba..c8ddc1f83 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -356,7 +356,10 @@
                 <Setter Property="ZoomMode" Value="Disabled"/>
             </Style>
 
+<<<<<<< HEAD
             <Style x:Key="CalculationResultStyle" TargetType="Controls:CalculationResult">
+=======
+            <Style x:Key="CalculationResultStyleL" TargetType="Controls:CalculationResult">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -368,7 +371,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Controls:CalculationResult">
-                            <Grid x:Name="border" Background="{TemplateBinding Background}">
+                            <Grid x:Name="Border" Background="{TemplateBinding Background}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="12"/>
                                     <ColumnDefinition/>
@@ -378,19 +381,19 @@
                                     <VisualStateGroup x:Name="ActiveStates">
                                         <VisualState x:Name="Active">
                                             <VisualState.Setters>
-                                                <Setter Target="normalOutput.FontWeight" Value="SemiBold"/>
-                                                <Setter Target="normalOutput.IsTextSelectionEnabled" Value="True"/>
+                                                <Setter Target="NormalOutput.FontWeight" Value="SemiBold"/>
+                                                <Setter Target="NormalOutput.IsTextSelectionEnabled" Value="True"/>
                                             </VisualState.Setters>
                                         </VisualState>
                                         <VisualState x:Name="Normal"/>
                                     </VisualStateGroup>
                                 </VisualStateManager.VisualStateGroups>
-                                <ScrollViewer x:Name="textContainer"
+                                <ScrollViewer x:Name="TextContainer"
                                               Grid.Column="1"
                                               Padding="0,0,0,0"
                                               Style="{ThemeResource ResultsScrollerSnapped}"
                                               AutomationProperties.AccessibilityView="Raw">
-                                    <TextBlock x:Name="normalOutput"
+                                    <TextBlock x:Name="NormalOutput"
                                                Margin="{TemplateBinding DisplayMargin}"
                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -402,7 +405,7 @@
                                                TextAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                TextWrapping="NoWrap"/>
                                 </ScrollViewer>
-                                <HyperlinkButton x:Name="scrollLeft"
+                                <HyperlinkButton x:Name="ScrollLeft"
                                                  Grid.Column="0"
                                                  Width="20"
                                                  MinWidth="20"
@@ -415,12 +418,12 @@
                                                  Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                  BorderThickness="0"
                                                  Visibility="Collapsed">
-                                    <FontIcon x:Name="scrollLeftText"
+                                    <FontIcon x:Name="ScrollLeftText"
                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                               FontSize="12"
                                               Glyph="&#xE26C;"/>
                                 </HyperlinkButton>
-                                <HyperlinkButton x:Name="scrollRight"
+                                <HyperlinkButton x:Name="ScrollRight"
                                                  Grid.Column="2"
                                                  Width="20"
                                                  MinWidth="20"
@@ -433,7 +436,182 @@
                                                  Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
                                                  BorderThickness="0"
                                                  Visibility="Collapsed">
-                                    <FontIcon x:Name="scrollRightText"
+                                    <FontIcon x:Name="ScrollRightText"
+                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                              FontSize="12"
+                                              Glyph="&#xE26B;"/>
+                                </HyperlinkButton>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="CalculationResultStyleM" TargetType="Controls:CalculationResult">
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="HorizontalContentAlignment" Value="Right"/>
+                <Setter Property="VerticalContentAlignment" Value="Top"/>
+                <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
+                <Setter Property="UseSystemFocusVisuals" Value="True"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Controls:CalculationResult">
+                            <Grid x:Name="Border" Background="{TemplateBinding Background}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="12"/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="12"/>
+                                </Grid.ColumnDefinitions>
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="ActiveStates">
+                                        <VisualState x:Name="Active">
+                                            <VisualState.Setters>
+                                                <Setter Target="NormalOutput.IsTextSelectionEnabled" Value="True"/>
+                                                <Setter Target="NormalOutput.FontWeight" Value="SemiBold"/>
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="Normal"/>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                                <ScrollViewer x:Name="TextContainer"
+                                              Grid.Column="1"
+                                              Padding="0,0,0,0"
+                                              Style="{ThemeResource ResultsScrollerSnapped}"
+                                              AutomationProperties.AccessibilityView="Raw">
+                                    <TextBlock x:Name="NormalOutput"
+                                               Margin="{TemplateBinding DisplayMargin}"
+                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontWeight="Light"
+                                               AutomationProperties.AccessibilityView="Raw"
+                                               Text="{TemplateBinding DisplayValue}"
+                                               TextAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                               TextWrapping="NoWrap"/>
+                                </ScrollViewer>
+                                <HyperlinkButton x:Name="ScrollLeft"
+                                                 Grid.Column="0"
+                                                 Width="20"
+                                                 MinWidth="20"
+                                                 MinHeight="24"
+                                                 Margin="-4,0,-4,0"
+                                                 Padding="0,-3,0,4"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
+                                                 BorderThickness="0"
+                                                 Visibility="Collapsed">
+                                    <FontIcon x:Name="ScrollLeftText"
+                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                              FontSize="12"
+                                              Glyph="&#xE26C;"/>
+                                </HyperlinkButton>
+                                <HyperlinkButton x:Name="ScrollRight"
+                                                 Grid.Column="2"
+                                                 Width="20"
+                                                 MinWidth="20"
+                                                 MinHeight="24"
+                                                 Margin="-4,0,-4,0"
+                                                 Padding="0,-3,0,4"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
+                                                 BorderThickness="0"
+                                                 Visibility="Collapsed">
+                                    <FontIcon x:Name="ScrollRightText"
+                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                              FontSize="12"
+                                              Glyph="&#xE26B;"/>
+                                </HyperlinkButton>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="CalculationResultStyleS" TargetType="Controls:CalculationResult">
+>>>>>>> f6848a5... Completed View (Calculator.xaml)
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="HorizontalContentAlignment" Value="Right"/>
+                <Setter Property="VerticalContentAlignment" Value="Top"/>
+                <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
+                <Setter Property="UseSystemFocusVisuals" Value="True"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Controls:CalculationResult">
+                            <Grid x:Name="Border" Background="{TemplateBinding Background}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="12"/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="12"/>
+                                </Grid.ColumnDefinitions>
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="ActiveStates">
+                                        <VisualState x:Name="Active">
+                                            <VisualState.Setters>
+                                                <Setter Target="NormalOutput.FontWeight" Value="SemiBold"/>
+                                                <Setter Target="NormalOutput.IsTextSelectionEnabled" Value="True"/>
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="Normal"/>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                                <ScrollViewer x:Name="TextContainer"
+                                              Grid.Column="1"
+                                              Padding="0,0,0,0"
+                                              Style="{ThemeResource ResultsScrollerSnapped}"
+                                              AutomationProperties.AccessibilityView="Raw">
+                                    <TextBlock x:Name="NormalOutput"
+                                               Margin="{TemplateBinding DisplayMargin}"
+                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                               Foreground="{TemplateBinding Foreground}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontWeight="Light"
+                                               AutomationProperties.AccessibilityView="Raw"
+                                               Text="{TemplateBinding DisplayValue}"
+                                               TextAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                               TextWrapping="NoWrap"/>
+                                </ScrollViewer>
+                                <HyperlinkButton x:Name="ScrollLeft"
+                                                 Grid.Column="0"
+                                                 Width="20"
+                                                 MinWidth="20"
+                                                 MinHeight="24"
+                                                 Margin="-4,0,-4,0"
+                                                 Padding="0,-3,0,4"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
+                                                 BorderThickness="0"
+                                                 Visibility="Collapsed">
+                                    <FontIcon x:Name="ScrollLeftText"
+                                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                              FontSize="12"
+                                              Glyph="&#xE26C;"/>
+                                </HyperlinkButton>
+                                <HyperlinkButton x:Name="ScrollRight"
+                                                 Grid.Column="2"
+                                                 Width="20"
+                                                 MinWidth="20"
+                                                 MinHeight="24"
+                                                 Margin="-4,0,-4,0"
+                                                 Padding="0,-3,0,4"
+                                                 VerticalAlignment="Top"
+                                                 HorizontalContentAlignment="Center"
+                                                 VerticalContentAlignment="Center"
+                                                 Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
+                                                 BorderThickness="0"
+                                                 Visibility="Collapsed">
+                                    <FontIcon x:Name="ScrollRightText"
                                               FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                               FontSize="12"
                                               Glyph="&#xE26B;"/>
diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp
index 76bb8e057..608bf07c0 100644
--- a/src/Calculator/Controls/CalculationResult.cpp
+++ b/src/Calculator/Controls/CalculationResult.cpp
@@ -72,7 +72,7 @@ void CalculationResult::OnApplyTemplate()
     {
         m_textContainer->LayoutUpdated -= m_textContainerLayoutChangedToken;
     }
-    m_textContainer = dynamic_cast<ScrollViewer^>(GetTemplateChild("textContainer"));
+    m_textContainer = dynamic_cast<ScrollViewer^>(GetTemplateChild("TextContainer"));
     if (m_textContainer)
     {
         m_textContainer->SizeChanged += ref new SizeChangedEventHandler(this, &CalculationResult::TextContainerSizeChanged);
@@ -81,9 +81,9 @@ void CalculationResult::OnApplyTemplate()
         m_textContainerLayoutChangedToken = m_textContainer->LayoutUpdated += ref new EventHandler<Object^>(this, &CalculationResult::OnTextContainerLayoutUpdated);
 
         m_textContainer->ChangeView(m_textContainer->ExtentWidth - m_textContainer->ViewportWidth,nullptr,nullptr);
-        m_scrollLeft = dynamic_cast<HyperlinkButton^>(GetTemplateChild("scrollLeft"));
-        m_scrollRight = dynamic_cast<HyperlinkButton^>(GetTemplateChild("scrollRight"));
-        auto borderContainer = dynamic_cast<UIElement^>(GetTemplateChild("border"));
+        m_scrollLeft = dynamic_cast<HyperlinkButton^>(GetTemplateChild("ScrollLeft"));
+        m_scrollRight = dynamic_cast<HyperlinkButton^>(GetTemplateChild("ScrollRight"));
+        auto borderContainer = dynamic_cast<UIElement^>(GetTemplateChild("Border"));
         if (m_scrollLeft && m_scrollRight)
         {
             m_scrollLeft->Click += ref new RoutedEventHandler(this, &CalculationResult::OnScrollClick);
@@ -91,7 +91,7 @@ void CalculationResult::OnApplyTemplate()
             borderContainer->PointerEntered += ref new PointerEventHandler(this, &CalculationResult::OnPointerEntered);
             borderContainer->PointerExited += ref new PointerEventHandler(this, &CalculationResult::OnPointerExited);
         }
-        m_textBlock = dynamic_cast<TextBlock^>(m_textContainer->FindName("normalOutput"));
+        m_textBlock = dynamic_cast<TextBlock^>(m_textContainer->FindName("NormalOutput"));
         if (m_textBlock)
         {
             m_textBlock->Visibility = ::Visibility::Visible;
diff --git a/src/Calculator/Controls/OverflowTextBlock.cpp b/src/Calculator/Controls/OverflowTextBlock.cpp
index 85baebc42..eff43e029 100644
--- a/src/Calculator/Controls/OverflowTextBlock.cpp
+++ b/src/Calculator/Controls/OverflowTextBlock.cpp
@@ -32,11 +32,11 @@ void OverflowTextBlock::OnApplyTemplate()
 {
     assert(((m_scrollLeft == nullptr) && (m_scrollRight == nullptr)) || ((m_scrollLeft != nullptr) && (m_scrollRight != nullptr)));
 
-    m_expressionContainer = safe_cast<ScrollViewer^>(GetTemplateChild("expressionContainer"));
+    m_expressionContainer = safe_cast<ScrollViewer^>(GetTemplateChild("ExpressionContainer"));
     m_expressionContainer->ChangeView(m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth, nullptr, nullptr);
 
-    m_scrollLeft = safe_cast<Button^>(GetTemplateChild("scrollLeft"));
-    m_scrollRight = safe_cast<Button^>(GetTemplateChild("scrollRight"));
+    m_scrollLeft = safe_cast<Button^>(GetTemplateChild("ScrollLeft"));
+    m_scrollRight = safe_cast<Button^>(GetTemplateChild("ScrollRight"));
 
     m_scrollLeftClickEventToken = m_scrollLeft->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
     m_scrollRightClickEventToken = m_scrollRight->Click += ref new RoutedEventHandler(this, &OverflowTextBlock::OnScrollClick);
@@ -44,7 +44,7 @@ void OverflowTextBlock::OnApplyTemplate()
     m_scrollingLeft = false;
     m_scrollingRight = false;
 
-    auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder"));
+    auto borderContainer = safe_cast<Border^>(GetTemplateChild("ExpressionBorder"));
     m_pointerEnteredEventToken = borderContainer->PointerEntered += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerEntered);
     m_pointerExitedEventToken = borderContainer->PointerExited += ref new PointerEventHandler(this, &OverflowTextBlock::OnPointerExited);
 
@@ -199,7 +199,7 @@ void OverflowTextBlock::UnregisterEventHandlers()
         m_scrollRight->Click -= m_scrollRightClickEventToken;
     }
 
-    auto borderContainer = safe_cast<Border^>(GetTemplateChild("expressionborder"));
+    auto borderContainer = safe_cast<Border^>(GetTemplateChild("ExpressionBorder"));
 
     // Adding an extra check, in case the returned template is null
     if (borderContainer != nullptr)
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index c58bcdfbe..186ebd3ae 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -36,20 +36,123 @@
         </DataTemplate>
 
         <!-- TextBox Styles -->
+<<<<<<< HEAD
        
+=======
+
+        <Style x:Key="OperandTextBoxStyle" TargetType="controls:OperandTextBox">
+            <Setter Property="MinWidth" Value="32"/>
+            <Setter Property="MinHeight" Value="20"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="SelectionHighlightColor" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
+            <Setter Property="FontSize" Value="{ThemeResource BodyFontSize}"/>
+            <Setter Property="IsTextScaleFactorEnabled" Value="False"/>
+            <Setter Property="TextAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="2,0,3,0"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="controls:OperandTextBox">
+                        <Grid x:Name="BackgroundElement" Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Disabled"/>
+                                    <VisualState x:Name="Normal">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentElement.Foreground" Value="{ThemeResource SystemControlForegroundAccentBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="PointerOver">
+                                        <VisualState.Setters>
+                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Focused">
+                                        <VisualState.Setters>
+                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlForegroundChromeWhiteBrush}"/>
+                                            <Setter Target="ContentElement.Foreground" Value="{ThemeResource SystemControlBackgroundChromeBlackHighBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <ScrollViewer x:Name="ContentElement"
+                                          Padding="{TemplateBinding Padding}"
+                                          VerticalAlignment="Center"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          HorizontalScrollBarVisibility="Hidden"
+                                          HorizontalScrollMode="Disabled"
+                                          IsDeferredScrollingEnabled="False"
+                                          IsHorizontalRailEnabled="True"
+                                          IsTabStop="False"
+                                          IsVerticalRailEnabled="False"
+                                          VerticalScrollBarVisibility="Disabled"
+                                          VerticalScrollMode="Disabled"
+                                          ZoomMode="Disabled"/>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="OperatorTextBoxStyle" TargetType="controls:OperatorTextBox">
+            <Setter Property="MinWidth" Value="4"/>
+            <Setter Property="MinHeight" Value="20"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="controls:OperatorTextBox">
+                        <Grid x:Name="BackgroundElement" Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Disabled"/>
+                                    <VisualState x:Name="Normal">
+                                        <VisualState.Setters>
+                                            <Setter Target="TextElement.Foreground" Value="{ThemeResource SystemControlPageTextBaseMediumBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="PointerOver">
+                                        <VisualState.Setters>
+                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlHighlightListAccentLowBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Focused">
+                                        <VisualState.Setters>
+                                            <Setter Target="BackgroundElement.Background" Value="{ThemeResource SystemControlBackgroundAccentBrush}"/>
+                                            <Setter Target="TextElement.Foreground" Value="{ThemeResource SystemControlForegroundChromeWhiteBrush}"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <TextBlock x:Name="TextElement"
+                                       Margin="0,-2,0,2"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center"
+                                       Foreground="{TemplateBinding Foreground}"
+                                       FontSize="16"
+                                       IsHitTestVisible="True"
+                                       IsTextScaleFactorEnabled="False"
+                                       Text="{Binding Token}"
+                                       TextAlignment="Center"/>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+>>>>>>> f6848a5... Completed View (Calculator.xaml)
         <Style TargetType="controls:OverflowTextBlock">
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:OverflowTextBlock">
-                        <Border x:Name="expressionborder" Background="Transparent">
-                            <Grid x:Name="tokenContainer" Background="{TemplateBinding Background}">
+                        <Border x:Name="ExpressionBorder" Background="Transparent">
+                            <Grid x:Name="TokenContainer" Background="{TemplateBinding Background}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="12"/>
                                     <ColumnDefinition/>
                                     <ColumnDefinition Width="12"/>
                                 </Grid.ColumnDefinitions>
-                                <ScrollViewer x:Name="expressionContainer"
+                                <ScrollViewer x:Name="ExpressionContainer"
                                               Grid.Column="1"
                                               Padding="0,0,0,0"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -82,7 +185,7 @@
                                         </ListView.ItemContainerTransitions>
                                     </ListView>
                                 </ScrollViewer>
-                                <Button x:Name="scrollLeft"
+                                <Button x:Name="ScrollLeft"
                                         x:Uid="scrollLeft"
                                         Grid.Column="0"
                                         Margin="-4,3,-4,0"
@@ -91,7 +194,7 @@
                                               FontSize="12"
                                               Glyph="&#xE26C;"/>
                                 </Button>
-                                <Button x:Name="scrollRight"
+                                <Button x:Name="ScrollRight"
                                         x:Uid="scrollRight"
                                         Grid.Column="2"
                                         Margin="0,3,-9,0"
@@ -356,7 +459,7 @@
                         <Setter Target="MemRecall.IsEnabled" Value="False"/>
                         <Setter Target="MemPlus.IsEnabled" Value="False"/>
                         <Setter Target="MemMinus.IsEnabled" Value="False"/>
-                        <Setter Target="memButton.IsEnabled" Value="False"/>
+                        <Setter Target="MemButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                     <Storyboard Completed="OnErrorLayoutCompleted"/>
                 </VisualState>
@@ -383,7 +486,7 @@
                         <Setter Target="M4.MaxWidth" Value="99999"/>
                         <Setter Target="M5.Width" Value="1*"/>
                         <Setter Target="M5.MaxWidth" Value="80"/>
-                        <Setter Target="memButton.(Grid.Column)" Value="5"/>
+                        <Setter Target="MemButton.(Grid.Column)" Value="5"/>
                         <Setter Target="MemoryButton.(Grid.Column)" Value="6"/>
                         <Setter Target="HistoryButton.Visibility" Value="Collapsed"/>
                     </VisualState.Setters>
@@ -443,7 +546,7 @@
                         <Setter Target="MemRecall.Style" Value="{StaticResource CaptionButtonStyle}"/>
                         <Setter Target="MemPlus.Style" Value="{StaticResource CaptionButtonStyle}"/>
                         <Setter Target="MemMinus.Style" Value="{StaticResource CaptionButtonStyle}"/>
-                        <Setter Target="memButton.Style" Value="{StaticResource CaptionButtonStyle}"/>
+                        <Setter Target="MemButton.Style" Value="{StaticResource CaptionButtonStyle}"/>
                         <Setter Target="MemoryButton.MinHeight" Value="0"/>
                     </VisualState.Setters>
                     <Storyboard Completed="OnLayoutStateChanged"/>
@@ -521,7 +624,7 @@
                                         IsInError="{x:Bind Model.IsInError, Mode=OneWay}"
                                         IsOperatorCommand="{x:Bind Model.IsOperatorCommand, Mode=OneWay}"
                                         TabIndex="1"/>
-            <controls:OverflowTextBlock x:Name="expressionText"
+            <controls:OverflowTextBlock x:Name="ExpressionText"
                                         Grid.Row="1"
                                         Margin="6,0,6,0"
                                         VerticalAlignment="Bottom"
@@ -630,7 +733,7 @@
                                            Content="M-"
                                            TabIndex="13"
                                            Visibility="{Binding IsProgrammer, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="memButton"
+                <controls:CalculatorButton x:Name="MemButton"
                                            x:Uid="memButton"
                                            Grid.Column="4"
                                            Style="{StaticResource CaptionButtonStyle}"
diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp
index 30e25c2a5..d21c037ec 100644
--- a/src/Calculator/Views/Calculator.xaml.cpp
+++ b/src/Calculator/Views/Calculator.xaml.cpp
@@ -620,7 +620,7 @@ void Calculator::OnHideMemoryClicked()
 
 void Calculator::EnableMemoryControls(bool enable)
 {
-    memButton->IsEnabled = enable;
+    MemButton->IsEnabled = enable;
     MemMinus->IsEnabled = enable;
     MemPlus->IsEnabled = enable;
     if (!Model->IsMemoryEmpty)
@@ -661,7 +661,7 @@ void Calculator::OnHistoryFlyOutTapped(_In_ Object^ sender, _In_ TappedRoutedEve
 
 void Calculator::expressionContainer_LayoutUpdated(_In_ Object^ sender, _In_ Object^ e)
 {
-    expressionText->UpdateScrollButtons();
+    ExpressionText->UpdateScrollButtons();
 }
 
 bool Calculator::IsValidRegularExpression(std::wstring str)
@@ -700,7 +700,7 @@ void Calculator::DockPanelTapped(_In_ TappedRoutedEventArgs^ e)
 
 void Calculator::UnregisterEventHandlers()
 {
-    expressionText->UnregisterEventHandlers();
+    ExpressionText->UnregisterEventHandlers();
 }
 
 void Calculator::OnErrorLayoutCompleted(_In_ Object^ sender, _In_ Object^ e)
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
index f9ff90862..1f1e443a4 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml
@@ -43,10 +43,10 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="qwordButton.IsEnabled" Value="False"/>
-                        <Setter Target="dwordButton.IsEnabled" Value="False"/>
-                        <Setter Target="wordButton.IsEnabled" Value="False"/>
-                        <Setter Target="byteButton.IsEnabled" Value="False"/>
+                        <Setter Target="QwordButton.IsEnabled" Value="False"/>
+                        <Setter Target="DwordButton.IsEnabled" Value="False"/>
+                        <Setter Target="WordButton.IsEnabled" Value="False"/>
+                        <Setter Target="ByteButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -59,13 +59,13 @@
                 <ColumnDefinition Width="1*" MaxWidth="80"/>
             </Grid.ColumnDefinitions>
 
-            <RadioButton x:Name="fullKeypad"
+            <RadioButton x:Name="FullKeypad"
                          x:Uid="fullKeypad"
                          Style="{StaticResource ProgKeypadRadioButtonStyle}"
                          AutomationProperties.AutomationId="fullKeypad"
                          Content="&#xe75f;"
                          IsChecked="{x:Bind Model.IsBitFlipChecked, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}"/>
-            <RadioButton x:Name="bitFlip"
+            <RadioButton x:Name="BitFlip"
                          x:Uid="bitFlip"
                          Grid.Column="1"
                          Style="{StaticResource ProgKeypadRadioButtonStyle}"
@@ -75,7 +75,7 @@
                          IsChecked="{x:Bind Model.IsBitFlipChecked, Mode=TwoWay}"/>
         </Grid>
 
-        <Button x:Name="qwordButton"
+        <Button x:Name="QwordButton"
                 x:Uid="qwordButton"
                 Grid.Column="0"
                 Grid.ColumnSpan="7"
@@ -84,7 +84,7 @@
                 Command="{x:Bind BitLengthButtonPressed, Mode=OneTime}"
                 CommandParameter="0"
                 Content="QWORD"/>
-        <Button x:Name="dwordButton"
+        <Button x:Name="DwordButton"
                 x:Uid="dwordButton"
                 Grid.Column="0"
                 Grid.ColumnSpan="7"
@@ -94,7 +94,7 @@
                 CommandParameter="1"
                 Content="DWORD"
                 Visibility="Collapsed"/>
-        <Button x:Name="wordButton"
+        <Button x:Name="WordButton"
                 x:Uid="wordButton"
                 Grid.Column="0"
                 Grid.ColumnSpan="7"
@@ -104,7 +104,7 @@
                 CommandParameter="2"
                 Content="WORD"
                 Visibility="Collapsed"/>
-        <Button x:Name="byteButton"
+        <Button x:Name="ByteButton"
                 x:Uid="byteButton"
                 Grid.Column="0"
                 Grid.ColumnSpan="7"
diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
index 935731e86..fb95b9965 100644
--- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp
@@ -36,15 +36,15 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
     TraceLogger::GetInstance().LogBitLengthButtonUsed(ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
     String^ buttonId = parameter->ToString();
 
-    qwordButton->Visibility = ::Visibility::Collapsed;
-    dwordButton->Visibility = ::Visibility::Collapsed;
-    wordButton->Visibility = ::Visibility::Collapsed;
-    byteButton->Visibility = ::Visibility::Collapsed;
+    QwordButton->Visibility = ::Visibility::Collapsed;
+    DwordButton->Visibility = ::Visibility::Collapsed;
+    WordButton->Visibility = ::Visibility::Collapsed;
+    ByteButton->Visibility = ::Visibility::Collapsed;
     if (buttonId == "0")
     {
         Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Dword);
-        dwordButton->Visibility = ::Visibility::Visible;
-        dwordButton->Focus(::FocusState::Programmatic);
+        DwordButton->Visibility = ::Visibility::Visible;
+        DwordButton->Focus(::FocusState::Programmatic);
         Model->IsQwordEnabled = false;
         Model->IsDwordEnabled = true;
         Model->IsWordEnabled = true;
@@ -52,8 +52,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
     else if (buttonId == "1")
     {
         Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Word);
-        wordButton->Visibility = ::Visibility::Visible;
-        wordButton->Focus(::FocusState::Programmatic);
+        WordButton->Visibility = ::Visibility::Visible;
+        WordButton->Focus(::FocusState::Programmatic);
         Model->IsQwordEnabled = false;
         Model->IsDwordEnabled = false;
         Model->IsWordEnabled = true;
@@ -61,8 +61,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
     else if (buttonId == "2")
     {
         Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Byte);
-        byteButton->Visibility = ::Visibility::Visible;
-        byteButton->Focus(::FocusState::Programmatic);
+        ByteButton->Visibility = ::Visibility::Visible;
+        ByteButton->Focus(::FocusState::Programmatic);
         Model->IsQwordEnabled = false;
         Model->IsDwordEnabled = false;
         Model->IsWordEnabled = false;
@@ -70,8 +70,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
     else if (buttonId == "3")
     {
         Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Qword);
-        qwordButton->Visibility = ::Visibility::Visible;
-        qwordButton->Focus(::FocusState::Programmatic);
+        QwordButton->Visibility = ::Visibility::Visible;
+        QwordButton->Focus(::FocusState::Programmatic);
         Model->IsQwordEnabled = true;
         Model->IsDwordEnabled = true;
         Model->IsWordEnabled = true;
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml b/src/Calculator/Views/CalculatorProgrammerOperators.xaml
index 97b216a96..bfd76c68f 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml
@@ -170,7 +170,7 @@
             <RowDefinition Height="1*" MinHeight="0"/>
             <RowDefinition Height="1*" MinHeight="0"/>
             <RowDefinition Height="1*" MinHeight="0"/>
-            <RowDefinition Height="1*" MinHeight="{Binding ActualHeight, ElementName=binaryButton, FallbackValue=16, Mode=OneWay}"/>
+            <RowDefinition Height="1*" MinHeight="{Binding ActualHeight, ElementName=BinaryButton, FallbackValue=16, Mode=OneWay}"/>
             <RowDefinition Height="4"/>
         </Grid.RowDefinitions>
         <VisualStateManager.VisualStateGroups>
@@ -192,7 +192,7 @@
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <controls:RadixButton x:Name="hexButton"
+        <controls:RadixButton x:Name="HexButton"
                               x:Uid="hexButton"
                               HorizontalAlignment="Stretch"
                               Style="{ThemeResource ProgModeRadioButtonStyle}"
@@ -202,7 +202,7 @@
                               Content="{x:Bind Model.HexDisplayValue, Mode=OneWay}"
                               ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"
                               GroupName="BaseConversion"/>
-        <controls:RadixButton x:Name="decimalButton"
+        <controls:RadixButton x:Name="DecimalButton"
                               x:Uid="decimalButton"
                               Grid.Row="1"
                               HorizontalAlignment="Stretch"
@@ -214,7 +214,7 @@
                               ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"
                               GroupName="BaseConversion"
                               IsChecked="true"/>
-        <controls:RadixButton x:Name="octButton"
+        <controls:RadixButton x:Name="OctButton"
                               x:Uid="octButton"
                               Grid.Row="2"
                               HorizontalAlignment="Stretch"
@@ -225,7 +225,7 @@
                               Content="{x:Bind Model.OctalDisplayValue, Mode=OneWay}"
                               ContextFlyout="{StaticResource ProgrammerOperatorsContextMenu}"
                               GroupName="BaseConversion"/>
-        <controls:RadixButton x:Name="binaryButton"
+        <controls:RadixButton x:Name="BinaryButton"
                               x:Uid="binaryButton"
                               Grid.Row="3"
                               HorizontalAlignment="Stretch"
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
index 19b2c0856..a8cd544bf 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp
@@ -78,22 +78,22 @@ void CalculatorProgrammerOperators::SetRadixButton(RADIX_TYPE radixType)
     {
     case RADIX_TYPE::DEC_RADIX:
     {
-        decimalButton->IsChecked = true;
+        DecimalButton->IsChecked = true;
         break;
     }
     case RADIX_TYPE::HEX_RADIX:
     {
-        hexButton->IsChecked = true;
+        HexButton->IsChecked = true;
         break;
     }
     case RADIX_TYPE::OCT_RADIX:
     {
-        octButton->IsChecked = true;
+        OctButton->IsChecked = true;
         break;
     }
     case RADIX_TYPE::BIN_RADIX:
     {
-        binaryButton->IsChecked = true;
+        BinaryButton->IsChecked = true;
         break;
     }
     default:
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
index 06cf0123d..6cd455be9 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -38,26 +38,26 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="rolButton.IsEnabled" Value="False"/>
-                        <Setter Target="rorButton.IsEnabled" Value="False"/>
-                        <Setter Target="lshButton.IsEnabled" Value="False"/>
-                        <Setter Target="rshButton.IsEnabled" Value="False"/>
-                        <Setter Target="orButton.IsEnabled" Value="False"/>
-                        <Setter Target="xorButton.IsEnabled" Value="False"/>
-                        <Setter Target="notButton.IsEnabled" Value="False"/>
-                        <Setter Target="andButton.IsEnabled" Value="False"/>
+                        <Setter Target="RolButton.IsEnabled" Value="False"/>
+                        <Setter Target="RorButton.IsEnabled" Value="False"/>
+                        <Setter Target="LshButton.IsEnabled" Value="False"/>
+                        <Setter Target="RshButton.IsEnabled" Value="False"/>
+                        <Setter Target="OrButton.IsEnabled" Value="False"/>
+                        <Setter Target="XorButton.IsEnabled" Value="False"/>
+                        <Setter Target="NotButton.IsEnabled" Value="False"/>
+                        <Setter Target="AndButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="shiftButton.IsEnabled" Value="False"/>
-                        <Setter Target="modButton.IsEnabled" Value="False"/>
+                        <Setter Target="ShiftButton.IsEnabled" Value="False"/>
+                        <Setter Target="ModButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="divideButton.IsEnabled" Value="False"/>
-                        <Setter Target="multiplyButton.IsEnabled" Value="False"/>
-                        <Setter Target="minusButton.IsEnabled" Value="False"/>
-                        <Setter Target="plusButton.IsEnabled" Value="False"/>
+                        <Setter Target="DivideButton.IsEnabled" Value="False"/>
+                        <Setter Target="MultiplyButton.IsEnabled" Value="False"/>
+                        <Setter Target="MinusButton.IsEnabled" Value="False"/>
+                        <Setter Target="PlusButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="openParenthesisButton.IsEnabled" Value="False"/>
-                        <Setter Target="closeParenthesisButton.IsEnabled" Value="False"/>
-                        <Setter Target="negateButton.IsEnabled" Value="False"/>
+                        <Setter Target="OpenParenthesisButton.IsEnabled" Value="False"/>
+                        <Setter Target="CloseParenthesisButton.IsEnabled" Value="False"/>
+                        <Setter Target="NegateButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -67,21 +67,21 @@
                         <AdaptiveTrigger MinWindowHeight="1366" MinWindowWidth="768"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcOperatorCaptionSize}"/>
 
-                        <Setter Target="aButton.FontSize" Value="{StaticResource TitleFontSize}"/>
-                        <Setter Target="bButton.FontSize" Value="{StaticResource TitleFontSize}"/>
-                        <Setter Target="cButton.FontSize" Value="{StaticResource TitleFontSize}"/>
-                        <Setter Target="dButton.FontSize" Value="{StaticResource TitleFontSize}"/>
-                        <Setter Target="eButton.FontSize" Value="{StaticResource TitleFontSize}"/>
-                        <Setter Target="fButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="AButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="BButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="CButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="DButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="EButton.FontSize" Value="{StaticResource TitleFontSize}"/>
+                        <Setter Target="FButton.FontSize" Value="{StaticResource TitleFontSize}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle24}"/>
                     </VisualState.Setters>
@@ -104,20 +104,20 @@
                         <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="openParenthesisButton.FontSize" Value="12"/>
-                        <Setter Target="openParenthesisButton.Padding" Value="0"/>
-                        <Setter Target="closeParenthesisButton.FontSize" Value="12"/>
-                        <Setter Target="closeParenthesisButton.Padding" Value="0"/>
+                        <Setter Target="OpenParenthesisButton.FontSize" Value="12"/>
+                        <Setter Target="OpenParenthesisButton.Padding" Value="0"/>
+                        <Setter Target="CloseParenthesisButton.FontSize" Value="12"/>
+                        <Setter Target="CloseParenthesisButton.Padding" Value="0"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="aButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="bButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="cButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="dButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="eButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
-                        <Setter Target="fButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="AButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="BButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="CButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="DButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="EButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
+                        <Setter Target="FButton.Style" Value="{StaticResource NumericButtonStyle12}"/>
 
-                        <Setter Target="shiftButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
+                        <Setter Target="ShiftButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -135,7 +135,7 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <controls:CalculatorButton x:Name="rolButton"
+            <controls:CalculatorButton x:Name="RolButton"
                                        x:Uid="rolButton"
                                        Grid.Column="0"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -145,7 +145,7 @@
                                        ButtonId="Rol"
                                        Content="RoL"
                                        Visibility="Collapsed"/>
-            <controls:CalculatorButton x:Name="rorButton"
+            <controls:CalculatorButton x:Name="RorButton"
                                        x:Uid="rorButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -155,7 +155,7 @@
                                        ButtonId="Ror"
                                        Content="RoR"
                                        Visibility="Collapsed"/>
-            <controls:CalculatorButton x:Name="lshButton"
+            <controls:CalculatorButton x:Name="LshButton"
                                        x:Uid="lshButton"
                                        Grid.Column="0"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -163,7 +163,7 @@
                                        AutomationProperties.AutomationId="lshButton"
                                        ButtonId="Lsh"
                                        Content="Lsh"/>
-            <controls:CalculatorButton x:Name="rshButton"
+            <controls:CalculatorButton x:Name="RshButton"
                                        x:Uid="rshButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -171,7 +171,7 @@
                                        AutomationProperties.AutomationId="rshButton"
                                        ButtonId="Rsh"
                                        Content="Rsh"/>
-            <controls:CalculatorButton x:Name="orButton"
+            <controls:CalculatorButton x:Name="OrButton"
                                        x:Uid="orButton"
                                        Grid.Column="2"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -179,7 +179,7 @@
                                        AutomationProperties.AutomationId="orButton"
                                        ButtonId="Or"
                                        Content="Or"/>
-            <controls:CalculatorButton x:Name="xorButton"
+            <controls:CalculatorButton x:Name="XorButton"
                                        x:Uid="xorButton"
                                        Grid.Column="3"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -187,7 +187,7 @@
                                        AutomationProperties.AutomationId="xorButton"
                                        ButtonId="Xor"
                                        Content="Xor"/>
-            <controls:CalculatorButton x:Name="notButton"
+            <controls:CalculatorButton x:Name="NotButton"
                                        x:Uid="notButton"
                                        Grid.Column="4"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -195,7 +195,7 @@
                                        AutomationProperties.AutomationId="notButton"
                                        ButtonId="Not"
                                        Content="Not"/>
-            <controls:CalculatorButton x:Name="andButton"
+            <controls:CalculatorButton x:Name="AndButton"
                                        x:Uid="andButton"
                                        Grid.Column="5"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -205,7 +205,7 @@
                                        Content="And"/>
         </Grid>
 
-        <ToggleButton x:Name="shiftButton"
+        <ToggleButton x:Name="ShiftButton"
                       x:Uid="shiftButton"
                       Grid.Row="1"
                       Grid.Column="1"
@@ -218,7 +218,7 @@
                       Checked="Shift_Clicked"
                       Content="&#xE752;"
                       Unchecked="Shift_Clicked"/>
-        <controls:CalculatorButton x:Name="modButton"
+        <controls:CalculatorButton x:Name="ModButton"
                                    x:Uid="modButton"
                                    Grid.Row="1"
                                    Grid.Column="2"
@@ -240,7 +240,7 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <controls:CalculatorButton x:Name="divideButton"
+            <controls:CalculatorButton x:Name="DivideButton"
                                        x:Uid="divideButton"
                                        Grid.Row="0"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -248,7 +248,7 @@
                                        AutomationProperties.AutomationId="divideButton"
                                        ButtonId="Divide"
                                        Content="&#xE94A;"/>
-            <controls:CalculatorButton x:Name="multiplyButton"
+            <controls:CalculatorButton x:Name="MultiplyButton"
                                        x:Uid="multiplyButton"
                                        Grid.Row="1"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -256,7 +256,7 @@
                                        AutomationProperties.AutomationId="multiplyButton"
                                        ButtonId="Multiply"
                                        Content="&#xE947;"/>
-            <controls:CalculatorButton x:Name="minusButton"
+            <controls:CalculatorButton x:Name="MinusButton"
                                        x:Uid="minusButton"
                                        Grid.Row="2"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -264,7 +264,7 @@
                                        AutomationProperties.AutomationId="minusButton"
                                        ButtonId="Subtract"
                                        Content="&#xE949;"/>
-            <controls:CalculatorButton x:Name="plusButton"
+            <controls:CalculatorButton x:Name="PlusButton"
                                        x:Uid="plusButton"
                                        Grid.Row="3"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -272,7 +272,7 @@
                                        AutomationProperties.AutomationId="plusButton"
                                        ButtonId="Add"
                                        Content="&#xE948;"/>
-            <controls:CalculatorButton x:Name="equalButton"
+            <controls:CalculatorButton x:Name="EqualButton"
                                        x:Uid="equalButton"
                                        Grid.Row="4"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -292,7 +292,7 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <controls:CalculatorButton x:Name="clearEntryButton"
+            <controls:CalculatorButton x:Name="ClearEntryButton"
                                        x:Uid="clearEntryButton"
                                        Grid.Column="0"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -301,7 +301,7 @@
                                        AutomationProperties.AutomationId="clearEntryButton"
                                        ButtonId="ClearEntry"
                                        Content="CE"/>
-            <controls:CalculatorButton x:Name="clearButton"
+            <controls:CalculatorButton x:Name="ClearButton"
                                        x:Uid="clearButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -310,7 +310,7 @@
                                        AutomationProperties.AutomationId="clearButton"
                                        ButtonId="Clear"
                                        Content="C"/>
-            <controls:CalculatorButton x:Name="backSpaceButton"
+            <controls:CalculatorButton x:Name="BackSpaceButton"
                                        x:Uid="backSpaceButton"
                                        Grid.Column="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -346,7 +346,7 @@
                              Grid.ColumnSpan="3"
                              ButtonStyle="{StaticResource NumericButtonStyle18}"/>
 
-            <controls:CalculatorButton x:Name="aButton"
+            <controls:CalculatorButton x:Name="AButton"
                                        x:Uid="aButton"
                                        Grid.Row="0"
                                        Grid.Column="0"
@@ -355,7 +355,7 @@
                                        ButtonId="A"
                                        Content="A"
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
-            <controls:CalculatorButton x:Name="bButton"
+            <controls:CalculatorButton x:Name="BButton"
                                        x:Uid="bButton"
                                        Grid.Row="0"
                                        Grid.Column="1"
@@ -364,7 +364,7 @@
                                        ButtonId="B"
                                        Content="B"
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
-            <controls:CalculatorButton x:Name="cButton"
+            <controls:CalculatorButton x:Name="CButton"
                                        x:Uid="cButton"
                                        Grid.Row="1"
                                        Grid.Column="0"
@@ -373,7 +373,7 @@
                                        ButtonId="C"
                                        Content="C"
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
-            <controls:CalculatorButton x:Name="dButton"
+            <controls:CalculatorButton x:Name="DButton"
                                        x:Uid="dButton"
                                        Grid.Row="1"
                                        Grid.Column="1"
@@ -382,7 +382,7 @@
                                        ButtonId="D"
                                        Content="D"
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
-            <controls:CalculatorButton x:Name="eButton"
+            <controls:CalculatorButton x:Name="EButton"
                                        x:Uid="eButton"
                                        Grid.Row="2"
                                        Grid.Column="0"
@@ -391,7 +391,7 @@
                                        ButtonId="E"
                                        Content="E"
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
-            <controls:CalculatorButton x:Name="fButton"
+            <controls:CalculatorButton x:Name="FButton"
                                        x:Uid="fButton"
                                        Grid.Row="2"
                                        Grid.Column="1"
@@ -402,7 +402,7 @@
                                        IsEnabled="{x:Bind Model.AreHEXButtonsEnabled, Mode=OneWay}"/>
         </Grid>
 
-        <controls:CalculatorButton x:Name="openParenthesisButton"
+        <controls:CalculatorButton x:Name="OpenParenthesisButton"
                                    x:Uid="openParenthesisButton"
                                    Grid.Row="5"
                                    Grid.Column="1"
@@ -413,7 +413,7 @@
                                    Content="("
                                    GotFocus="OpenParenthesisButton_GotFocus"
                                    Tag="{x:Bind ParenthesisCountToString(Model.OpenParenthesisCount), Mode=OneWay}"/>
-        <controls:CalculatorButton x:Name="closeParenthesisButton"
+        <controls:CalculatorButton x:Name="CloseParenthesisButton"
                                    x:Uid="closeParenthesisButton"
                                    Grid.Row="5"
                                    Grid.Column="2"
@@ -422,7 +422,7 @@
                                    AutomationProperties.AutomationId="closeParenthesisButton"
                                    ButtonId="CloseParenthesis"
                                    Content=")"/>
-        <controls:CalculatorButton x:Name="negateButton"
+        <controls:CalculatorButton x:Name="NegateButton"
                                    x:Uid="negateButton"
                                    Grid.Row="5"
                                    Grid.Column="3"
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
index dd648956e..c8ca13209 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
@@ -47,25 +47,25 @@ void CalculatorProgrammerRadixOperators::Shift_Clicked(Platform::Object^ sender,
     auto scvm = safe_cast<StandardCalculatorViewModel^>(this->DataContext);
     scvm->IsShiftProgrammerChecked = isShiftChecked;
 
-    if (rolButton == nullptr)
+    if (RolButton == nullptr)
     {
-        FindName("rolButton");
-        FindName("rorButton");
+        FindName("RolButton");
+        FindName("RorButton");
     }
 
     if (isShiftChecked)
     {
-        rolButton->Visibility = ::Visibility::Visible;
-        rorButton->Visibility = ::Visibility::Visible;
-        lshButton->Visibility = ::Visibility::Collapsed;
-        rshButton->Visibility = ::Visibility::Collapsed;
+        RolButton->Visibility = ::Visibility::Visible;
+        RorButton->Visibility = ::Visibility::Visible;
+        LshButton->Visibility = ::Visibility::Collapsed;
+        RshButton->Visibility = ::Visibility::Collapsed;
     }
     else
     {
-        rolButton->Visibility = ::Visibility::Collapsed;
-        rorButton->Visibility = ::Visibility::Collapsed;
-        lshButton->Visibility = ::Visibility::Visible;
-        rshButton->Visibility = ::Visibility::Visible;
+        RolButton->Visibility = ::Visibility::Collapsed;
+        RorButton->Visibility = ::Visibility::Collapsed;
+        LshButton->Visibility = ::Visibility::Visible;
+        RshButton->Visibility = ::Visibility::Visible;
     }
 }
 
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml
index 86d9f2a6b..2e6af2a77 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml
@@ -44,12 +44,12 @@
                         <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="degreeButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
-                        <Setter Target="radianButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
-                        <Setter Target="gradsButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
+                        <Setter Target="DegreeButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
+                        <Setter Target="RadianButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
+                        <Setter Target="GradsButton.Style" Value="{StaticResource CaptionButtonSmallStyle}"/>
 
-                        <Setter Target="hyperbolicButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
-                        <Setter Target="ftoeButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
+                        <Setter Target="HyperbolicButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
+                        <Setter Target="FtoeButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -57,23 +57,23 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="degreeButton.IsEnabled" Value="False"/>
-                        <Setter Target="radianButton.IsEnabled" Value="False"/>
-                        <Setter Target="gradsButton.IsEnabled" Value="False"/>
-                        <Setter Target="hyperbolicButton.IsEnabled" Value="False"/>
-                        <Setter Target="ftoeButton.IsEnabled" Value="False"/>
+                        <Setter Target="DegreeButton.IsEnabled" Value="False"/>
+                        <Setter Target="RadianButton.IsEnabled" Value="False"/>
+                        <Setter Target="GradsButton.IsEnabled" Value="False"/>
+                        <Setter Target="HyperbolicButton.IsEnabled" Value="False"/>
+                        <Setter Target="FtoeButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <Button x:Name="degreeButton"
+        <Button x:Name="DegreeButton"
                 x:Uid="degButton"
                 Style="{StaticResource CaptionButtonStyle}"
                 AutomationProperties.AutomationId="degButton"
                 Command="{x:Bind ButtonPressed}"
                 CommandParameter="0"
                 Content="DEG"/>
-        <Button x:Name="radianButton"
+        <Button x:Name="RadianButton"
                 x:Uid="radButton"
                 Style="{StaticResource CaptionButtonStyle}"
                 AutomationProperties.AutomationId="radButton"
@@ -81,7 +81,7 @@
                 CommandParameter="1"
                 Content="RAD"
                 Visibility="Collapsed"/>
-        <Button x:Name="gradsButton"
+        <Button x:Name="GradsButton"
                 x:Uid="gradButton"
                 Style="{StaticResource CaptionButtonStyle}"
                 AutomationProperties.AutomationId="gradButton"
@@ -89,7 +89,7 @@
                 CommandParameter="2"
                 Content="GRAD"
                 Visibility="Collapsed"/>
-        <ToggleButton x:Name="hyperbolicButton"
+        <ToggleButton x:Name="HyperbolicButton"
                       x:Uid="hyperbolicButton"
                       Grid.Column="1"
                       Style="{StaticResource CaptionToggleButtonStyle}"
@@ -100,7 +100,7 @@
                       Content="HYP"
                       IsChecked="{Binding IsHyperbolicChecked, Mode=TwoWay}"
                       Unchecked="HypButton_Toggled"/>
-        <ToggleButton x:Name="ftoeButton"
+        <ToggleButton x:Name="FtoeButton"
                       x:Uid="ftoeButton"
                       Grid.Column="2"
                       Style="{StaticResource CaptionToggleButtonStyle}"
diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
index 16f0cc5d6..2cf02f540 100644
--- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp
@@ -51,27 +51,27 @@ void CalculatorApp::CalculatorScientificAngleButtons::OnAngleButtonPressed(_In_
     TraceLogger::GetInstance().LogAngleButtonUsed(ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
     String^ buttonId = static_cast<String^>(commandParameter);
 
-    degreeButton->Visibility = ::Visibility::Collapsed;
-    radianButton->Visibility = ::Visibility::Collapsed;
-    gradsButton->Visibility = ::Visibility::Collapsed;
+    DegreeButton->Visibility = ::Visibility::Collapsed;
+    RadianButton->Visibility = ::Visibility::Collapsed;
+    GradsButton->Visibility = ::Visibility::Collapsed;
 
     if (buttonId == L"0")
     {
         Model->SwitchAngleType(NumbersAndOperatorsEnum::Radians);
-        radianButton->Visibility = ::Visibility::Visible;
-        radianButton->Focus(::FocusState::Programmatic);
+        RadianButton->Visibility = ::Visibility::Visible;
+        RadianButton->Focus(::FocusState::Programmatic);
     }
     else if (buttonId == L"1")
     {
         Model->SwitchAngleType(NumbersAndOperatorsEnum::Grads);
-        gradsButton->Visibility = ::Visibility::Visible;
-        gradsButton->Focus(::FocusState::Programmatic);
+        GradsButton->Visibility = ::Visibility::Visible;
+        GradsButton->Focus(::FocusState::Programmatic);
     }
     else if (buttonId == L"2")
     {
         Model->SwitchAngleType(NumbersAndOperatorsEnum::Degree);
-        degreeButton->Visibility = ::Visibility::Visible;
-        degreeButton->Focus(::FocusState::Programmatic);
+        DegreeButton->Visibility = ::Visibility::Visible;
+        DegreeButton->Focus(::FocusState::Programmatic);
     }
 }
 
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
index 1ef614c3d..15f6600f0 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -48,48 +48,48 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="xpower2Button.IsEnabled" Value="False"/>
-                        <Setter Target="powerButton.IsEnabled" Value="False"/>
-                        <Setter Target="sinButton.IsEnabled" Value="False"/>
-                        <Setter Target="cosButton.IsEnabled" Value="False"/>
-                        <Setter Target="tanButton.IsEnabled" Value="False"/>
-                        <Setter Target="sinhButton.IsEnabled" Value="False"/>
-                        <Setter Target="coshButton.IsEnabled" Value="False"/>
-                        <Setter Target="tanhButton.IsEnabled" Value="False"/>
+                        <Setter Target="XPower2Button.IsEnabled" Value="False"/>
+                        <Setter Target="PowerButton.IsEnabled" Value="False"/>
+                        <Setter Target="SinButton.IsEnabled" Value="False"/>
+                        <Setter Target="CosButton.IsEnabled" Value="False"/>
+                        <Setter Target="TanButton.IsEnabled" Value="False"/>
+                        <Setter Target="SinhButton.IsEnabled" Value="False"/>
+                        <Setter Target="CoshButton.IsEnabled" Value="False"/>
+                        <Setter Target="TanhButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="xpower3Button.IsEnabled" Value="False"/>
-                        <Setter Target="ySquareRootButton.IsEnabled" Value="False"/>
-                        <Setter Target="invsinButton.IsEnabled" Value="False"/>
-                        <Setter Target="invcosButton.IsEnabled" Value="False"/>
-                        <Setter Target="invtanButton.IsEnabled" Value="False"/>
-                        <Setter Target="invsinhButton.IsEnabled" Value="False"/>
-                        <Setter Target="invcoshButton.IsEnabled" Value="False"/>
-                        <Setter Target="invtanhButton.IsEnabled" Value="False"/>
+                        <Setter Target="XPower3Button.IsEnabled" Value="False"/>
+                        <Setter Target="YSquareRootButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvsinButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvcosButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvtanButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvsinhButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvcoshButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvtanhButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="squareRootButton.IsEnabled" Value="False"/>
-                        <Setter Target="powerOf10Button.IsEnabled" Value="False"/>
-                        <Setter Target="logBase10Button.IsEnabled" Value="False"/>
-                        <Setter Target="expButton.IsEnabled" Value="False"/>
-                        <Setter Target="modButton.IsEnabled" Value="False"/>
+                        <Setter Target="SquareRootButton.IsEnabled" Value="False"/>
+                        <Setter Target="PowerOf10Button.IsEnabled" Value="False"/>
+                        <Setter Target="LogBase10Button.IsEnabled" Value="False"/>
+                        <Setter Target="ExpButton.IsEnabled" Value="False"/>
+                        <Setter Target="ModButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="invertButton.IsEnabled" Value="False"/>
-                        <Setter Target="powerOfEButton.IsEnabled" Value="False"/>
-                        <Setter Target="logBaseEButton.IsEnabled" Value="False"/>
-                        <Setter Target="dmsButton.IsEnabled" Value="False"/>
-                        <Setter Target="degreesButton.IsEnabled" Value="False"/>
+                        <Setter Target="InvertButton.IsEnabled" Value="False"/>
+                        <Setter Target="PowerOfEButton.IsEnabled" Value="False"/>
+                        <Setter Target="LogBaseEButton.IsEnabled" Value="False"/>
+                        <Setter Target="DmsButton.IsEnabled" Value="False"/>
+                        <Setter Target="DegreesButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="shiftButton.IsEnabled" Value="False"/>
+                        <Setter Target="ShiftButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="divideButton.IsEnabled" Value="False"/>
-                        <Setter Target="multiplyButton.IsEnabled" Value="False"/>
-                        <Setter Target="minusButton.IsEnabled" Value="False"/>
-                        <Setter Target="plusButton.IsEnabled" Value="False"/>
+                        <Setter Target="DivideButton.IsEnabled" Value="False"/>
+                        <Setter Target="MultiplyButton.IsEnabled" Value="False"/>
+                        <Setter Target="MinusButton.IsEnabled" Value="False"/>
+                        <Setter Target="PlusButton.IsEnabled" Value="False"/>
 
-                        <Setter Target="piButton.IsEnabled" Value="False"/>
-                        <Setter Target="factorialButton.IsEnabled" Value="False"/>
-                        <Setter Target="negateButton.IsEnabled" Value="False"/>
-                        <Setter Target="openParenthesisButton.IsEnabled" Value="False"/>
-                        <Setter Target="closeParenthesisButton.IsEnabled" Value="False"/>
+                        <Setter Target="PiButton.IsEnabled" Value="False"/>
+                        <Setter Target="FactorialButton.IsEnabled" Value="False"/>
+                        <Setter Target="NegateButton.IsEnabled" Value="False"/>
+                        <Setter Target="OpenParenthesisButton.IsEnabled" Value="False"/>
+                        <Setter Target="CloseParenthesisButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -111,47 +111,47 @@
                         <Setter Target="InvRow1.Visibility" Value="Visible"/>
                         <Setter Target="InvRow2.Visibility" Value="Visible"/>
 
-                        <Setter Target="negateButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="piButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="factorialButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="openParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="closeParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="sinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="cosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="tanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="sinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="coshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="tanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PiButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="FactorialButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="OpenParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CloseParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="TanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="TanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
-                        <Setter Target="invsinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invcosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invtanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invsinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invcoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invtanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerOf10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="logBase10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="expButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="modButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="ySquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerOfEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="logBaseEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="dmsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="degreesButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower3Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvsinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvcosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvtanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvsinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvcoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvtanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerOf10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBase10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ExpButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ModButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="YSquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerOfEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBaseEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DmsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DegreesButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower3Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
-                        <Setter Target="clearEntryButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="NumberPad.ButtonStyle" Value="{ThemeResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
                     <Storyboard Completed="WideLayout_Completed"/>
@@ -167,8 +167,8 @@
                         <Setter Target="C1.Width" Value="1*"/>
                         <Setter Target="C2.Width" Value="1*"/>
                         <Setter Target="C3.Width" Value="1*"/>
-                        <Setter Target="shiftButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="shiftButton.(Grid.Column)" Value="1"/>
+                        <Setter Target="ShiftButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="ShiftButton.(Grid.Column)" Value="1"/>
                         <Setter Target="ScientificFunctions.(Grid.Row)" Value="4"/>
                         <Setter Target="ScientificFunctions.(Grid.Column)" Value="1"/>
                         <Setter Target="OpR2.Height" Value="1*"/>
@@ -181,58 +181,58 @@
                         <Setter Target="InvRow1.Visibility" Value="Visible"/>
                         <Setter Target="InvRow2.Visibility" Value="Visible"/>
 
-                        <Setter Target="negateButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="negateButton.(Grid.Column)" Value="6"/>
-                        <Setter Target="piButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="piButton.(Grid.Column)" Value="2"/>
-                        <Setter Target="factorialButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="factorialButton.(Grid.Column)" Value="3"/>
-                        <Setter Target="openParenthesisButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="openParenthesisButton.(Grid.Column)" Value="4"/>
-                        <Setter Target="closeParenthesisButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="closeParenthesisButton.(Grid.Column)" Value="5"/>
+                        <Setter Target="NegateButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="NegateButton.(Grid.Column)" Value="6"/>
+                        <Setter Target="PiButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="PiButton.(Grid.Column)" Value="2"/>
+                        <Setter Target="FactorialButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="FactorialButton.(Grid.Column)" Value="3"/>
+                        <Setter Target="OpenParenthesisButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="OpenParenthesisButton.(Grid.Column)" Value="4"/>
+                        <Setter Target="CloseParenthesisButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="CloseParenthesisButton.(Grid.Column)" Value="5"/>
 
-                        <Setter Target="negateButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="piButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="factorialButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="openParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="closeParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="sinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="cosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="tanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="sinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="coshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="tanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PiButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="FactorialButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="OpenParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CloseParenthesisButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="TanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="CoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="TanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
-                        <Setter Target="invsinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invcosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invtanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invsinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invcoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invtanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerOf10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="logBase10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="expButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="modButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="ySquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="powerOfEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="logBaseEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="dmsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="degreesButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower3Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvsinButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvcosButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvtanButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvsinhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvcoshButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvtanhButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerOf10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBase10Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ExpButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ModButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="YSquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PowerOfEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBaseEButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DmsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DegreesButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower3Button.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
-                        <Setter Target="clearEntryButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="NumberPad.ButtonStyle" Value="{ThemeResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
                     <Storyboard Completed="WideLayout_Completed"/>
@@ -248,8 +248,8 @@
                         <Setter Target="C1.Width" Value="1*"/>
                         <Setter Target="C2.Width" Value="1*"/>
                         <Setter Target="C3.Width" Value="1*"/>
-                        <Setter Target="shiftButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="shiftButton.(Grid.Column)" Value="1"/>
+                        <Setter Target="ShiftButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="ShiftButton.(Grid.Column)" Value="1"/>
                         <Setter Target="ScientificFunctions.(Grid.Row)" Value="4"/>
                         <Setter Target="ScientificFunctions.(Grid.Column)" Value="1"/>
                         <Setter Target="OpR2.Height" Value="1*"/>
@@ -262,16 +262,16 @@
                         <Setter Target="InvRow1.Visibility" Value="Visible"/>
                         <Setter Target="InvRow2.Visibility" Value="Visible"/>
 
-                        <Setter Target="negateButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="negateButton.(Grid.Column)" Value="6"/>
-                        <Setter Target="piButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="piButton.(Grid.Column)" Value="2"/>
-                        <Setter Target="factorialButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="factorialButton.(Grid.Column)" Value="3"/>
-                        <Setter Target="openParenthesisButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="openParenthesisButton.(Grid.Column)" Value="4"/>
-                        <Setter Target="closeParenthesisButton.(Grid.Row)" Value="8"/>
-                        <Setter Target="closeParenthesisButton.(Grid.Column)" Value="5"/>
+                        <Setter Target="NegateButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="NegateButton.(Grid.Column)" Value="6"/>
+                        <Setter Target="PiButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="PiButton.(Grid.Column)" Value="2"/>
+                        <Setter Target="FactorialButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="FactorialButton.(Grid.Column)" Value="3"/>
+                        <Setter Target="OpenParenthesisButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="OpenParenthesisButton.(Grid.Column)" Value="4"/>
+                        <Setter Target="CloseParenthesisButton.(Grid.Row)" Value="8"/>
+                        <Setter Target="CloseParenthesisButton.(Grid.Column)" Value="5"/>
                     </VisualState.Setters>
                     <Storyboard Completed="WideLayout_Completed"/>
                 </VisualState>
@@ -330,7 +330,7 @@
                         <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="shiftButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
+                        <Setter Target="ShiftButton.Style" Value="{StaticResource CaptionToggleButtonSmallStyle}"/>
                     </VisualState.Setters>
                     <Storyboard Completed="ShortLayout_Completed"/>
                 </VisualState>
@@ -360,20 +360,20 @@
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:CalculatorButton x:Name="xpower2Button"
+                <controls:CalculatorButton x:Name="XPower2Button"
                                            x:Uid="xpower2Button"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="xpower2Button"
                                            ButtonId="XPower2"
                                            Content="&#xf7c8;"/>
-                <controls:CalculatorButton x:Name="powerButton"
+                <controls:CalculatorButton x:Name="PowerButton"
                                            x:Uid="powerButton"
                                            Grid.Column="1"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="powerButton"
                                            ButtonId="XPowerY"
                                            Content="&#xf7ca;"/>
-                <controls:CalculatorButton x:Name="sinButton"
+                <controls:CalculatorButton x:Name="SinButton"
                                            x:Uid="sinButton"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -381,7 +381,7 @@
                                            ButtonId="Sin"
                                            Content="sin"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="cosButton"
+                <controls:CalculatorButton x:Name="CosButton"
                                            x:Uid="cosButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -389,7 +389,7 @@
                                            ButtonId="Cos"
                                            Content="cos"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="tanButton"
+                <controls:CalculatorButton x:Name="TanButton"
                                            x:Uid="tanButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -397,7 +397,7 @@
                                            ButtonId="Tan"
                                            Content="tan"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="sinhButton"
+                <controls:CalculatorButton x:Name="SinhButton"
                                            x:Uid="sinhButton"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -405,7 +405,7 @@
                                            ButtonId="Sinh"
                                            Content="sinh"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <controls:CalculatorButton x:Name="coshButton"
+                <controls:CalculatorButton x:Name="CoshButton"
                                            x:Uid="coshButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -413,7 +413,7 @@
                                            ButtonId="Cosh"
                                            Content="cosh"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <controls:CalculatorButton x:Name="tanhButton"
+                <controls:CalculatorButton x:Name="TanhButton"
                                            x:Uid="tanhButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -433,20 +433,20 @@
                     <ColumnDefinition x:Name="CX4" Width="1*"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:CalculatorButton x:Name="xpower3Button"
+                <controls:CalculatorButton x:Name="XPower3Button"
                                            x:Uid="xpower3Button"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="xpower3Button"
                                            ButtonId="Cube"
                                            Content="&#xf7cb;"/>
-                <controls:CalculatorButton x:Name="ySquareRootButton"
+                <controls:CalculatorButton x:Name="YSquareRootButton"
                                            x:Uid="ySquareRootButton"
                                            Grid.Column="1"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="ySquareRootButton"
                                            ButtonId="YRootX"
                                            Content="&#xf7cd;"/>
-                <controls:CalculatorButton x:Name="invsinButton"
+                <controls:CalculatorButton x:Name="InvsinButton"
                                            x:Uid="invsinButton"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -454,7 +454,7 @@
                                            ButtonId="InvSin"
                                            Content="sin⁻¹"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="invcosButton"
+                <controls:CalculatorButton x:Name="InvcosButton"
                                            x:Uid="invcosButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -462,7 +462,7 @@
                                            ButtonId="InvCos"
                                            Content="cos⁻¹"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="invtanButton"
+                <controls:CalculatorButton x:Name="InvtanButton"
                                            x:Uid="invtanButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -470,7 +470,7 @@
                                            ButtonId="InvTan"
                                            Content="tan⁻¹"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
-                <controls:CalculatorButton x:Name="invsinhButton"
+                <controls:CalculatorButton x:Name="InvsinhButton"
                                            x:Uid="invsinhButton"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -478,7 +478,7 @@
                                            ButtonId="InvSinh"
                                            Content="sinh⁻¹"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <controls:CalculatorButton x:Name="invcoshButton"
+                <controls:CalculatorButton x:Name="InvcoshButton"
                                            x:Uid="invcoshButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -486,7 +486,7 @@
                                            ButtonId="InvCosh"
                                            Content="cosh⁻¹"
                                            Visibility="{Binding IsHyperbolicChecked, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                <controls:CalculatorButton x:Name="invtanhButton"
+                <controls:CalculatorButton x:Name="InvtanhButton"
                                            x:Uid="invtanhButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -506,34 +506,34 @@
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:CalculatorButton x:Name="squareRootButton"
+                <controls:CalculatorButton x:Name="SquareRootButton"
                                            x:Uid="squareRootButton"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="squareRootButton"
                                            ButtonId="Sqrt"
                                            Content="&#xE94B;"/>
-                <controls:CalculatorButton x:Name="powerOf10Button"
+                <controls:CalculatorButton x:Name="PowerOf10Button"
                                            x:Uid="powerOf10Button"
                                            Grid.Column="1"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="powerOf10Button"
                                            ButtonId="TenPowerX"
                                            Content="&#xF7CC;"/>
-                <controls:CalculatorButton x:Name="logBase10Button"
+                <controls:CalculatorButton x:Name="LogBase10Button"
                                            x:Uid="logBase10Button"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
                                            AutomationProperties.AutomationId="logBase10Button"
                                            ButtonId="LogBase10"
                                            Content="log"/>
-                <controls:CalculatorButton x:Name="expButton"
+                <controls:CalculatorButton x:Name="ExpButton"
                                            x:Uid="expButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
                                            AutomationProperties.AutomationId="expButton"
                                            ButtonId="Exp"
                                            Content="Exp"/>
-                <controls:CalculatorButton x:Name="modButton"
+                <controls:CalculatorButton x:Name="ModButton"
                                            x:Uid="modButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -554,34 +554,34 @@
                     <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
 
-                <controls:CalculatorButton x:Name="invertButton"
+                <controls:CalculatorButton x:Name="InvertButton"
                                            x:Uid="invertButton"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="invertButton"
                                            ButtonId="Invert"
                                            Content="&#xf7c9;"/>
-                <controls:CalculatorButton x:Name="powerOfEButton"
+                <controls:CalculatorButton x:Name="PowerOfEButton"
                                            x:Uid="powerOfEButton"
                                            Grid.Column="1"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
                                            AutomationProperties.AutomationId="powerOfEButton"
                                            ButtonId="EPowerX"
                                            Content="&#xf7ce;"/>
-                <controls:CalculatorButton x:Name="logBaseEButton"
+                <controls:CalculatorButton x:Name="LogBaseEButton"
                                            x:Uid="logBaseEButton"
                                            Grid.Column="2"
                                            Style="{StaticResource OperatorButtonStyle}"
                                            AutomationProperties.AutomationId="logBaseEButton"
                                            ButtonId="LogBaseE"
                                            Content="ln"/>
-                <controls:CalculatorButton x:Name="dmsButton"
+                <controls:CalculatorButton x:Name="DmsButton"
                                            x:Uid="dmsButton"
                                            Grid.Column="3"
                                            Style="{StaticResource OperatorButtonStyle}"
                                            AutomationProperties.AutomationId="dmsButton"
                                            ButtonId="DMS"
                                            Content="dms"/>
-                <controls:CalculatorButton x:Name="degreesButton"
+                <controls:CalculatorButton x:Name="DegreesButton"
                                            x:Uid="degreesButton"
                                            Grid.Column="4"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -591,7 +591,7 @@
             </Grid>
         </Grid>
 
-        <ToggleButton x:Name="shiftButton"
+        <ToggleButton x:Name="ShiftButton"
                       x:Uid="shiftButton"
                       Grid.Row="4"
                       Grid.Column="5"
@@ -618,35 +618,35 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <controls:CalculatorButton x:Name="divideButton"
+            <controls:CalculatorButton x:Name="DivideButton"
                                        x:Uid="divideButton"
                                        Grid.Row="0"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="divideButton"
                                        ButtonId="Divide"
                                        Content="&#xE94A;"/>
-            <controls:CalculatorButton x:Name="multiplyButton"
+            <controls:CalculatorButton x:Name="MultiplyButton"
                                        x:Uid="multiplyButton"
                                        Grid.Row="1"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="multiplyButton"
                                        ButtonId="Multiply"
                                        Content="&#xE947;"/>
-            <controls:CalculatorButton x:Name="minusButton"
+            <controls:CalculatorButton x:Name="MinusButton"
                                        x:Uid="minusButton"
                                        Grid.Row="2"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="minusButton"
                                        ButtonId="Subtract"
                                        Content="&#xE949;"/>
-            <controls:CalculatorButton x:Name="plusButton"
+            <controls:CalculatorButton x:Name="PlusButton"
                                        x:Uid="plusButton"
                                        Grid.Row="3"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="plusButton"
                                        ButtonId="Add"
                                        Content="&#xE948;"/>
-            <controls:CalculatorButton x:Name="equalButton"
+            <controls:CalculatorButton x:Name="EqualButton"
                                        x:Uid="equalButton"
                                        Grid.Row="4"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -666,14 +666,14 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <controls:CalculatorButton x:Name="clearEntryButton"
+            <controls:CalculatorButton x:Name="ClearEntryButton"
                                        x:Uid="clearEntryButton"
                                        Style="{StaticResource OperatorButtonStyle}"
                                        FontSize="16"
                                        AutomationProperties.AutomationId="clearEntryButton"
                                        ButtonId="ClearEntry"
                                        Content="CE"/>
-            <controls:CalculatorButton x:Name="clearButton"
+            <controls:CalculatorButton x:Name="ClearButton"
                                        x:Uid="clearButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -681,7 +681,7 @@
                                        AutomationProperties.AutomationId="clearButton"
                                        ButtonId="Clear"
                                        Content="C"/>
-            <controls:CalculatorButton x:Name="backSpaceButton"
+            <controls:CalculatorButton x:Name="BackSpaceButton"
                                        x:Uid="backSpaceButton"
                                        Grid.Column="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -692,7 +692,7 @@
                                        Content="&#xE94F;"/>
         </Grid>
 
-        <controls:CalculatorButton x:Name="piButton"
+        <controls:CalculatorButton x:Name="PiButton"
                                    x:Uid="piButton"
                                    Grid.Row="5"
                                    Grid.Column="5"
@@ -701,7 +701,7 @@
                                    AutomationProperties.AutomationId="piButton"
                                    ButtonId="Pi"
                                    Content="&#xf7cf;"/>
-        <controls:CalculatorButton x:Name="factorialButton"
+        <controls:CalculatorButton x:Name="FactorialButton"
                                    x:Uid="factorialButton"
                                    Grid.Row="6"
                                    Grid.Column="5"
@@ -710,7 +710,7 @@
                                    AutomationProperties.AutomationId="factorialButton"
                                    ButtonId="Factorial"
                                    Content="n!"/>
-        <controls:CalculatorButton x:Name="negateButton"
+        <controls:CalculatorButton x:Name="NegateButton"
                                    x:Uid="negateButton"
                                    Grid.Row="7"
                                    Grid.Column="5"
@@ -720,7 +720,7 @@
                                    ButtonId="Negate"
                                    Content="&#xE94D;"
                                    IsEnabled="{x:Bind Model.IsNegateEnabled, Mode=OneWay}"/>
-        <controls:CalculatorButton x:Name="openParenthesisButton"
+        <controls:CalculatorButton x:Name="OpenParenthesisButton"
                                    x:Uid="openParenthesisButton"
                                    Grid.Row="8"
                                    Grid.Column="5"
@@ -731,7 +731,7 @@
                                    Content="("
                                    GotFocus="OpenParenthesisButton_GotFocus"
                                    Tag="{x:Bind ParenthesisCountToString(Model.OpenParenthesisCount), Mode=OneWay}"/>
-        <controls:CalculatorButton x:Name="closeParenthesisButton"
+        <controls:CalculatorButton x:Name="CloseParenthesisButton"
                                    x:Uid="closeParenthesisButton"
                                    Grid.Row="8"
                                    Grid.Column="6"
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
index 3d54fb484..16435d3f5 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
@@ -35,7 +35,7 @@ CalculatorScientificOperators::CalculatorScientificOperators()
 {
     InitializeComponent();
 
-    expButton->SetValue(Common::KeyboardShortcutManager::VirtualKeyProperty, Common::MyVirtualKey::E);
+    ExpButton->SetValue(Common::KeyboardShortcutManager::VirtualKeyProperty, Common::MyVirtualKey::E);
     Common::KeyboardShortcutManager::ShiftButtonChecked(false);
 }
 
@@ -62,7 +62,7 @@ void CalculatorScientificOperators::OnIsErrorVisualStatePropertyChanged(bool /*o
 
 void CalculatorScientificOperators::shiftButton_Check(_In_ Platform::Object^ /*sender*/, _In_ Windows::UI::Xaml::RoutedEventArgs^ /*e*/)
 {
-    bool isChecked = shiftButton->IsChecked->Value;
+    bool isChecked = ShiftButton->IsChecked->Value;
     Model->IsShiftChecked = isChecked;
     Common::KeyboardShortcutManager::ShiftButtonChecked(isChecked);
     SetOperatorRowVisibility();
@@ -71,7 +71,7 @@ void CalculatorScientificOperators::shiftButton_Check(_In_ Platform::Object^ /*s
 void CalculatorScientificOperators::shiftButton_IsEnabledChanged(_In_ Platform::Object^ /*sender*/, _In_ Windows::UI::Xaml::DependencyPropertyChangedEventArgs^ /*e*/)
 {
     SetOperatorRowVisibility();
-    Common::KeyboardShortcutManager::ShiftButtonChecked(shiftButton->IsEnabled && shiftButton->IsChecked->Value);
+    Common::KeyboardShortcutManager::ShiftButtonChecked(ShiftButton->IsEnabled && ShiftButton->IsChecked->Value);
 }
 
 void CalculatorScientificOperators::SetOperatorRowVisibility()
@@ -82,7 +82,7 @@ void CalculatorScientificOperators::SetOperatorRowVisibility()
         rowVis = ::Visibility::Visible;
         invRowVis = ::Visibility::Visible;
     }
-    else if (shiftButton->IsChecked->Value)
+    else if (ShiftButton->IsChecked->Value)
     {
         rowVis = ::Visibility::Collapsed;
         invRowVis = ::Visibility::Visible;
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml b/src/Calculator/Views/CalculatorStandardOperators.xaml
index 822b3536a..11116038a 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml
@@ -33,16 +33,16 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="percentButton.IsEnabled" Value="False"/>
-                        <Setter Target="squareRootButton.IsEnabled" Value="False"/>
-                        <Setter Target="xpower2Button.IsEnabled" Value="False"/>
-                        <Setter Target="xpower3Button.IsEnabled" Value="False"/>
-                        <Setter Target="invertButton.IsEnabled" Value="False"/>
-                        <Setter Target="divideButton.IsEnabled" Value="False"/>
-                        <Setter Target="multiplyButton.IsEnabled" Value="False"/>
-                        <Setter Target="minusButton.IsEnabled" Value="False"/>
-                        <Setter Target="plusButton.IsEnabled" Value="False"/>
-                        <Setter Target="negateButton.IsEnabled" Value="False"/>
+                        <Setter Target="PercentButton.IsEnabled" Value="False"/>
+                        <Setter Target="SquareRootButton.IsEnabled" Value="False"/>
+                        <Setter Target="XPower2Button.IsEnabled" Value="False"/>
+                        <Setter Target="XPower3Button.IsEnabled" Value="False"/>
+                        <Setter Target="InvertButton.IsEnabled" Value="False"/>
+                        <Setter Target="DivideButton.IsEnabled" Value="False"/>
+                        <Setter Target="MultiplyButton.IsEnabled" Value="False"/>
+                        <Setter Target="MinusButton.IsEnabled" Value="False"/>
+                        <Setter Target="PlusButton.IsEnabled" Value="False"/>
+                        <Setter Target="NegateButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -52,20 +52,20 @@
                         <AdaptiveTrigger MinWindowHeight="1366" MinWindowWidth="768"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle46}"/>
                     </VisualState.Setters>
@@ -90,30 +90,30 @@
                         <Setter Target="FnC2.Width" Value="0"/>
                         <Setter Target="FnC3.Width" Value="0"/>
 
-                        <Setter Target="squareRootButton.(Grid.Row)" Value="1"/>
-                        <Setter Target="squareRootButton.(Grid.Column)" Value="0"/>
-                        <Setter Target="xpower2Button.(Grid.Row)" Value="2"/>
-                        <Setter Target="xpower2Button.(Grid.Column)" Value="0"/>
-                        <Setter Target="xpower3Button.Visibility" Value="Visible"/>
-                        <Setter Target="invertButton.(Grid.Row)" Value="4"/>
-                        <Setter Target="invertButton.(Grid.Column)" Value="0"/>
+                        <Setter Target="SquareRootButton.(Grid.Row)" Value="1"/>
+                        <Setter Target="SquareRootButton.(Grid.Column)" Value="0"/>
+                        <Setter Target="XPower2Button.(Grid.Row)" Value="2"/>
+                        <Setter Target="XPower2Button.(Grid.Column)" Value="0"/>
+                        <Setter Target="XPower3Button.Visibility" Value="Visible"/>
+                        <Setter Target="InvertButton.(Grid.Row)" Value="4"/>
+                        <Setter Target="InvertButton.(Grid.Column)" Value="0"/>
 
-                        <Setter Target="negateButton.(Grid.Row)" Value="5"/>
-                        <Setter Target="negateButton.(Grid.Column)" Value="2"/>
+                        <Setter Target="NegateButton.(Grid.Row)" Value="5"/>
+                        <Setter Target="NegateButton.(Grid.Column)" Value="2"/>
 
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
@@ -138,31 +138,31 @@
                         <Setter Target="FnC2.Width" Value="0"/>
                         <Setter Target="FnC3.Width" Value="0"/>
 
-                        <Setter Target="squareRootButton.(Grid.Row)" Value="1"/>
-                        <Setter Target="squareRootButton.(Grid.Column)" Value="0"/>
-                        <Setter Target="xpower2Button.(Grid.Row)" Value="2"/>
-                        <Setter Target="xpower2Button.(Grid.Column)" Value="0"/>
-                        <Setter Target="xpower3Button.Visibility" Value="Visible"/>
-                        <Setter Target="invertButton.(Grid.Row)" Value="4"/>
-                        <Setter Target="invertButton.(Grid.Column)" Value="0"/>
+                        <Setter Target="SquareRootButton.(Grid.Row)" Value="1"/>
+                        <Setter Target="SquareRootButton.(Grid.Column)" Value="0"/>
+                        <Setter Target="XPower2Button.(Grid.Row)" Value="2"/>
+                        <Setter Target="XPower2Button.(Grid.Column)" Value="0"/>
+                        <Setter Target="XPower3Button.Visibility" Value="Visible"/>
+                        <Setter Target="InvertButton.(Grid.Row)" Value="4"/>
+                        <Setter Target="InvertButton.(Grid.Column)" Value="0"/>
 
-                        <Setter Target="negateButton.(Grid.Row)" Value="5"/>
-                        <Setter Target="negateButton.(Grid.Column)" Value="2"/>
+                        <Setter Target="NegateButton.(Grid.Row)" Value="5"/>
+                        <Setter Target="NegateButton.(Grid.Column)" Value="2"/>
 
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle28}"/>
                     </VisualState.Setters>
@@ -172,20 +172,20 @@
                         <AdaptiveTrigger MinWindowHeight="1024" MinWindowWidth="640"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower3Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle28}"/>
                     </VisualState.Setters>
@@ -195,19 +195,19 @@
                         <AdaptiveTrigger MinWindowHeight="854" MinWindowWidth="480"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSizeLarge}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
@@ -217,19 +217,19 @@
                         <AdaptiveTrigger MinWindowHeight="640" MinWindowWidth="360"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="percentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="squareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="xpower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="invertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="negateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="divideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="multiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="minusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="plusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="equalButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PercentButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="SquareRootButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="XPower2Button.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="InvertButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="DivideButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MultiplyButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="MinusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="PlusButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="EqualButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
 
                         <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle28}"/>
                     </VisualState.Setters>
@@ -266,21 +266,21 @@
                 <ColumnDefinition x:Name="FnC2" Width="1*"/>
                 <ColumnDefinition x:Name="FnC3" Width="1*"/>
             </Grid.ColumnDefinitions>
-            <controls:CalculatorButton x:Name="percentButton"
+            <controls:CalculatorButton x:Name="PercentButton"
                                        x:Uid="percentButton"
                                        Grid.Column="0"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
                                        AutomationProperties.AutomationId="percentButton"
                                        ButtonId="Percent"
                                        Content="&#xE94C;"/>
-            <controls:CalculatorButton x:Name="squareRootButton"
+            <controls:CalculatorButton x:Name="SquareRootButton"
                                        x:Uid="squareRootButton"
                                        Grid.Column="1"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
                                        AutomationProperties.AutomationId="squareRootButton"
                                        ButtonId="Sqrt"
                                        Content="&#xE94B;"/>
-            <controls:CalculatorButton x:Name="xpower2Button"
+            <controls:CalculatorButton x:Name="XPower2Button"
                                        x:Uid="xpower2Button"
                                        Grid.Column="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -288,7 +288,7 @@
                                        AutomationProperties.AutomationId="xpower2Button"
                                        ButtonId="XPower2"
                                        Content="&#xf7c8;"/>
-            <controls:CalculatorButton x:Name="xpower3Button"
+            <controls:CalculatorButton x:Name="XPower3Button"
                                        x:Uid="xpower3Button"
                                        Grid.Row="3"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -297,7 +297,7 @@
                                        ButtonId="Cube"
                                        Content="&#xf7cb;"
                                        Visibility="Collapsed"/>
-            <controls:CalculatorButton x:Name="invertButton"
+            <controls:CalculatorButton x:Name="InvertButton"
                                        x:Uid="invertButton"
                                        Grid.Column="3"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -320,35 +320,35 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <controls:CalculatorButton x:Name="divideButton"
+            <controls:CalculatorButton x:Name="DivideButton"
                                        x:Uid="divideButton"
                                        Grid.Row="0"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="divideButton"
                                        ButtonId="Divide"
                                        Content="&#xE94A;"/>
-            <controls:CalculatorButton x:Name="multiplyButton"
+            <controls:CalculatorButton x:Name="MultiplyButton"
                                        x:Uid="multiplyButton"
                                        Grid.Row="1"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="multiplyButton"
                                        ButtonId="Multiply"
                                        Content="&#xE947;"/>
-            <controls:CalculatorButton x:Name="minusButton"
+            <controls:CalculatorButton x:Name="MinusButton"
                                        x:Uid="minusButton"
                                        Grid.Row="2"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="minusButton"
                                        ButtonId="Subtract"
                                        Content="&#xE949;"/>
-            <controls:CalculatorButton x:Name="plusButton"
+            <controls:CalculatorButton x:Name="PlusButton"
                                        x:Uid="plusButton"
                                        Grid.Row="3"
                                        Style="{StaticResource AccentCalcButtonStyle}"
                                        AutomationProperties.AutomationId="plusButton"
                                        ButtonId="Add"
                                        Content="&#xE948;"/>
-            <controls:CalculatorButton x:Name="equalButton"
+            <controls:CalculatorButton x:Name="EqualButton"
                                        x:Uid="equalButton"
                                        Grid.Row="4"
                                        Style="{StaticResource AccentCalcButtonStyle}"
@@ -368,7 +368,7 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <controls:CalculatorButton x:Name="clearEntryButton"
+            <controls:CalculatorButton x:Name="ClearEntryButton"
                                        x:Uid="clearEntryButton"
                                        Grid.Column="0"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -376,7 +376,7 @@
                                        AutomationProperties.AutomationId="clearEntryButton"
                                        ButtonId="ClearEntry"
                                        Content="CE"/>
-            <controls:CalculatorButton x:Name="clearButton"
+            <controls:CalculatorButton x:Name="ClearButton"
                                        x:Uid="clearButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -384,7 +384,7 @@
                                        AutomationProperties.AutomationId="clearButton"
                                        ButtonId="Clear"
                                        Content="C"/>
-            <controls:CalculatorButton x:Name="backSpaceButton"
+            <controls:CalculatorButton x:Name="BackSpaceButton"
                                        x:Uid="backSpaceButton"
                                        Grid.Column="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -403,7 +403,7 @@
                          AutomationProperties.HeadingLevel="Level1"
                          ButtonStyle="{StaticResource NumericButtonStyle24}"/>
 
-        <controls:CalculatorButton x:Name="negateButton"
+        <controls:CalculatorButton x:Name="NegateButton"
                                    x:Uid="negateButton"
                                    Grid.Row="5"
                                    Grid.Column="2"
diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml
index 60e2eb1dc..5bac8a746 100644
--- a/src/Calculator/Views/HistoryList.xaml
+++ b/src/Calculator/Views/HistoryList.xaml
@@ -62,7 +62,7 @@
                     <StackPanel Margin="0,6,4,6"
                                 Background="Transparent"
                                 ContextFlyout="{StaticResource HistoryContextMenu}">
-                        <TextBlock x:Name="exprTextBlock"
+                        <TextBlock x:Name="ExprTextBlock"
                                    Margin="0,0,0,4"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource BodyTextBlockMediumStyle}"
@@ -71,7 +71,7 @@
                                    Text="{x:Bind Expression}"
                                    TextAlignment="Right"
                                    TextWrapping="Wrap"/>
-                        <TextBlock x:Name="resultTextBlock"
+                        <TextBlock x:Name="ResultTextBlock"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource TitleTextBlockStyle}"
                                    FontWeight="SemiBold"
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index 6136f42fd..534bf2281 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -10,7 +10,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       xmlns:vm="using:CalculatorApp.ViewModel"
-      x:Name="pageRoot"
+      x:Name="PageRoot"
       Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
       Loaded="OnPageLoaded"
       Unloaded="OnPageUnLoaded"
@@ -75,16 +75,16 @@
                 These buttons are only here to serve as the target for copy/paste commands
                 they are not to be shown, only to have the command and shortcut assigned to them.
             -->
-            <Button x:Name="copyButton"
+            <Button x:Name="CopyButton"
                     x:Uid="copyButton"
                     Command="{x:Bind Model.CopyCommand}"/>
-            <Button x:Name="pasteButton"
+            <Button x:Name="PasteButton"
                     x:Uid="pasteButton"
                     Command="{x:Bind Model.PasteCommand}"/>
-            <Button x:Name="copyButtonAlternate"
+            <Button x:Name="CopyButtonAlternate"
                     x:Uid="copyButtonAlternate"
                     Command="{x:Bind Model.CopyCommand}"/>
-            <Button x:Name="pasteButtonAlternate"
+            <Button x:Name="PasteButtonAlternate"
                     x:Uid="pasteButtonAlternate"
                     Command="{x:Bind Model.PasteCommand}"/>
         </StackPanel>
diff --git a/src/Calculator/Views/NumberPad.xaml b/src/Calculator/Views/NumberPad.xaml
index eb490483a..4fa2f2c1e 100644
--- a/src/Calculator/Views/NumberPad.xaml
+++ b/src/Calculator/Views/NumberPad.xaml
@@ -30,70 +30,70 @@
                 <VisualState x:Name="NoErrorLayout"/>
                 <VisualState x:Name="ErrorLayout">
                     <VisualState.Setters>
-                        <Setter Target="decimalSeparatorButton.IsEnabled" Value="false"/>
+                        <Setter Target="DecimalSeparatorButton.IsEnabled" Value="false"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <controls:CalculatorButton x:Name="num0Button"
+        <controls:CalculatorButton x:Name="Num0Button"
                                    x:Uid="num0Button"
                                    Grid.Row="3"
                                    Grid.Column="1"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num0Button"
                                    ButtonId="Zero"/>
-        <controls:CalculatorButton x:Name="num1Button"
+        <controls:CalculatorButton x:Name="Num1Button"
                                    x:Uid="num1Button"
                                    Grid.Row="2"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num1Button"
                                    ButtonId="One"/>
-        <controls:CalculatorButton x:Name="num2Button"
+        <controls:CalculatorButton x:Name="Num2Button"
                                    x:Uid="num2Button"
                                    Grid.Row="2"
                                    Grid.Column="1"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num2Button"
                                    ButtonId="Two"/>
-        <controls:CalculatorButton x:Name="num3Button"
+        <controls:CalculatorButton x:Name="Num3Button"
                                    x:Uid="num3Button"
                                    Grid.Row="2"
                                    Grid.Column="2"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num3Button"
                                    ButtonId="Three"/>
-        <controls:CalculatorButton x:Name="num4Button"
+        <controls:CalculatorButton x:Name="Num4Button"
                                    x:Uid="num4Button"
                                    Grid.Row="1"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num4Button"
                                    ButtonId="Four"/>
-        <controls:CalculatorButton x:Name="num5Button"
+        <controls:CalculatorButton x:Name="Num5Button"
                                    x:Uid="num5Button"
                                    Grid.Row="1"
                                    Grid.Column="1"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num5Button"
                                    ButtonId="Five"/>
-        <controls:CalculatorButton x:Name="num6Button"
+        <controls:CalculatorButton x:Name="Num6Button"
                                    x:Uid="num6Button"
                                    Grid.Row="1"
                                    Grid.Column="2"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num6Button"
                                    ButtonId="Six"/>
-        <controls:CalculatorButton x:Name="num7Button"
+        <controls:CalculatorButton x:Name="Num7Button"
                                    x:Uid="num7Button"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num7Button"
                                    ButtonId="Seven"/>
-        <controls:CalculatorButton x:Name="num8Button"
+        <controls:CalculatorButton x:Name="Num8Button"
                                    x:Uid="num8Button"
                                    Grid.Column="1"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
                                    AutomationProperties.AutomationId="num8Button"
                                    ButtonId="Eight"/>
-        <controls:CalculatorButton x:Name="num9Button"
+        <controls:CalculatorButton x:Name="Num9Button"
                                    x:Uid="num9Button"
                                    Grid.Column="2"
                                    Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
@@ -107,7 +107,7 @@
             DO NOT REMOVE the common:KeyboardShortcutManager.Character from this element, it's value will be overwritten by the
             string coming from the RESW file
         -->
-        <controls:CalculatorButton x:Name="decimalSeparatorButton"
+        <controls:CalculatorButton x:Name="DecimalSeparatorButton"
                                    x:Uid="decimalSeparatorButton"
                                    Grid.Row="3"
                                    Grid.Column="2"
diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp
index 1e179d294..17e768b0e 100644
--- a/src/Calculator/Views/NumberPad.xaml.cpp
+++ b/src/Calculator/Views/NumberPad.xaml.cpp
@@ -38,50 +38,50 @@ NumberPad::NumberPad() :
 
     const auto& localizationSettings = LocalizationSettings::GetInstance();
     
-    this->decimalSeparatorButton->Content = localizationSettings.GetDecimalSeparator();
-    this->num0Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('0');
-    this->num1Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('1');
-    this->num2Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('2');
-    this->num3Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('3');
-    this->num4Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('4');
-    this->num5Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('5');
-    this->num6Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('6');
-    this->num7Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('7');
-    this->num8Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('8');
-    this->num9Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('9');
+    this->DecimalSeparatorButton->Content = localizationSettings.GetDecimalSeparator();
+    this->Num0Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('0');
+    this->Num1Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('1');
+    this->Num2Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('2');
+    this->Num3Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('3');
+    this->Num4Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('4');
+    this->Num5Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('5');
+    this->Num6Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('6');
+    this->Num7Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('7');
+    this->Num8Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('8');
+    this->Num9Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('9');
 }
 
 void NumberPad::ProgModeRadixChange()
 {
-    num0Button->IsEnabled = true;
-    num1Button->IsEnabled = true;
-    num2Button->IsEnabled = true;
-    num3Button->IsEnabled = true;
-    num4Button->IsEnabled = true;
-    num5Button->IsEnabled = true;
-    num6Button->IsEnabled = true;
-    num7Button->IsEnabled = true;
-    num8Button->IsEnabled = true;
-    num9Button->IsEnabled = true;
+    Num0Button->IsEnabled = true;
+    Num1Button->IsEnabled = true;
+    Num2Button->IsEnabled = true;
+    Num3Button->IsEnabled = true;
+    Num4Button->IsEnabled = true;
+    Num5Button->IsEnabled = true;
+    Num6Button->IsEnabled = true;
+    Num7Button->IsEnabled = true;
+    Num8Button->IsEnabled = true;
+    Num9Button->IsEnabled = true;
 
     auto vm = safe_cast<StandardCalculatorViewModel^>(this->DataContext);
     RADIX_TYPE radixType = vm->GetCurrentRadixType();
 
     if (radixType == RADIX_TYPE::BIN_RADIX)
     {
-        num2Button->IsEnabled = false;
-        num3Button->IsEnabled = false;
-        num4Button->IsEnabled = false;
-        num5Button->IsEnabled = false;
-        num6Button->IsEnabled = false;
-        num7Button->IsEnabled = false;
-        num8Button->IsEnabled = false;
-        num9Button->IsEnabled = false;
+        Num2Button->IsEnabled = false;
+        Num3Button->IsEnabled = false;
+        Num4Button->IsEnabled = false;
+        Num5Button->IsEnabled = false;
+        Num6Button->IsEnabled = false;
+        Num7Button->IsEnabled = false;
+        Num8Button->IsEnabled = false;
+        Num9Button->IsEnabled = false;
     }
     else if (radixType == RADIX_TYPE::OCT_RADIX)
     {
-        num8Button->IsEnabled = false;
-        num9Button->IsEnabled = false;
+        Num8Button->IsEnabled = false;
+        Num9Button->IsEnabled = false;
     }
 }
 
diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 71e1137b9..28dea2e61 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -355,10 +355,10 @@
                         <Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
                         <Setter Target="Units1.Height" Value="44"/>
                         <Setter Target="Units2.Height" Value="44"/>
-                        <Setter Target="converterNegateButton.FontSize" Value="24"/>
-                        <Setter Target="clearEntryButtonPos0.FontSize" Value="24"/>
-                        <Setter Target="backSpaceButtonSmall.FontSize" Value="24"/>
-                        <Setter Target="numberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle46}"/>
+                        <Setter Target="ConverterNegateButton.FontSize" Value="24"/>
+                        <Setter Target="ClearEntryButtonPos0.FontSize" Value="24"/>
+                        <Setter Target="BackSpaceButtonSmall.FontSize" Value="24"/>
+                        <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle46}"/>
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Portrait">
@@ -373,9 +373,9 @@
                         <Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
                         <Setter Target="Units1.Height" Value="44"/>
                         <Setter Target="Units2.Height" Value="44"/>
-                        <Setter Target="converterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="numberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
+                        <Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Wide640">
@@ -389,10 +389,10 @@
                         <Setter Target="CurrencySymbol2Block.Style" Value="{ThemeResource CurrencySymbolLargeStyle}"/>
                         <Setter Target="Units1.Height" Value="44"/>
                         <Setter Target="Units2.Height" Value="44"/>
-                        <Setter Target="converterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="clearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="backSpaceButtonSmall.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="numberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
+                        <Setter Target="ConverterNegateButton.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="ClearEntryButtonPos0.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="BackSpaceButtonSmall.FontSize" Value="{StaticResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle34}"/>
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="MinSizeLayout">
@@ -405,11 +405,11 @@
                         <AdaptiveTrigger MinWindowHeight="0" MinWindowWidth="0"/>
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="clearEntryButtonPos0.Margin" Value="1"/>
-                        <Setter Target="backSpaceButtonSmall.Margin" Value="1"/>
-                        <Setter Target="converterNegateButton.Margin" Value="1"/>
+                        <Setter Target="ClearEntryButtonPos0.Margin" Value="1"/>
+                        <Setter Target="BackSpaceButtonSmall.Margin" Value="1"/>
+                        <Setter Target="ConverterNegateButton.Margin" Value="1"/>
 
-                        <Setter Target="numberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle18}"/>
+                        <Setter Target="NumberPad.ButtonStyle" Value="{StaticResource NumericButtonStyle18}"/>
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
@@ -676,7 +676,7 @@
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <controls:CalculatorButton x:Name="clearEntryButtonPos0"
+                <controls:CalculatorButton x:Name="ClearEntryButtonPos0"
                                            x:Uid="clearEntryButton"
                                            HorizontalAlignment="Stretch"
                                            Style="{StaticResource OperatorButtonStyle}"
@@ -684,7 +684,7 @@
                                            ButtonId="Clear"
                                            Content="CE"
                                            TabIndex="7"/>
-                <controls:CalculatorButton x:Name="backSpaceButtonSmall"
+                <controls:CalculatorButton x:Name="BackSpaceButtonSmall"
                                            x:Uid="backSpaceButton"
                                            Grid.Column="1"
                                            Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -695,7 +695,7 @@
                                            TabIndex="8"/>
             </Grid>
 
-            <local:NumberPad x:Name="numberPad"
+            <local:NumberPad x:Name="NumberPad"
                              x:Uid="NumberPad"
                              Grid.Row="2"
                              Grid.RowSpan="4"
@@ -706,7 +706,7 @@
                              ButtonStyle="{StaticResource NumericButtonStyle24}"
                              TabIndex="10"
                              TabNavigation="Local"/>
-            <controls:CalculatorButton x:Name="converterNegateButton"
+            <controls:CalculatorButton x:Name="ConverterNegateButton"
                                        x:Uid="converterNegateButton"
                                        Grid.Row="5"
                                        Grid.Column="1"
diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp
index a0ca58032..d9e6d921f 100644
--- a/src/Calculator/Views/UnitConverter.xaml.cpp
+++ b/src/Calculator/Views/UnitConverter.xaml.cpp
@@ -53,7 +53,7 @@ UnitConverter::UnitConverter() :
     InitializeComponent();
 
     // adding ESC key shortcut binding to clear button
-    clearEntryButtonPos0->SetValue(Common::KeyboardShortcutManager::VirtualKeyProperty, Common::MyVirtualKey::Escape);
+    ClearEntryButtonPos0->SetValue(Common::KeyboardShortcutManager::VirtualKeyProperty, Common::MyVirtualKey::Escape);
 
     m_layoutDirection = LocalizationService::GetInstance()->GetFlowDirection();
     if (m_layoutDirection == ::FlowDirection::RightToLeft)
@@ -291,7 +291,7 @@ void UnitConverter::SetDefaultFocus()
         Value1,
         CurrencyRefreshBlockControl,
         OfflineBlock,
-        clearEntryButtonPos0
+        ClearEntryButtonPos0
     };
 
     for (Control^ control : focusPrecedence)