diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
index 24f9fabc..de013de3 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
@@ -61,7 +61,7 @@ namespace CalculatorApp
                 if (m_Equations != value)
                 {
                     m_Equations = value;
-                    RaisePropertyChanged("m_Equations");
+                    RaisePropertyChanged(nameof(Equations));
                 }
             }
         }
@@ -75,7 +75,7 @@ namespace CalculatorApp
                 if (m_Variables != value)
                 {
                     m_Variables = value;
-                    RaisePropertyChanged("m_Variables");
+                    RaisePropertyChanged(nameof(Variables));
                 }
             }
         }
@@ -89,7 +89,7 @@ namespace CalculatorApp
                 if (m_AvailableColors != value)
                 {
                     m_AvailableColors = value;
-                    RaisePropertyChanged("m_AvailableColors");
+                    RaisePropertyChanged(nameof(AvailableColors));
                 }
             }
         }
@@ -104,7 +104,7 @@ namespace CalculatorApp
                 if (m_IsMatchAppTheme != value)
                 {
                     m_IsMatchAppTheme = value;
-                    RaisePropertyChanged("m_IsMatchAppTheme");
+                    RaisePropertyChanged(nameof(IsMatchAppTheme));
                 }
             }
         }
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
index 27fe4406..9cd53671 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
@@ -142,7 +142,7 @@ namespace CalculatorApp
                 if (m_IsKeyGraphFeaturesVisible != value)
                 {
                     m_IsKeyGraphFeaturesVisible = value;
-                    RaisePropertyChanged("IsKeyGraphFeaturesVisible");
+                    RaisePropertyChanged(nameof(IsKeyGraphFeaturesVisible));
                 }
             }
         }
@@ -176,7 +176,7 @@ namespace CalculatorApp
                 if (m_IsMatchAppTheme != value)
                 {
                     m_IsMatchAppTheme = value;
-                    RaisePropertyChanged("IsMatchAppTheme");
+                    RaisePropertyChanged(nameof(IsMatchAppTheme));
                 }
             }
         }
@@ -190,7 +190,7 @@ namespace CalculatorApp
                 if (m_IsManualAdjustment != value)
                 {
                     m_IsManualAdjustment = value;
-                    RaisePropertyChanged("IsManualAdjustment");
+                    RaisePropertyChanged(nameof(IsManualAdjustment));
                 }
             }
         }
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs
index f81e5070..4c0f6598 100644
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cs
@@ -39,7 +39,7 @@ namespace CalculatorApp
                 if (m_viewModel != value)
                 {
                     m_viewModel = value;
-                    RaisePropertyChanged("ViewModel");
+                    RaisePropertyChanged(nameof(ViewModel));
                 }
             }
         }