diff --git a/Material.Dialog/ViewModels/DialogWindowViewModel.cs b/Material.Dialog/ViewModels/DialogWindowViewModel.cs
index d64df67..7cb1330 100644
--- a/Material.Dialog/ViewModels/DialogWindowViewModel.cs
+++ b/Material.Dialog/ViewModels/DialogWindowViewModel.cs
@@ -9,7 +9,7 @@ using Avalonia.Layout;
 
 namespace Material.Dialog.ViewModels
 {
-    public abstract class DialogWindowViewModel : ViewModelBase
+    public abstract class DialogWindowViewModel : DialogViewModelBase
     {
         #region Base Properties
         private string m_WindowTitle;
diff --git a/Material.Dialog/ViewModels/TextField/TextFieldViewModel.cs b/Material.Dialog/ViewModels/TextField/TextFieldViewModel.cs
index c33ea65..ca3fe79 100644
--- a/Material.Dialog/ViewModels/TextField/TextFieldViewModel.cs
+++ b/Material.Dialog/ViewModels/TextField/TextFieldViewModel.cs
@@ -7,7 +7,7 @@ using Avalonia.Data;
 
 namespace Material.Dialog.ViewModels.TextField
 {
-    public class TextFieldViewModel : ViewModelBase
+    public class TextFieldViewModel : DialogViewModelBase
     {
         public event EventHandler<bool> OnValidateRequired;
 
diff --git a/Material.Dialog/ViewModels/ViewModelBase.cs b/Material.Dialog/ViewModels/ViewModelBase.cs
index a33c17f..6f69b74 100644
--- a/Material.Dialog/ViewModels/ViewModelBase.cs
+++ b/Material.Dialog/ViewModels/ViewModelBase.cs
@@ -1,9 +1,9 @@
 using System.ComponentModel;
-using System.Runtime.CompilerServices; 
+using System.Runtime.CompilerServices;
 
-namespace Material.Dialog
+namespace Material.Dialog.ViewModels
 {
-    public class ViewModelBase : INotifyPropertyChanged
+    public class DialogViewModelBase : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;