diff --git a/Flow.Launcher/Resources/Controls/Card.xaml.cs b/Flow.Launcher/Resources/Controls/Card.xaml.cs
index 0ea1133db..bec639770 100644
--- a/Flow.Launcher/Resources/Controls/Card.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/Card.xaml.cs
@@ -17,26 +17,26 @@ namespace Flow.Launcher.Resources.Controls
         }
         public string Title
         {
-            get { return (string)GetValue(TitleValueProperty); }
-            set { SetValue(TitleValueProperty, value); }
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
         }
-        public static readonly DependencyProperty TitleValueProperty =
+        public static readonly DependencyProperty TitleProperty =
           DependencyProperty.Register(nameof(Title), typeof(string), typeof(Card), new PropertyMetadata(string.Empty));
 
         public string Sub
         {
-            get { return (string)GetValue(SubValueProperty); }
-            set { SetValue(SubValueProperty, value); }
+            get { return (string)GetValue(SubProperty); }
+            set { SetValue(SubProperty, value); }
         }
-        public static readonly DependencyProperty SubValueProperty =
+        public static readonly DependencyProperty SubProperty =
           DependencyProperty.Register(nameof(Sub), typeof(string), typeof(Card), new PropertyMetadata(string.Empty));
 
         public string Icon
         {
-            get { return (string)GetValue(IconValueProperty); }
-            set { SetValue(IconValueProperty, value); }
+            get { return (string)GetValue(IconProperty); }
+            set { SetValue(IconProperty, value); }
         }
-        public static readonly DependencyProperty IconValueProperty =
+        public static readonly DependencyProperty IconProperty =
           DependencyProperty.Register(nameof(Icon), typeof(string), typeof(Card), new PropertyMetadata(string.Empty));
 
         /// <summary>
diff --git a/Flow.Launcher/Resources/Controls/ExCard.xaml.cs b/Flow.Launcher/Resources/Controls/ExCard.xaml.cs
index ac9f63153..f149951f0 100644
--- a/Flow.Launcher/Resources/Controls/ExCard.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/ExCard.xaml.cs
@@ -11,26 +11,26 @@ namespace Flow.Launcher.Resources.Controls
         }
         public string Title
         {
-            get { return (string)GetValue(TitleValueProperty); }
-            set { SetValue(TitleValueProperty, value); }
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
         }
-        public static readonly DependencyProperty TitleValueProperty =
+        public static readonly DependencyProperty TitleProperty =
           DependencyProperty.Register(nameof(Title), typeof(string), typeof(ExCard), new PropertyMetadata(string.Empty));
 
         public string Sub
         {
-            get { return (string)GetValue(SubValueProperty); }
-            set { SetValue(SubValueProperty, value); }
+            get { return (string)GetValue(SubProperty); }
+            set { SetValue(SubProperty, value); }
         }
-        public static readonly DependencyProperty SubValueProperty =
+        public static readonly DependencyProperty SubProperty =
           DependencyProperty.Register(nameof(Sub), typeof(string), typeof(ExCard), new PropertyMetadata(string.Empty));
 
         public string Icon
         {
-            get { return (string)GetValue(IconValueProperty); }
-            set { SetValue(IconValueProperty, value); }
+            get { return (string)GetValue(IconProperty); }
+            set { SetValue(IconProperty, value); }
         }
-        public static readonly DependencyProperty IconValueProperty =
+        public static readonly DependencyProperty IconProperty =
           DependencyProperty.Register(nameof(Icon), typeof(string), typeof(ExCard), new PropertyMetadata(string.Empty));
 
         /// <summary>
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
index 97b997cf8..a55039bfc 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
@@ -22,21 +22,21 @@ namespace Flow.Launcher.Resources.Controls
 
         public string Keys
         {
-            get { return (string)GetValue(KeysValueProperty); }
-            set { SetValue(KeysValueProperty, value); }
+            get { return (string)GetValue(KeysProperty); }
+            set { SetValue(KeysProperty, value); }
         }
 
-        public static readonly DependencyProperty KeysValueProperty =
+        public static readonly DependencyProperty KeysProperty =
             DependencyProperty.Register(nameof(Keys), typeof(string), typeof(HotkeyDisplay),
                 new PropertyMetadata(string.Empty, keyChanged));
 
         public DisplayType Type
         {
-            get { return (DisplayType)GetValue(TypeValueProperty); }
-            set { SetValue(TypeValueProperty, value); }
+            get { return (DisplayType)GetValue(TypeProperty); }
+            set { SetValue(TypeProperty, value); }
         }
 
-        public static readonly DependencyProperty TypeValueProperty =
+        public static readonly DependencyProperty TypeProperty =
             DependencyProperty.Register(nameof(Type), typeof(DisplayType), typeof(HotkeyDisplay),
                 new PropertyMetadata(null));