--- a/Messaging/Server/UI/MainWindow.xaml	Wed Mar 21 20:29:04 2012 +0000
+++ b/Messaging/Server/UI/MainWindow.xaml	Wed Mar 21 22:09:18 2012 +0000
@@ -32,9 +32,9 @@
                 <ToggleButton Grid.Row="0"
                               Grid.Column="0"
                               Margin="10,10,10,0"
-                              Content="{Binding SocketEndPoint.IsListening,
+                              Content="{Binding MsmqEndPoint.IsListening,
                                                 Converter={converters:ToggleButtonToTextConverter}}"
-                              IsChecked="{Binding SocketEndPoint.IsListening}"
+                              IsChecked="{Binding MsmqEndPoint.IsListening}"
                               IsEnabled="True"
                               IsThreeState="False" />
 
@@ -57,13 +57,13 @@
                 <c:MessageTile Grid.Row="1"
                                Grid.Column="0"
                                Background="{StaticResource MetroPurpleBrush}"
-                               DisplayCount="{Binding SocketEndPoint.DisplayCount,
+                               DisplayCount="{Binding MsmqEndPoint.DisplayCount,
                                                       Mode=TwoWay,
                                                       UpdateSourceTrigger=PropertyChanged}"
                                DisplayIcon="{StaticResource Mail}"
-                               DisplayText="{Binding SocketEndPoint.DisplayText}"
+                               DisplayText="{Binding MsmqEndPoint.DisplayText}"
                                Foreground="White"
-                               ToolTip="{Binding SocketEndPoint.ToolTip}" />
+                               ToolTip="{Binding MsmqEndPoint.ToolTip}" />
 
                 <c:MessageTile Grid.Row="1"
                                Grid.Column="1"
@@ -84,11 +84,11 @@
                                ToolTip="{Binding RabbitProtoEndPoint.ToolTip}" />
                 <ScrollViewer Grid.Row="2"
                               Grid.Column="0"
-                              Xaml:XamlHelper.AutoScroll="{Binding SocketEndPoint.IsLogChanged}">
+                              Xaml:XamlHelper.AutoScroll="{Binding MsmqEndPoint.IsLogChanged}">
                     <TextBlock Margin="10"
                                Background="{StaticResource MetroGrayBrush}"
                                Padding="10"
-                               Text="{Binding SocketEndPoint.DisplayLog}"
+                               Text="{Binding MsmqEndPoint.DisplayLog}"
                                TextWrapping="Wrap" />
                 </ScrollViewer>
                 <ScrollViewer Grid.Row="2"