--- a/Messaging/Server/UI/MainWindow.xaml	Wed Mar 21 22:26:48 2012 +0000
+++ b/Messaging/Server/UI/MainWindow.xaml	Thu Mar 22 08:09:41 2012 +0000
@@ -49,9 +49,9 @@
                 <ToggleButton Grid.Row="0"
                               Grid.Column="2"
                               Margin="10,10,10,0"
-                              Content="{Binding RabbitProtoEndPoint.IsListening,
+                              Content="{Binding ZeroMqEndPoint.IsListening,
                                                 Converter={converters:ToggleButtonToTextConverter}}"
-                              IsChecked="{Binding RabbitProtoEndPoint.IsListening}"
+                              IsChecked="{Binding ZeroMqEndPoint.IsListening}"
                               IsEnabled="True" />
 
                 <c:MessageTile Grid.Row="1"
@@ -77,11 +77,11 @@
                 <c:MessageTile Grid.Row="1"
                                Grid.Column="2"
                                Background="{StaticResource MetroOrangeBrush}"
-                               DisplayCount="{Binding RabbitProtoEndPoint.DisplayCount}"
+                               DisplayCount="{Binding ZeroMqEndPoint.DisplayCount}"
                                DisplayIcon="{StaticResource Mail}"
-                               DisplayText="{Binding RabbitProtoEndPoint.DisplayText}"
+                               DisplayText="{Binding ZeroMqEndPoint.DisplayText}"
                                Foreground="White"
-                               ToolTip="{Binding RabbitProtoEndPoint.ToolTip}" />
+                               ToolTip="{Binding ZeroMqEndPoint.ToolTip}" />
                 <ScrollViewer Grid.Row="2"
                               Grid.Column="0"
                               Xaml:XamlHelper.AutoScroll="{Binding MsmqEndPoint.IsLogChanged}">
@@ -102,13 +102,13 @@
                 </ScrollViewer>
                 <ScrollViewer Grid.Row="2"
                               Grid.Column="2"
-                              Xaml:XamlHelper.AutoScroll="{Binding RabbitProtoEndPoint.IsLogChanged}">
+                              Xaml:XamlHelper.AutoScroll="{Binding ZeroMqEndPoint.IsLogChanged}">
                     <TextBlock Grid.Row="2"
                                Grid.Column="2"
                                Margin="10"
                                Background="{StaticResource MetroGrayBrush}"
                                Padding="10"
-                               Text="{Binding RabbitProtoEndPoint.DisplayLog}"
+                               Text="{Binding ZeroMqEndPoint.DisplayLog}"
                                TextWrapping="WrapWithOverflow" />
                 </ScrollViewer>
                 <metro:ToggleSwitch Grid.Row="3"