diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
index 35c6b4d6..05f90d1b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
@@ -20,40 +20,40 @@ namespace Microsoft.Windows.Controls.Primitives
 
         public virtual object PreviousValue { get; internal set; }
 
-        #region DisplayText
+        #region IsEditable
+
+        public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register("IsEditable", typeof(bool), typeof(InputBase), new PropertyMetadata(true));
+        public bool IsEditable
+        {
+            get { return (bool)GetValue(IsEditableProperty); }
+            set { SetValue(IsEditableProperty, value); }
+        }
+
+        #endregion //IsEditable
+
+        #region Text
 
-        public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register("DisplayText", typeof(string), typeof(InputBase), new FrameworkPropertyMetadata(default(String), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnDisplayTextPropertyChanged));
-        public string DisplayText
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(InputBase), new FrameworkPropertyMetadata(default(String), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged));
+        public string Text
         {
-            get { return (string)this.GetValue(DisplayTextProperty); }
-            set { this.SetValue(DisplayTextProperty, value); }
+            get { return (string)this.GetValue(TextProperty); }
+            set { this.SetValue(TextProperty, value); }
         }
 
-        private static void OnDisplayTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             InputBase input = (InputBase)d;
-            input.OnDisplayTextChanged((string)e.OldValue, (string)e.NewValue);
+            input.OnTextChanged((string)e.OldValue, (string)e.NewValue);
             if (input._isInitialized)
                 input.SyncTextAndValueProperties(e.Property, e.NewValue);
         }
 
-        protected virtual void OnDisplayTextChanged(string previousValue, string currentValue)
+        protected virtual void OnTextChanged(string previousValue, string currentValue)
         {
 
         }
 
-        #endregion //DisplayText
-
-        #region IsEditable
-
-        public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register("IsEditable", typeof(bool), typeof(InputBase), new PropertyMetadata(true));
-        public bool IsEditable
-        {
-            get { return (bool)GetValue(IsEditableProperty); }
-            set { SetValue(IsEditableProperty, value); }
-        }
-
-        #endregion //IsEditable
+        #endregion //Text
 
         #region Value
 
@@ -117,7 +117,7 @@ namespace Microsoft.Windows.Controls.Primitives
         protected virtual void OnValueTypeChanged(Type oldValue, Type newType)
         {
             if (_isInitialized)
-                SyncTextAndValueProperties(DisplayTextProperty, DisplayText);
+                SyncTextAndValueProperties(TextProperty, Text);
         }
 
         #endregion //ValueType
@@ -150,12 +150,12 @@ namespace Microsoft.Windows.Controls.Primitives
             _isSyncingTextAndValueProperties = true;
 
             //this only occures when the user typed in the value
-            if (InputBase.DisplayTextProperty == p)
+            if (InputBase.TextProperty == p)
             {
                 SetValue(InputBase.ValueProperty, ConvertTextToValue(newValue.ToString()));
             }
 
-            SetValue(InputBase.DisplayTextProperty, ConvertValueToText(newValue));
+            SetValue(InputBase.TextProperty, ConvertValueToText(newValue));
 
             _isSyncingTextAndValueProperties = false;
         }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs
index 6026db0f..6cfec820 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/MaskedTextBox.cs
@@ -229,7 +229,7 @@ namespace Microsoft.Windows.Controls
 
         private void UpdateText(MaskedTextProvider provider, int position)
         {
-            DisplayText = provider.ToDisplayString();
+            Text = provider.ToDisplayString();
 
             if (TextBox != null)
                 TextBox.SelectionStart = position;
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs
index 04d2cbe3..9a8947a0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/NumericUpDown.cs
@@ -70,7 +70,7 @@ namespace Microsoft.Windows.Controls
 
         protected virtual void OnStringFormatChanged(string oldValue, string newValue)
         {
-            SyncTextAndValueProperties(NumericUpDown.DisplayTextProperty, Value);
+            SyncTextAndValueProperties(NumericUpDown.TextProperty, Value);
         }
 
         #endregion //FormatString
@@ -133,7 +133,7 @@ namespace Microsoft.Windows.Controls
             }
             catch
             {
-                TextBox.Text = DisplayText = ConvertValueToText(Value);
+                TextBox.Text = Text = ConvertValueToText(Value);
                 return Value;
             }
 
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
index aac4d182..37351fc4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -1104,7 +1104,7 @@
                                  IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                                  MinWidth="20" AcceptsReturn="False" 
                                  TextAlignment="Right" TextWrapping="NoWrap" 
-                                 Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                                 Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
                     </local:ButtonSpinner>
                 </ControlTemplate>
             </Setter.Value>
@@ -1128,7 +1128,7 @@
                              Foreground="{TemplateBinding Foreground}"
                              IsReadOnly="{Binding IsEditable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                              MinWidth="20" AcceptsReturn="False" TextWrapping="NoWrap" 
-                             Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                             Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
index 25fc8410..fb62b610 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/UpDownBase/UpDownBase.cs
@@ -72,7 +72,7 @@ namespace Microsoft.Windows.Controls
                     }
                 case Key.Enter:
                     {
-                        SyncTextAndValueProperties(InputBase.DisplayTextProperty, TextBox.Text);
+                        SyncTextAndValueProperties(UpDownBase.TextProperty, TextBox.Text);
                         break;
                     }
             }