diff --git a/BGS/CombatZone.cs b/BGS/CombatZone.cs
index 9d9efb5..8d405c7 100644
--- a/BGS/CombatZone.cs
+++ b/BGS/CombatZone.cs
@@ -24,7 +24,7 @@ namespace NonaBGS.BGS {
         }
 
         public override string ToString() {
-            return string.Format("Won {0} x {1} {2} Combat Zone(s)", Amount, Type, Grade);
+            return string.Format("Won {0} x {1} {2} Combat Zone(s)", Amount, Grade, Type);
         }
     }
 }
diff --git a/CombatZoneDialog.xaml b/CombatZoneDialog.xaml
index 7fc36f1..08a6bef 100644
--- a/CombatZoneDialog.xaml
+++ b/CombatZoneDialog.xaml
@@ -25,7 +25,7 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 <ComboBox x:Name="type" Grid.Column="0" VerticalAlignment="Top" Width="Auto" IsReadOnly="True" Height="23" Margin="5" SelectedIndex="0">
-                    <ComboBoxItem Content="Space"/>
+                    <ComboBoxItem Content="Ship"/>
                     <ComboBoxItem Content="On Foot"/>
                 </ComboBox>
                 <ComboBox x:Name="grade" Grid.Column="1" VerticalAlignment="Top" IsReadOnly="True" Margin="5" Height="23" Width="Auto" SelectedIndex="0">
diff --git a/README.md b/README.md
index 2d3bb39..5a40a90 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ controlled by the faction you specified in the objective.
 There is no entry in the journal if you win a combat zone. So you have to add those manually. Select
 an objective for which you wish to log a combat zone. The faction in the objective, must be the
 faction you fought for in the combat zone. Then click "Add Combat Zone Win". Select type,
-either "On Foot" for Odyssey, or "Space" for regular ones. Then select the grade (low, medium or
+either "On Foot" for Odyssey, or "Ship" for regular ones. Then select the grade (low, medium or
 high), and how many you won. Then press "Accept". Select "Cancel" to abort. You can of course remove
 the combat zone entries by selecting them, and pressing "DEL".