diff --git a/src/Yavsc.Abstract/Chat/HubInputValidator.cs b/src/Yavsc.Abstract/Chat/HubInputValidator.cs
index 22d7ee80..e4b34941 100644
--- a/src/Yavsc.Abstract/Chat/HubInputValidator.cs
+++ b/src/Yavsc.Abstract/Chat/HubInputValidator.cs
@@ -32,7 +32,7 @@ namespace Yavsc
         {
             bool valid = ValidateStringLength(roomName,1,25);
             if (valid) valid = IsLetterOrDigit(roomName);
-            if (!valid) NotifyUser(NotificationTypes.Error, "roomName", ChatHub.InvalidRoomName);
+            if (!valid) NotifyUser(NotificationTypes.Error, "roomName", ChatHubLabels.InvalidRoomName);
             return valid;
         }
         public bool ValidateUserName (string userName)
@@ -45,14 +45,14 @@ namespace Yavsc
                     if (valid) valid = ValidateStringLength(suname, 1,12);
                     if (valid) valid = IsLetterOrDigit(userName);
             }
-            if (!valid) NotifyUser(NotificationTypes.Error, "userName" , ChatHub.InvalidUserName);
+            if (!valid) NotifyUser(NotificationTypes.Error, "userName" , ChatHubLabels.InvalidUserName);
             return valid;
         }
         public bool ValidateMessage (string message)
         {
             if (!ValidateStringLength(message, 1, 10240))
             {
-                NotifyUser(NotificationTypes.Error, "message", ChatHub.InvalidMessage);
+                NotifyUser(NotificationTypes.Error, "message", ChatHubLabels.InvalidMessage);
                 return false;
             }
             return true;
@@ -61,7 +61,7 @@ namespace Yavsc
         {
             if (!ValidateStringLength(reason, 1,240))
             {
-                NotifyUser(NotificationTypes.Error, "reason", ChatHub.InvalidReason);
+                NotifyUser(NotificationTypes.Error, "reason", ChatHubLabels.InvalidReason);
                 return false;
             }
             return true;
diff --git a/src/Yavsc.Abstract/Resources/Yavsc.ChatHub.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.Designer.cs
similarity index 96%
rename from src/Yavsc.Abstract/Resources/Yavsc.ChatHub.Designer.cs
rename to src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.Designer.cs
index 915867cd..bdfc3776 100644
--- a/src/Yavsc.Abstract/Resources/Yavsc.ChatHub.Designer.cs
+++ b/src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.Designer.cs
@@ -16,7 +16,7 @@ namespace Yavsc {
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public partial class ChatHub {
+    public partial class ChatHubLabels {
         
         private static System.Resources.ResourceManager resourceMan;
         
@@ -26,7 +26,7 @@ namespace Yavsc {
         public static System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.Equals(null, resourceMan)) {
-                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Abstract.Resources." + "Yavsc.ChatHub"), typeof(ChatHub).GetTypeInfo().Assembly);
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Abstract.Resources." + "Yavsc.ChatHub"), typeof(ChatHubLabels).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/Yavsc.Abstract/Resources/Yavsc.ChatHub.en.resx b/src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.en.resx
similarity index 100%
rename from src/Yavsc.Abstract/Resources/Yavsc.ChatHub.en.resx
rename to src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.en.resx
diff --git a/src/Yavsc.Abstract/Resources/Yavsc.ChatHub.resx b/src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.resx
similarity index 100%
rename from src/Yavsc.Abstract/Resources/Yavsc.ChatHub.resx
rename to src/Yavsc.Abstract/Resources/Yavsc.ChatHubLabels.resx