diff --git a/MainWindow.xaml b/MainWindow.xaml
index 0dda7d2..a54c19e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -6,8 +6,8 @@
     xmlns:local="clr-namespace:ModernWpfPlayground"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
-    xmlns:propertyPresenter2="clr-namespace:ModernWpfPlayground.PropertyPresenter2"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:propertyPresenter="clr-namespace:ModernWpfPlayground.PropertyPresenter"
     x:Name="Window"
     Title="{Binding Title}"
     Width="{Binding WindowWidth, Mode=TwoWay}"
@@ -221,23 +221,23 @@
                 </TabItem>
                 <TabItem Header="General" IsSelected="True">
                     <ui:SimpleStackPanel Margin="5" Spacing="10">
-                        <propertyPresenter2:PropertyPresenter2 Label="Theme Mode" Value="{Binding ThemeMode}" />
-                        <propertyPresenter2:PropertyPresenter2
+                        <propertyPresenter:PropertyPresenter Label="Theme Mode" Value="{Binding ThemeMode}" />
+                        <propertyPresenter:PropertyPresenter
                             Command="{Binding ShowDialogCommand}"
                             Label="Hello"
                             Symbol="x³"
                             Value="{Binding WelcomeMessage}" />
-                        <propertyPresenter2:PropertyPresenter2
+                        <propertyPresenter:PropertyPresenter
                             IsReadOnly="True"
                             Label="Hallo"
                             Symbol="x²"
                             Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
-                        <propertyPresenter2:PropertyPresenter2
+                        <propertyPresenter:PropertyPresenter
                             Label="Good bye"
                             Symbol="x²"
                             Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
-                        <propertyPresenter2:PropertyPresenter2 Label="Hello" Value="{Binding BooleanValue}" />
-                        <propertyPresenter2:PropertyPresenter2 Label="Hello">
+                        <propertyPresenter:PropertyPresenter Label="Hello" Value="{Binding BooleanValue}" />
+                        <propertyPresenter:PropertyPresenter Label="Hello">
                             <Slider
                                 AutoToolTipPlacement="TopLeft"
                                 Interval="1"
@@ -247,13 +247,13 @@
                                 TickFrequency="10"
                                 TickPlacement="BottomRight"
                                 Value="{Binding SliderTest}" />
-                        </propertyPresenter2:PropertyPresenter2>
+                        </propertyPresenter:PropertyPresenter>
                         <ui:ProgressRing
                             Width="{Binding SliderTest}"
                             Height="{Binding SliderTest}"
                             IsActive="{Binding BooleanValue}"
                             Visibility="{Binding VisibilityEnumTest}" />
-                        <propertyPresenter2:PropertyPresenter2 Label="Visi" Value="{Binding VisibilityEnumTest}" />
+                        <propertyPresenter:PropertyPresenter Label="Visi" Value="{Binding VisibilityEnumTest}" />
                         <TextBox Text="Dummy" />
                     </ui:SimpleStackPanel>
                 </TabItem>
diff --git a/PropertyPresenter2/EnumToKeyValueListConverter.cs b/PropertyPresenter/EnumToKeyValueListConverter.cs
similarity index 100%
rename from PropertyPresenter2/EnumToKeyValueListConverter.cs
rename to PropertyPresenter/EnumToKeyValueListConverter.cs
diff --git a/PropertyPresenter2/MagicSymbolControl.cs b/PropertyPresenter/MagicSymbolControl.cs
similarity index 100%
rename from PropertyPresenter2/MagicSymbolControl.cs
rename to PropertyPresenter/MagicSymbolControl.cs
diff --git a/PropertyPresenter2/MagicSymbolConverter.cs b/PropertyPresenter/MagicSymbolConverter.cs
similarity index 100%
rename from PropertyPresenter2/MagicSymbolConverter.cs
rename to PropertyPresenter/MagicSymbolConverter.cs
diff --git a/PropertyPresenter2/PropertyDataTemplateSelector.cs b/PropertyPresenter/PropertyDataTemplateSelector.cs
similarity index 100%
rename from PropertyPresenter2/PropertyDataTemplateSelector.cs
rename to PropertyPresenter/PropertyDataTemplateSelector.cs
diff --git a/PropertyPresenter2/PropertyPresenter2.xaml b/PropertyPresenter/PropertyPresenter.xaml
similarity index 99%
rename from PropertyPresenter2/PropertyPresenter2.xaml
rename to PropertyPresenter/PropertyPresenter.xaml
index 385ddfa..3c6c07f 100644
--- a/PropertyPresenter2/PropertyPresenter2.xaml
+++ b/PropertyPresenter/PropertyPresenter.xaml
@@ -1,5 +1,5 @@
 <ContentControl
-    x:Class="ModernWpfPlayground.PropertyPresenter2.PropertyPresenter2"
+    x:Class="ModernWpfPlayground.PropertyPresenter.PropertyPresenter"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/PropertyPresenter2/PropertyPresenter2.xaml.cs b/PropertyPresenter/PropertyPresenter.xaml.cs
similarity index 83%
rename from PropertyPresenter2/PropertyPresenter2.xaml.cs
rename to PropertyPresenter/PropertyPresenter.xaml.cs
index f84f648..36b0b32 100644
--- a/PropertyPresenter2/PropertyPresenter2.xaml.cs
+++ b/PropertyPresenter/PropertyPresenter.xaml.cs
@@ -3,72 +3,72 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Markup;
 
-namespace ModernWpfPlayground.PropertyPresenter2
+namespace ModernWpfPlayground.PropertyPresenter
 {
     /// <inheritdoc cref="ContentControl" />
     /// <summary>
     /// Interaction logic for PropertyPresenter.xaml
     /// </summary>
     [ContentProperty(nameof(Value))]
-    public sealed partial class PropertyPresenter2
+    public sealed partial class PropertyPresenter
     {
         /// <summary>
         ///     Button alignment property.
         /// </summary>
-        public static readonly DependencyProperty ButtonAlignmentProperty = DependencyProperty.Register(nameof(ButtonAlignment), typeof(Dock), typeof(PropertyPresenter2), new PropertyMetadata(Dock.Right));
+        public static readonly DependencyProperty ButtonAlignmentProperty = DependencyProperty.Register(nameof(ButtonAlignment), typeof(Dock), typeof(PropertyPresenter), new PropertyMetadata(Dock.Right));
 
         /// <summary>
         ///     Content of the command property.
         /// </summary>
-        public static readonly DependencyProperty CommandContentProperty = DependencyProperty.Register(nameof(CommandContent), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata("..."));
+        public static readonly DependencyProperty CommandContentProperty = DependencyProperty.Register(nameof(CommandContent), typeof(object), typeof(PropertyPresenter), new PropertyMetadata("..."));
 
         /// <summary>
         ///     Command Parameter property
         /// </summary>
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata(default(object)));
+        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(PropertyPresenter), new PropertyMetadata(default(object)));
 
         /// <summary>
         ///     Command property
         /// </summary>
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(PropertyPresenter2), new PropertyMetadata(default(ICommand)));
+        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(PropertyPresenter), new PropertyMetadata(default(ICommand)));
 
         /// <summary>
         ///     is checked property.
         /// </summary>
-        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool?), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(bool?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool?), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(bool?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
 
         /// <summary>
         ///     Is readonly property
         /// </summary>
-        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(PropertyPresenter2), new PropertyMetadata(default(bool)));
+        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(PropertyPresenter), new PropertyMetadata(default(bool)));
 
         /// <summary>
         ///     Label property
         /// </summary>
-        public static readonly DependencyProperty LabelProperty = DependencyProperty.Register(nameof(Label), typeof(string), typeof(PropertyPresenter2), new PropertyMetadata(default(string)));
+        public static readonly DependencyProperty LabelProperty = DependencyProperty.Register(nameof(Label), typeof(string), typeof(PropertyPresenter), new PropertyMetadata(default(string)));
 
         /// <summary>
         ///     label width property.
         /// </summary>
-        public static readonly DependencyProperty LabelWidthProperty = DependencyProperty.Register(nameof(LabelWidth), typeof(double), typeof(PropertyPresenter2), new PropertyMetadata(150.0));
+        public static readonly DependencyProperty LabelWidthProperty = DependencyProperty.Register(nameof(LabelWidth), typeof(double), typeof(PropertyPresenter), new PropertyMetadata(150.0));
 
         /// <summary>
         ///     Symbol Property
         /// </summary>
-        public static readonly DependencyProperty SymbolProperty = DependencyProperty.Register(nameof(Symbol), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata(default(object)));
+        public static readonly DependencyProperty SymbolProperty = DependencyProperty.Register(nameof(Symbol), typeof(object), typeof(PropertyPresenter), new PropertyMetadata(default(object)));
 
         /// <summary>
         ///     Value Property
         /// </summary>
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(nameof(Value), typeof(object), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(nameof(Value), typeof(object), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
 
         /// <summary>
         ///     Watermark Property
         /// </summary>
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(nameof(Watermark), typeof(string), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(string)));
+        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(nameof(Watermark), typeof(string), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(string)));
 
         /// <inheritdoc />
-        public PropertyPresenter2()
+        public PropertyPresenter()
         {
             InitializeComponent();
         }
diff --git a/PropertyPresenter2/TextBoxEx.cs b/PropertyPresenter/TextBoxEx.cs
similarity index 100%
rename from PropertyPresenter2/TextBoxEx.cs
rename to PropertyPresenter/TextBoxEx.cs
diff --git a/PropertyPresenter2/TextComponent.cs b/PropertyPresenter/TextComponent.cs
similarity index 100%
rename from PropertyPresenter2/TextComponent.cs
rename to PropertyPresenter/TextComponent.cs
diff --git a/PropertyPresenter2/ValueConverter.cs b/PropertyPresenter/ValueConverter.cs
similarity index 100%
rename from PropertyPresenter2/ValueConverter.cs
rename to PropertyPresenter/ValueConverter.cs