diff --git a/bin/tick_spies.pl b/bin/tick_spies.pl
index 613f8f50..de3551f3 100644
--- a/bin/tick_spies.pl
+++ b/bin/tick_spies.pl
@@ -18,7 +18,7 @@ my $start = time;
 out('Loading DB');
 our $db = Lacuna->db;
 
-out('Ticking planets');
+out('Ticking spies');
 my $spies = $db->resultset('Lacuna::DB::Result::Spies');
 while (my $spy = $spies->next) {
     out('Ticking '.$spy->name);
@@ -28,7 +28,7 @@ while (my $spy = $spies->next) {
         $spy->empire->send_predefined_message(
             tags        => ['Intelligence'],
             filename    => 'ready_for_assignment.txt',
-            params      => [$spy->name],
+            params      => [$spy->name, $spy->from_body->id, $spy->from_body->name],
         );
     }
 }
diff --git a/lib/Lacuna/DB/Result/Alliance.pm b/lib/Lacuna/DB/Result/Alliance.pm
index ec609cdf..813077d9 100644
--- a/lib/Lacuna/DB/Result/Alliance.pm
+++ b/lib/Lacuna/DB/Result/Alliance.pm
@@ -84,7 +84,7 @@ sub send_invite {
         from        => $self->leader,
         tags        => ['Correspondence'],
         filename    => 'alliance_invite.txt',
-        params      => [$self->name, $message],
+        params      => [$self->id, $self->name, $message],
     );
     return $invite;
 }
@@ -103,7 +103,7 @@ sub withdraw_invite {
         from        => $self->leader,
         tags        => ['Correspondence'],
         filename    => 'alliance_withdraw_invite.txt',
-        params      => [$self->name, $message],
+        params      => [$self->id, $self->name, $message],
     );
 }
 
diff --git a/lib/Lacuna/DB/Result/Building/Archaeology.pm b/lib/Lacuna/DB/Result/Building/Archaeology.pm
index 01c5bb99..a25fd956 100644
--- a/lib/Lacuna/DB/Result/Building/Archaeology.pm
+++ b/lib/Lacuna/DB/Result/Building/Archaeology.pm
@@ -105,7 +105,7 @@ before finish_work => sub {
         $empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'glyph_discovered.txt',
-            params      => [$body->name, $ore],
+            params      => [$body->id, $body->name, $ore],
             attachments => {
                 image => {
                     title   => $ore,
diff --git a/lib/Lacuna/DB/Result/Building/Embassy.pm b/lib/Lacuna/DB/Result/Building/Embassy.pm
index 39046d57..c32a7d50 100644
--- a/lib/Lacuna/DB/Result/Building/Embassy.pm
+++ b/lib/Lacuna/DB/Result/Building/Embassy.pm
@@ -161,7 +161,7 @@ sub expel_member {
         from        => $alliance->leader,
         tags        => ['Correspondence'],
         filename    => 'alliance_expelled.txt',
-        params      => [$alliance->name, $message, $alliance->name],
+        params      => [$alliance->id, $alliance->name, $message, $alliance->name],
     );
 }
 
diff --git a/lib/Lacuna/DB/Result/Building/Intelligence.pm b/lib/Lacuna/DB/Result/Building/Intelligence.pm
index 3d0ff83d..1f94a625 100644
--- a/lib/Lacuna/DB/Result/Building/Intelligence.pm
+++ b/lib/Lacuna/DB/Result/Building/Intelligence.pm
@@ -179,7 +179,7 @@ sub train_spy {
         $empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'training_accident.txt',
-            params      => [$self->body->name],
+            params      => [$self->body->id, $self->body->name],
         );
         $self->body->add_news(20,'A source inside %s confided that they lost a brave soul in a training accident today.', $empire->name);
     }
diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm
index 773d2f36..2397d993 100644
--- a/lib/Lacuna/DB/Result/Empire.pm
+++ b/lib/Lacuna/DB/Result/Empire.pm
@@ -560,7 +560,7 @@ sub add_probe {
     
     # send notifications
     # this could be a performance problem in the future depending upon the number of probes in a star system
-    my $star_name = Lacuna->db->resultset('Lacuna::DB::Result::Map::Star')->find($star_id)->name;
+    my $star = Lacuna->db->resultset('Lacuna::DB::Result::Map::Star')->find($star_id);
     my $probes = Lacuna->db->resultset('Lacuna::DB::Result::Probes')->search({ star_id => $star_id, empire_id => {'!=', $self->id } });
     while (my $probe = $probes->next) {
         my $that_empire = $probe->empire;
@@ -569,7 +569,7 @@ sub add_probe {
             filename    => 'probe_detected.txt',
             tags        => ['Alert'],
             from        => $that_empire,
-            params      => [$star_name, $self->id, $self->name],
+            params      => [$star->x, $star->y, $star->name, $self->id, $self->name],
         );
     }
     
diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet.pm b/lib/Lacuna/DB/Result/Map/Body/Planet.pm
index db48d0a1..59e540cd 100644
--- a/lib/Lacuna/DB/Result/Map/Body/Planet.pm
+++ b/lib/Lacuna/DB/Result/Map/Body/Planet.pm
@@ -1462,7 +1462,7 @@ sub spend_food {
         if (!$empire->skip_resource_warnings && $empire->university_level > 2 && !$empire->check_for_repeat_message('complaint_food_diversity')) {
             $empire->send_predefined_message(
                 filename    => 'complaint_food_diversity.txt',
-                params      => [$self->name],
+                params      => [$self->id, $self->name],
                 repeat_check=> 'complaint_food_diversity',
                 tags        => ['Alert'],
             );
@@ -1560,7 +1560,7 @@ sub add_waste {
         if (!$empire->skip_pollution_warnings && $empire->university_level > 2 && !$empire->check_for_repeat_message('complaint_pollution')) {
             $empire->send_predefined_message(
                 filename    => 'complaint_pollution.txt',
-                params      => [$self->name],
+                params      => [$self->id, $self->name],
                 repeat_check=> 'complaint_pollution',
                 tags        => ['Alert'],
             );
@@ -1590,7 +1590,7 @@ sub spend_waste {
             if ($building_name && !$empire->skip_resource_warnings) {
                 $empire->send_predefined_message(
                     filename    => 'complaint_lack_of_waste.txt',
-                    params      => [$building_name, $self->name, $building_name],
+                    params      => [$building_name, $self->id, $self->name, $building_name],
                     repeat_check=> 'complaint_lack_of_waste',
                     tags        => ['Alert'],
                 );
@@ -1619,7 +1619,7 @@ sub complain_about_lack_of_resources {
         if ($building_name && !$empire->skip_resource_warnings) {
             $empire->send_predefined_message(
                 filename    => 'complaint_lack_of_'.$resource.'.txt',
-                params      => [$self->name, $building_name],
+                params      => [$self->id, $self->name, $building_name],
                 repeat_check=> 'complaint_lack_of_'.$resource,
                 tags        => ['Alert'],
             );
diff --git a/lib/Lacuna/DB/Result/Ships.pm b/lib/Lacuna/DB/Result/Ships.pm
index cc8a8187..f39595e0 100644
--- a/lib/Lacuna/DB/Result/Ships.pm
+++ b/lib/Lacuna/DB/Result/Ships.pm
@@ -307,12 +307,12 @@ sub trigger_defense {
         $self->body->empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'ship_shot_down.txt',
-            params      => [$self->type_formatted, $body_attacked->name],
+            params      => [$self->type_formatted, $body_attacked->x, $body_attacked->y, $body_attacked->name, $self->body->id, $self->body->name],
         );
         $body_attacked->empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'we_shot_down_a_ship.txt',
-            params      => [$self->type_formatted, $body_attacked->name, $self->body->empire_id, $self->body->empire->name],
+            params      => [$self->type_formatted, $body_attacked->id, $body_attacked->name, $self->body->empire_id, $self->body->empire->name],
         );
         $body_attacked->add_news(20, sprintf('An amateur astronomer witnessed an explosion in the sky today over %s.',$body_attacked->name));
         $self->delete;
@@ -340,12 +340,12 @@ sub damage_building {
     $self->body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'our_ship_hit_building.txt',
-        params      => [$self->type_formatted, $body_attacked->name, $building->name],
+        params      => [$self->type_formatted, $body_attacked->x, $body_attacked->y, $body_attacked->name, $building->name],
     );
     $body_attacked->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_hit_building.txt',
-        params      => [$self->type_formatted, $body_attacked->name, $self->body->empire_id, $self->body->empire->name],
+        params      => [$self->type_formatted, $building->name, $body_attacked->id, $body_attacked->name, $self->body->empire_id, $self->body->empire->name],
     );
     $body_attacked->add_news(70, sprintf('An attack ship screamed out of the sky and damaged the %s on %s.',$building->name, $body_attacked->name));
     $self->delete;
diff --git a/lib/Lacuna/DB/Result/Ships/ColonyShip.pm b/lib/Lacuna/DB/Result/Ships/ColonyShip.pm
index a67d2270..90814433 100644
--- a/lib/Lacuna/DB/Result/Ships/ColonyShip.pm
+++ b/lib/Lacuna/DB/Result/Ships/ColonyShip.pm
@@ -38,7 +38,7 @@ sub arrive {
                 $empire->send_predefined_message(
                     tags        => ['Alert'],
                     filename    => 'cannot_colonize.txt',
-                    params      => [$planet->name, $planet->name],
+                    params      => [$planet->x, $planet->y, $planet->name, $planet->name],
                 );
             }
         }
diff --git a/lib/Lacuna/DB/Result/Ships/Detonator.pm b/lib/Lacuna/DB/Result/Ships/Detonator.pm
index 8daf973d..803b037b 100644
--- a/lib/Lacuna/DB/Result/Ships/Detonator.pm
+++ b/lib/Lacuna/DB/Result/Ships/Detonator.pm
@@ -30,14 +30,14 @@ sub arrive {
         $probe->empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'probe_detonated.txt',
-            params      => [$self->foreign_star->name, $self->body->empire_id, $self->body->empire->name],
+            params      => [$self->foreign_star->x, $self->foreign_star->y, $self->foreign_star->name, $self->body->empire_id, $self->body->empire->name],
         );
         $count++;
     }
     $self->body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'detonator_destroyed_probes.txt',
-        params      => [$count, $self->foreign_star->name],
+        params      => [$count, $self->foreign_star->x, $self->foreign_star->y, $self->foreign_star->name],
     );
     $self->delete;
 }
diff --git a/lib/Lacuna/DB/Result/Ships/Excavator.pm b/lib/Lacuna/DB/Result/Ships/Excavator.pm
index 9eb94e67..75b5d78c 100644
--- a/lib/Lacuna/DB/Result/Ships/Excavator.pm
+++ b/lib/Lacuna/DB/Result/Ships/Excavator.pm
@@ -35,7 +35,7 @@ sub arrive {
         $empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'plan_discovered_by_excavator.txt',
-            params      => [$remote_body->name, ($plan->level + $plan->extra_build_level), $class->name, $body->name],
+            params      => [$remote_body->x, $remote_body->y, $remote_body->name, ($plan->level + $plan->extra_build_level), $class->name, $body->id, $body->name],
         );
     }
     elsif ($find < 16) {
@@ -44,7 +44,7 @@ sub arrive {
         $empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'glyph_discovered_by_excavator.txt',
-            params      => [$remote_body->name, $ore, $body->name],
+            params      => [$remote_body->x, $remote_body->y, $remote_body->name, $ore, $body->id, $body->name],
             attachments => {
                 image => {
                     title   => $ore,
@@ -62,14 +62,14 @@ sub arrive {
         $empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'resources_discovered_by_excavator.txt',
-            params      => [$remote_body->name, $amount, $type, $body->name],
+            params      => [$remote_body->x, $remote_body->y, $remote_body->name, $amount, $type, $body->id, $body->name],
         );
     }
     else {
         $empire->send_predefined_message(
             tags        => ['Correspondence'],
             filename    => 'glyph_not_discovered_by_excavator.txt',
-            params      => [$remote_body->name, $body->name],
+            params      => [$remote_body->x, $remote_body->y, $remote_body->name, $body->id, $body->name],
         );
     }
     $self->delete;
diff --git a/lib/Lacuna/DB/Result/Ships/MiningPlatformShip.pm b/lib/Lacuna/DB/Result/Ships/MiningPlatformShip.pm
index 7e3cdb92..96a3fc77 100644
--- a/lib/Lacuna/DB/Result/Ships/MiningPlatformShip.pm
+++ b/lib/Lacuna/DB/Result/Ships/MiningPlatformShip.pm
@@ -34,16 +34,17 @@ sub arrive {
             $self->turn_around;
         }
         my $empire = $body->empire;
-        my $can = eval{$ministry->can_add_platform($self->foreign_body)};
+        my $foreign_body = $self->foreign_body;
+        my $can = eval{$ministry->can_add_platform($foreign_body)};
         if ($can && !$@) {
-            $ministry->add_platform($self->foreign_body)->update;
+            $ministry->add_platform($foreign_body)->update;
             $empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'mining_platform_deployed.txt',
-                params      => [$body->name, $self->foreign_body->name, $self->name],
+                params      => [$body->id, $body->name, $foreign_body->x, $foreign_body->y, $foreign_body->name, $self->name],
             );
             $self->delete;
-            my $type = ref $self->foreign_body;
+            my $type = ref $foreign_body;
             $type =~ s/^.*::(\w\d+)$/$1/;
             $empire->add_medal($type);
         }
@@ -52,7 +53,7 @@ sub arrive {
             $empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'cannot_deploy_mining_platform.txt',
-                params      => [$@->[1], $body->name, $self->name],
+                params      => [$@->[1], $foreign_body->x, $foreign_body->y, $foreign_body->name, $body->id, $body->name, $self->name],
             );
         }
     }
diff --git a/lib/Lacuna/DB/Result/Ships/Scanner.pm b/lib/Lacuna/DB/Result/Ships/Scanner.pm
index c8d52abb..cdc3d643 100644
--- a/lib/Lacuna/DB/Result/Ships/Scanner.pm
+++ b/lib/Lacuna/DB/Result/Ships/Scanner.pm
@@ -38,7 +38,7 @@ sub arrive {
         $self->body->empire->send_predefined_message(
             tags        => ['Alert'],
             filename    => 'scanner_data.txt',
-            params      => [$body_attacked->name],
+            params      => [$body_attacked->x, $body_attacked->y, $body_attacked->name],
             attachments  => {
                 map => {
                     surface         => $body_attacked->surface,
@@ -50,7 +50,7 @@ sub arrive {
             $body_attacked->empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'we_were_scanned.txt',
-                params      => [$body_attacked->name, $self->body->empire_id, $self->body->empire->name],
+                params      => [$body_attacked->id, $body_attacked->name, $self->body->empire_id, $self->body->empire->name],
             );
             $body_attacked->add_news(65, sprintf('Several people reported seeing a UFO in the %s sky today.', $body_attacked->name));
         }
diff --git a/lib/Lacuna/DB/Result/Ships/Scow.pm b/lib/Lacuna/DB/Result/Ships/Scow.pm
index e525dd94..bae88ceb 100644
--- a/lib/Lacuna/DB/Result/Ships/Scow.pm
+++ b/lib/Lacuna/DB/Result/Ships/Scow.pm
@@ -34,12 +34,12 @@ sub arrive {
             $self->body->empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'our_scow_hit.txt',
-                params      => [$body_attacked->name, $self->hold_size],
+                params      => [$body_attacked->x, $body_attacked->y, $body_attacked->name, $self->hold_size],
             );
             $body_attacked->empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'hit_by_scow.txt',
-                params      => [$self->body->empire_id, $self->body->empire->name, $body_attacked->name, $self->hold_size],
+                params      => [$self->body->empire_id, $self->body->empire->name, $body_attacked->id, $body_attacked->name, $self->hold_size],
             );
             $body_attacked->add_news(30, sprintf('%s is so polluted that waste seems to be falling from the sky.', $body_attacked->name));
             $self->delete;
diff --git a/lib/Lacuna/DB/Result/Ships/ShortRangeColonyShip.pm b/lib/Lacuna/DB/Result/Ships/ShortRangeColonyShip.pm
index 4aafbc89..127b5c93 100644
--- a/lib/Lacuna/DB/Result/Ships/ShortRangeColonyShip.pm
+++ b/lib/Lacuna/DB/Result/Ships/ShortRangeColonyShip.pm
@@ -38,7 +38,7 @@ sub arrive {
                 $empire->send_predefined_message(
                     tags        => ['Alert'],
                     filename    => 'cannot_colonize.txt',
-                    params      => [$planet->name, $planet->name],
+                    params      => [$planet->x, $planet->y, $planet->name, $planet->name],
                 );
             }
         }
diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm
index d4cbf01b..3f47bb8c 100644
--- a/lib/Lacuna/DB/Result/Spies.pm
+++ b/lib/Lacuna/DB/Result/Spies.pm
@@ -339,7 +339,7 @@ sub get_spooked {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'narrow_escape.txt',
-        params      => [$self->on_body->empire->name, $self->name],
+        params      => [$self->on_body->empire->name, $self->name, $self->from_body->id, $self->from_body->name],
     );
 }
 
@@ -348,7 +348,7 @@ sub thwart_a_spy {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_missed_a_spy.txt',
-        params      => [$self->on_body->name, $self->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $self->format_from],
         from        => $self->empire,
     );
     return $suspect->get_spooked;
@@ -367,7 +367,7 @@ sub escape {
     return $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'i_have_escaped.txt',
-        params      => [$self->on_body->empire->name, $self->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
     );
 }
 
@@ -390,19 +390,30 @@ sub capture_a_spy {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_captured_a_spy.txt',
-        params      => [$self->on_body->name, $self->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $self->format_from($self->on_body->empire_id)],
         from        => $self->empire,
     );
     return $prisoner->go_to_jail;
 }
 
+sub format_from {
+    my ($self, $empire_id) = @_;
+    $empire_id ||= $self->empire_id;
+    if ($empire_id == $self->from_body->empire_id) {
+        return sprintf '%s of {Planet %s %s}', $self->name, $self->from_body->id, $self->from_body->name;
+    }
+    else {
+        return sprintf '%s of {Starmap %s %s %s}', $self->name, $self->from_body->x, $self->from_body->y, $self->from_body->name;
+    }
+}
+
 sub turn {
     my ($self, $new_home) = @_;
     $self->times_turned( $self->times_turned + 1 );
     my $message = $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'goodbye.txt',
-        params      => [$self->name],
+        params      => [$self->name, $self->from_body->id, $self->from_body->name],
     );
     $self->task('Idle');
     $self->empire_id($new_home->empire_id);
@@ -416,7 +427,7 @@ sub turn_a_spy {
     $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'new_recruit.txt',
-        params      => [$traitor->empire->name, $traitor->name, $self->name],
+        params      => [$traitor->empire->id, $traitor->empire->name, $traitor->name, $self->name, $self->from_body->id, $self->from_body->name],
     );
     return $traitor->turn($self->from_body);
 }
@@ -446,7 +457,7 @@ sub killed_in_action {
     return $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'spy_killed.txt',
-        params      => [$self->name, $self->on_body->name],
+        params      => [$self->name, $self->from_body->id, $self->from_body->name, $self->on_body->x, $self->on_body->y, $self->on_body->name],
     );
 }
 
@@ -456,7 +467,7 @@ sub kill_a_spy {
     $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_killed_a_spy.txt',
-        params      => [$self->on_body->name, $self->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $self->format_from],
         from        => $self->empire,
     );
     return $dead->killed_in_action;
@@ -736,12 +747,12 @@ sub uprising {
     my $message = $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_incited_a_rebellion.txt',
-        params      => [$self->on_body->empire->name, $self->on_body->name, $loss, $self->name],
+        params      => [$self->on_body->empire_id, $self->on_body->empire->name, $self->on_body->x, $self->on_body->y, $self->on_body->name, $loss, $self->format_from],
     );
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'uprising.txt',
-        params      => [$self->name, $self->on_body->name, $loss],
+        params      => [$self->name, $self->on_body->id, $self->on_body->name, $loss],
     );
     $self->on_body->add_news(100,'Led by %s, the citizens of %s are rebelling against %s.', $self->name, $self->on_body->name, $self->on_body->empire->name);
     return $message->id;
@@ -754,7 +765,7 @@ sub knock_defender_unconscious {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'knocked_out_a_defender.txt',
-        params      => [$self->name],
+        params      => [$self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -906,7 +917,7 @@ sub destroy_infrastructure {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'building_kablooey.txt',
-        params      => [$building->level, $building->name, $self->on_body->name],
+        params      => [$building->level, $building->name, $self->on_body->id, $self->on_body->name],
     );
     $self->things_destroyed( $self->things_destroyed + 1 );
     $self->on_body->add_news(90,'%s was rocked today when the %s exploded, sending people scrambling for their lives.', $self->on_body->name, $building->name);
@@ -914,7 +925,7 @@ sub destroy_infrastructure {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'sabotage_report.txt',
-        params      => ['their level '.($building->level).' '.$building->name, $self->on_body->name, $self->name],
+        params      => ['their level '.($building->level).' '.$building->name, $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -928,13 +939,13 @@ sub destroy_infrastructure {
 #    $self->on_body->empire->send_predefined_message(
 #        tags        => ['Alert'],
 #        filename    => 'building_kablooey.txt',
-#        params      => [$building->level + 1, $building->name, $self->on_body->name],
+#        params      => [$building->level + 1, $building->name, $self->on_body->id, $self->on_body->name],
 #    );
 #    $self->things_destroyed( $self->things_destroyed + 1 );
 #    $self->empire->send_predefined_message(
 #        tags        => ['Intelligence'],
 #        filename    => 'sabotage_report.txt',
-#        params      => ['a level of their level '.($building->level + 1).' '.$building->name, $self->on_body->name, $self->name],
+#        params      => ['a level of their level '.($building->level + 1).' '.$building->name, $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
 #    );
 #    $self->on_body->add_news(90,'%s was rocked today when a construction crane toppled into the %s.', $self->on_body->name, $building->name);
 #    if ($building->level == 0) {
@@ -960,12 +971,12 @@ sub destroy_ship {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_blew_up_at_port.txt',
-        params      => [$ship->type_formatted, $self->on_body->name],
+        params      => [$ship->type_formatted, $self->on_body->id, $self->on_body->name],
     );
     my $message = $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'sabotage_report.txt',
-        params      => [$ship->type_formatted, $self->on_body->name, $self->name],
+        params      => [$ship->type_formatted, $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
     );
     $self->on_body->add_news(90,'Today officials on %s are investigating the explosion of a %s at the Space Port.', $self->on_body->name, $ship->type_formatted);
     $ship->delete;
@@ -986,14 +997,14 @@ sub destroy_mining_ship {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_blew_up_at_port.txt',
-        params      => ['mining cargo ship',$self->on_body->name],
+        params      => ['mining '.$ship->type_formatted, $self->on_body->id, $self->on_body->name],
     );
     $self->things_destroyed( $self->things_destroyed + 1 );
     $self->on_body->add_news(90,'Today, officials on %s are investigating the explosion of a mining cargo ship at the Space Port.', $self->on_body->name);
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'sabotage_report.txt',
-        params      => ['mining cargo ship', $self->on_body->name, $self->name],
+        params      => ['mining cargo ship', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -1064,14 +1075,14 @@ sub steal_resources {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_stolen.txt',
-        params      => [$ship->type_formatted, $self->on_body->name],
+        params      => [$ship->type_formatted, $self->on_body->id, $self->on_body->name],
         attachments=> { table => \@table},
     );
     $self->on_body->add_news(50,'In a daring robbery today a thief absconded with a %s full of resources from %s.', $ship->type_formatted, $self->on_body->name);
     return $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_theft_report.txt',
-        params      => [$ship->type_formatted, $self->name],
+        params      => [$ship->type_formatted, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@table},
     )->id;
 }
@@ -1098,13 +1109,13 @@ sub steal_ships {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_stolen.txt',
-        params      => [$ship->type_formatted, $self->on_body->name],
+        params      => [$ship->type_formatted, $self->on_body->id, $self->on_body->name],
     );
     $self->on_body->add_news(50,'In a daring robbery a thief absconded with a %s from %s today.', $ship->type_formatted, $self->on_body->name);
     return $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'ship_theft_report.txt',
-        params      => [$ship->type_formatted, $self->name],
+        params      => [$ship->type_formatted, $self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -1122,7 +1133,7 @@ sub steal_building {
     return $self->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'building_theft_report.txt',
-        params      => [$level, $building->name, $self->name],
+        params      => [$level, $building->name, $self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -1164,7 +1175,7 @@ sub shut_down_building {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'building_loss_of_power.txt',
-        params      => [$building->name, $self->on_body->name],
+        params      => [$building->name, $self->on_body->id, $self->on_body->name],
     );
     $building->body($self->on_body);
     $building->spend_efficiency($self->level)->update;
@@ -1172,7 +1183,7 @@ sub shut_down_building {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_disabled_a_building.txt',
-        params      => [$building->name, $self->on_body->name, $self->name],
+        params      => [$building->name, $self->on_body->name, $self->format_from],
     )->id;
 }
 
@@ -1184,13 +1195,13 @@ sub take_control_of_probe {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'probe_destroyed.txt',
-        params      => [$probe->star->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name],
     );
     $self->on_body->add_news(25,'%s scientists say they have lost control of a research satellite in the %s system.', $self->on_body->empire->name, $probe->star->name);    
     my $message = $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_have_taken_control_of_a_probe.txt',
-        params      => [$probe->star->name, $probe->empire->name, $self->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name, $probe->empire_id, $probe->empire->name, $self->format_from],
     );
     $probe->body_id($self->from_body_id);
     $probe->empire_id($self->empire_id);
@@ -1210,14 +1221,14 @@ sub kill_contact_with_mining_platform {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'we_lost_contact_with_a_mining_platform.txt',
-        params      => [$asteroid->name],
+        params      => [$asteroid->x, $asteroid->y, $asteroid->name],
     );
     $self->things_destroyed( $self->things_destroyed + 1 );
     $self->on_body->add_news(50,'The %s controlled mining outpost on %s went dark. Our thoughts are with the miners.', $self->on_body->empire->name, $asteroid->name);    
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_disabled_a_mining_platform.txt',
-        params      => [$asteroid->name, $self->on_body->empire->name, $self->name],
+        params      => [$asteroid->x, $asteroid->y, $asteroid->name, $self->on_body->empire->id, $self->on_body->empire->name, $self->format_from],
     )->id;
 }
 
@@ -1229,12 +1240,12 @@ sub hack_observatory_probes {
     my $message = $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_destroyed_a_probe.txt',
-        params      => [$probe->star->name, $probe->empire->name, $self->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name, $probe->empire->id, $probe->empire->name, $self->format_from],
     );
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'probe_destroyed.txt',
-        params      => [$probe->star->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name],
     );
     $probe->delete;
     $self->on_body->add_news(25,'%s scientists say they have lost control of a research satellite in the %s system.', $self->on_body->empire->name, $probe->star->name);    
@@ -1251,13 +1262,13 @@ sub hack_offending_probes {
     $defender->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_destroyed_a_probe.txt',
-        params      => [$probe->star->name, $probe->empire->name, $defender->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name, $probe->empire->id, $probe->empire->name, $defender->format_from],
     );
     $self->on_body->add_news(25,'%s scientists say they have lost control of a research satellite in the %s system.', $probe->empire->name, $self->on_body->star->name);    
     my $message = $probe->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'probe_destroyed.txt',
-        params      => [$probe->star->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name],
     );
     $probe->delete;
     return $message->id;
@@ -1271,13 +1282,13 @@ sub hack_local_probes {
     $self->on_body->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'probe_destroyed.txt',
-        params      => [$probe->star->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name],
     );
     $self->on_body->add_news(25,'%s scientists say they have lost control of a research probe in the %s system.', $self->on_body->empire->name, $self->on_body->star->name);    
     my $message = $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'we_destroyed_a_probe.txt',
-        params      => [$probe->star->name, $probe->empire->name, $self->name],
+        params      => [$probe->star->x, $probe->star->y, $probe->star->name, $probe->empire->id, $probe->empire->name, $self->format_from],
     );
     $probe->delete;
     return $message->id;
@@ -1298,7 +1309,7 @@ sub colony_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Colony Report', $self->on_body->name, $self->name],
+        params      => ['Colony Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments=> { table => \@report},
     )->id;
 }
@@ -1317,7 +1328,7 @@ sub surface_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Surface Report', $self->on_body->name, $self->name],
+        params      => ['Surface Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments  => { map => {
             surface         => $self->on_body->surface,
             buildings       => \@map
@@ -1339,7 +1350,7 @@ sub spy_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Spy Report', $self->on_body->name, $self->name],
+        params      => ['Spy Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments=> { table => \@peeps},
     )->id;
 }
@@ -1358,7 +1369,7 @@ sub economic_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Economic Report', $self->on_body->name, $self->name],
+        params      => ['Economic Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@resources},
     )->id;
 }
@@ -1387,7 +1398,7 @@ sub travel_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Travel Report', $self->on_body->name, $self->name],
+        params      => ['Travel Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@travelling},
     )->id;
 }
@@ -1402,7 +1413,7 @@ sub ship_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Docked Ships Report', $self->on_body->name, $self->name],
+        params      => ['Docked Ships Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@ships},
     )->id;
 }
@@ -1421,7 +1432,7 @@ sub build_queue_report {
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Build Queue Report', $self->on_body->name, $self->name],
+        params      => ['Build Queue Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@report},
     )->id;
 }
@@ -1436,7 +1447,7 @@ sub false_interrogation_report {
     $defender->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Interrogation Report', $self->on_body->name, $defender->name],
+        params      => ['Interrogation Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => [
             ['Question', 'Response'],
             ['Name', $suspect->name],
@@ -1463,12 +1474,12 @@ sub false_interrogation_report {
     $suspect->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'false_interrogation.txt',
-        params      => [$self->on_body->name, $suspect->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $suspect->name, $suspect_home->id, $suspect_home->name],
     );
     return $self->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'interrogating_prisoners_failing.txt',
-        params      => [$self->on_body->name, $suspect->name, $self->name],
+        params      => [$self->on_body->x, $self->on_body->y, $self->on_body->name, $suspect->name, $self->name, $self->from_body->id, $self->from_body->name],
     )->id;
 }
 
@@ -1482,7 +1493,7 @@ sub interrogation_report {
     $defender->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Interrogation Report', $self->on_body->name, $defender->name],
+        params      => ['Interrogation Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => [
             ['Question', 'Response'],
             ['Name', $suspect->name],
@@ -1565,7 +1576,7 @@ sub counter_intel_report {
     $defender->empire->send_predefined_message(
         tags        => ['Intelligence'],
         filename    => 'intel_report.txt',
-        params      => ['Counter Intelligence Report', $self->on_body->name, $defender->name],
+        params      => ['Counter Intelligence Report', $self->on_body->x, $self->on_body->y, $self->on_body->name, $self->name, $self->from_body->id, $self->from_body->name],
         attachments => { table => \@peeps},
     );
     return undef;
diff --git a/lib/Lacuna/RPC/Building/Intelligence.pm b/lib/Lacuna/RPC/Building/Intelligence.pm
index 5d234269..60066861 100644
--- a/lib/Lacuna/RPC/Building/Intelligence.pm
+++ b/lib/Lacuna/RPC/Building/Intelligence.pm
@@ -115,7 +115,7 @@ sub burn_spy {
             $spy->empire->send_predefined_message(
                 tags        => ['Alert'],
                 filename    => 'id_like_to_join_you.txt',
-                params      => [$empire->id, $empire->name, $spy->name],
+                params      => [$empire->id, $empire->name, $spy->name, $spy->on_body->id, $spy->on_body->name],
             );
         }
         else {
diff --git a/lib/Lacuna/RPC/Building/Security.pm b/lib/Lacuna/RPC/Building/Security.pm
index a5f105f4..9eb056f2 100644
--- a/lib/Lacuna/RPC/Building/Security.pm
+++ b/lib/Lacuna/RPC/Building/Security.pm
@@ -59,7 +59,7 @@ sub execute_prisoner {
         from        => $empire,
         tags        => ['Alert'],
         filename    => 'spy_executed.txt',
-        params      => [$prisoner->name, $body->name, $empire->name],
+        params      => [$prisoner->name, $prisoner->from_body->id, $prisoner->from_body->name, $body->x, $body->y, $body->name, $empire->id, $empire->name],
     );
     $prisoner->delete;
     return {
@@ -78,16 +78,17 @@ sub release_prisoner {
     unless (!$prisoner->is_available && $prisoner->task eq 'Captured' && $prisoner->on_body_id == $building->body_id) {
         confess [1010,'That person is not a prisoner.'];
     }
+    my $body = $building->body;
     $prisoner->task('Idle');
     $prisoner->available_on(DateTime->now);
     $prisoner->update;
     $prisoner->empire->send_predefined_message(
         tags        => ['Alert'],
         filename    => 'spy_released.txt',
-        params      => [$empire->name, $building->body->name, $prisoner->name],
+        params      => [$empire->id, $empire->name, $body->x, $body->y, $body->name, $prisoner->name, $prisoner->from_body->id, $prisoner->from_body->name],
     );
     return {
-        status                  => $self->format_status($empire, $building->body),
+        status                  => $self->format_status($empire, $body),
     }
 }
 
diff --git a/var/messages/alliance_expelled.txt b/var/messages/alliance_expelled.txt
index 9415bf9b..8721e8aa 100644
--- a/var/messages/alliance_expelled.txt
+++ b/var/messages/alliance_expelled.txt
@@ -1,6 +1,6 @@
 Expulsion
 ~~~
-Your membership in %s has been revoked.
+Your membership in {Alliance %s %s} has been revoked.
 
 %s
 
diff --git a/var/messages/alliance_invite.txt b/var/messages/alliance_invite.txt
index 95589ca7..eb881cd4 100644
--- a/var/messages/alliance_invite.txt
+++ b/var/messages/alliance_invite.txt
@@ -1,6 +1,6 @@
 Invitation
 ~~~
-We would like to formally invite you to join %s.
+We would like to formally invite you to join {Alliance %s %s}.
 
 %s
 
diff --git a/var/messages/alliance_withdraw_invite.txt b/var/messages/alliance_withdraw_invite.txt
index 7305fa70..d4d2ee93 100644
--- a/var/messages/alliance_withdraw_invite.txt
+++ b/var/messages/alliance_withdraw_invite.txt
@@ -1,5 +1,5 @@
 Invitation Withdrawn
 ~~~
-We have decided to withdraw the invitation for you to join %s.
+We have decided to withdraw the invitation for you to join {Alliance %s %s}.
 
 %s
diff --git a/var/messages/building_kablooey.txt b/var/messages/building_kablooey.txt
index f36128f5..2ccee6da 100644
--- a/var/messages/building_kablooey.txt
+++ b/var/messages/building_kablooey.txt
@@ -1,6 +1,6 @@
 Building Attacked
 ~~~
-Our level %s %s on %s has been sabotaged. No one so far is claiming responsibility.
+Our level %s %s on {Planet %s %s} has been sabotaged. No one so far is claiming responsibility.
 
 With Much Sadness,
 
diff --git a/var/messages/building_loss_of_power.txt b/var/messages/building_loss_of_power.txt
index 3e8010fa..691ab501 100644
--- a/var/messages/building_loss_of_power.txt
+++ b/var/messages/building_loss_of_power.txt
@@ -1,6 +1,6 @@
 Loss of Power
 ~~~
-It seems that we are experiencing a loss of power at our %s on %s due to faulty transformer that caught on fire and nearly destroyed the building. Unfortunately, it will be offline until you approve a budget for repairs.
+It seems that we are experiencing a loss of power at our %s on {Planet %s %s} due to faulty transformer that caught on fire and nearly destroyed the building. Unfortunately, it will be offline until you approve a budget for repairs.
 
 Regards,
 
diff --git a/var/messages/building_theft_report.txt b/var/messages/building_theft_report.txt
index 1eb4f7a3..fab659da 100644
--- a/var/messages/building_theft_report.txt
+++ b/var/messages/building_theft_report.txt
@@ -4,5 +4,5 @@ I have just acquired the plans for a level %s %s.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
 
diff --git a/var/messages/cannot_colonize.txt b/var/messages/cannot_colonize.txt
index 0170540f..069d290e 100644
--- a/var/messages/cannot_colonize.txt
+++ b/var/messages/cannot_colonize.txt
@@ -1,5 +1,5 @@
 Coming Home
 ~~~
-We arrived at %s and found that it had already been colonized. We were forced to turn around and come home. We're on our way now.
+We arrived at {Starmap %s %s %s} and found that it had already been colonized. We were forced to turn around and come home. We're on our way now.
 
 %s Colony Mission Commander
diff --git a/var/messages/cannot_deploy_mining_platform.txt b/var/messages/cannot_deploy_mining_platform.txt
index 2511c73f..9f1a1a41 100644
--- a/var/messages/cannot_deploy_mining_platform.txt
+++ b/var/messages/cannot_deploy_mining_platform.txt
@@ -1,7 +1,7 @@
 Mining Platform Ship Returning
 ~~~
-%s The ship is on its way back to %s now.
+%s The ship is on its way back from {Starmap %s %s %s} to {Planet %s %s} now.
 
 Regards,
 
-%s Mission Commander
+%s Commander
diff --git a/var/messages/complaint_food_diversity.txt b/var/messages/complaint_food_diversity.txt
index 19a45f6a..02ae1b73 100644
--- a/var/messages/complaint_food_diversity.txt
+++ b/var/messages/complaint_food_diversity.txt
@@ -1,6 +1,6 @@
 Food Riot
 ~~~
-If something isn't done soon I think the citizens of %s are going to launch a full scale revolt. They are unsatisfied with the lack of food diversity available to them. And, I have to admit, I don't like eating the same thing for dinner every night either. 
+If something isn't done soon I think the citizens of {Planet %s %s} are going to launch a full scale revolt. They are unsatisfied with the lack of food diversity available to them. And, I have to admit, I don't like eating the same thing for dinner every night either. 
 
 You need to either trade for more types of food, or build a variety of farms and food processing plants. If you don't, your workers may just stop working all together. Then where would your empire be?
 
diff --git a/var/messages/complaint_lack_of_energy.txt b/var/messages/complaint_lack_of_energy.txt
index cc3e4584..72faf623 100644
--- a/var/messages/complaint_lack_of_energy.txt
+++ b/var/messages/complaint_lack_of_energy.txt
@@ -1,6 +1,6 @@
 Brownouts Causing Concern
 ~~~
-%s saw more brownouts today due to the lack of available energy. The Security Minister has told me that some citizens are taking advantage of the down security systems and lighting and are now looting buildings. The %s was damaged in one such instance.
+{Planet %s %s} saw more brownouts today due to the lack of available energy. The Security Minister has told me that some citizens are taking advantage of the down security systems and lighting and are now looting buildings. The %s was damaged in one such instance.
 
 Do whatever you need to to get the power flowing again. Your empire will fall into chaos if you don't act swiftly.
 
diff --git a/var/messages/complaint_lack_of_food.txt b/var/messages/complaint_lack_of_food.txt
index d063f3e5..0ebea567 100644
--- a/var/messages/complaint_lack_of_food.txt
+++ b/var/messages/complaint_lack_of_food.txt
@@ -1,6 +1,6 @@
 Starving Citizens
 ~~~
-I've gotten angry messages from citizens all day today about the lack of food on %s. I also just received a report from the Security Minister that he arrested a group of citizens as they were breaking into the %s looking for food. Some damage was done to the building in the process.
+I've gotten angry messages from citizens all day today about the lack of food on {Planet %s %s}. I also just received a report from the Security Minister that he arrested a group of citizens as they were breaking into the %s looking for food. Some damage was done to the building in the process.
 
 Please do something quickly or I'm certain there will be more trouble.
 
diff --git a/var/messages/complaint_lack_of_ore.txt b/var/messages/complaint_lack_of_ore.txt
index b9e7d195..279768dd 100644
--- a/var/messages/complaint_lack_of_ore.txt
+++ b/var/messages/complaint_lack_of_ore.txt
@@ -1,6 +1,6 @@
 Manufacturing Nearly Stopped
 ~~~
-The lack of ore has nearly shut down production on %s. Network 19 had a story showing workers taking parts off the %s and hauling them back to their factories just to keep production moving. What happens when there are no more buildings to disassemble? Let's not find out. You need to find them some ore.
+The lack of ore has nearly shut down production on {Planet %s %s}. Network 19 had a story showing workers taking parts off the %s and hauling them back to their factories just to keep production moving. What happens when there are no more buildings to disassemble? Let's not find out. You need to find them some ore.
 
 Regards,
 
diff --git a/var/messages/complaint_lack_of_waste.txt b/var/messages/complaint_lack_of_waste.txt
index 8a2dc18e..d68ee6f0 100644
--- a/var/messages/complaint_lack_of_waste.txt
+++ b/var/messages/complaint_lack_of_waste.txt
@@ -1,6 +1,6 @@
 Unions Unhappy About Job Loss
 ~~~
-The workers union is making loud complaints about citizens being laid off from their jobs. Apparently they used to work at the %s on %s, but have been laid off because there is not enough waste to be processed.
+The workers union is making loud complaints about citizens being laid off from their jobs. Apparently they used to work at the %s on {Planet %s %s}, but have been laid off because there is not enough waste to be processed.
 
 You should either close down the %s or start producing more waste to put these people back to work. If you don't do something soon this dissent could spread to the other workers.
 
diff --git a/var/messages/complaint_lack_of_water.txt b/var/messages/complaint_lack_of_water.txt
index aa77d066..836bee50 100644
--- a/var/messages/complaint_lack_of_water.txt
+++ b/var/messages/complaint_lack_of_water.txt
@@ -1,6 +1,6 @@
 Citizens Thirsty
 ~~~
-The lack of water on %s is driving the citizens mad. They were rioting in the streets today and even damaged the %s. If you don't do something soon, I'm afraid they'll do some real damage.
+The lack of water on {Planet %s %s} is driving the citizens mad. They were rioting in the streets today and even damaged the %s. If you don't do something soon, I'm afraid they'll do some real damage.
 
 Regards,
 
diff --git a/var/messages/complaint_pollution.txt b/var/messages/complaint_pollution.txt
index 92d56e48..b0fd778e 100644
--- a/var/messages/complaint_pollution.txt
+++ b/var/messages/complaint_pollution.txt
@@ -1,6 +1,6 @@
 Pollution Causing Outrage
 ~~~
-The citizens of %s are up in arms about the level of pollution being produced by the continued growth on the planet.
+The citizens of {Planet %s %s} are up in arms about the level of pollution being produced by the continued growth on the planet.
 
 You should find a way to manage the waste or their discontent could affect the progress of the empire dramatically.
 
diff --git a/var/messages/complaint_unhappy.txt b/var/messages/complaint_unhappy.txt
index cae3645e..0447cb60 100644
--- a/var/messages/complaint_unhappy.txt
+++ b/var/messages/complaint_unhappy.txt
@@ -1,6 +1,6 @@
 Civil Unrest
 ~~~
-The citizens of %s are really down, and could use some cheering up. Some have said building a Park would help. Others think more entertainment options would do the trick. I even heard one person advocating for additional types of foods. It doesn't really matter what you do, as long as you do something to make them happy. 
+The citizens of {Planet %s %s} are really down, and could use some cheering up. Some have said building a Park would help. Others think more entertainment options would do the trick. I even heard one person advocating for additional types of foods. It doesn't really matter what you do, as long as you do something to make them happy. 
 
 I probably don't need to remind you of the risks of unhappy citizens, but there are two big risks that I'll point out anyway:
 
diff --git a/var/messages/detonator_destroyed_probes.txt b/var/messages/detonator_destroyed_probes.txt
index 94d3835f..6c653196 100644
--- a/var/messages/detonator_destroyed_probes.txt
+++ b/var/messages/detonator_destroyed_probes.txt
@@ -1,6 +1,6 @@
 Detonator Report
 ~~~
-Our Detonator has destroyed %s probes in the %s system.
+Our Detonator has destroyed %s probes in the {Starmap %s %s %s} system.
 
 Regards,
 
diff --git a/var/messages/false_interrogation.txt b/var/messages/false_interrogation.txt
index eea59369..4ca2fed1 100644
--- a/var/messages/false_interrogation.txt
+++ b/var/messages/false_interrogation.txt
@@ -1,5 +1,5 @@
 Not Giving Them Anything
 ~~~
-I was able to bribe a guard to get this message to you. These bastards at %s prison are trying everything to get information out of me, but I'm not giving them anything. I'm not sure how long I can hold out though. Rescue would be nice.
+I was able to bribe a guard to get this message to you. These bastards at {Starmap %s %s %s} prison are trying everything to get information out of me, but I'm not giving them anything. I'm not sure how long I can hold out though. Rescue would be nice.
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/glyph_discovered.txt b/var/messages/glyph_discovered.txt
index 12cff77c..51dfc3fa 100644
--- a/var/messages/glyph_discovered.txt
+++ b/var/messages/glyph_discovered.txt
@@ -1,6 +1,6 @@
 Glyph Discovered!
 ~~~
-Great news! Our archaeologists on %s have uncovered a glyph made entirely of %s. Perhaps with your guidance they can unlock its secrets.
+Great news! Our archaeologists on {Planet %s %s} have uncovered a glyph made entirely of %s. Perhaps with your guidance they can unlock its secrets.
 
 Regards,
 
diff --git a/var/messages/glyph_discovered_by_excavator.txt b/var/messages/glyph_discovered_by_excavator.txt
index 72ac53f8..a8903fe4 100644
--- a/var/messages/glyph_discovered_by_excavator.txt
+++ b/var/messages/glyph_discovered_by_excavator.txt
@@ -1,6 +1,6 @@
 Glyph Discovered!
 ~~~
-Great news! The Excavator you sent to %s has uncovered a glyph made entirely of %s. Perhaps with your guidance our Archaeologists can unlock its secrets. The glyph has been sent back to %s for further study.
+Great news! The Excavator you sent to {Starmap %s %s %s} has uncovered a glyph made entirely of %s. Perhaps with your guidance our Archaeologists can unlock its secrets. The glyph has been sent back to {Planet %s %s} for further study.
 
 Regards,
 
diff --git a/var/messages/glyph_not_discovered_by_excavator.txt b/var/messages/glyph_not_discovered_by_excavator.txt
index d2977e97..9307278e 100644
--- a/var/messages/glyph_not_discovered_by_excavator.txt
+++ b/var/messages/glyph_not_discovered_by_excavator.txt
@@ -1,6 +1,6 @@
 Excavator Found Nothing
 ~~~
-The Excavator you sent to %s from %s found nothing interesting.
+The Excavator you sent to {Starmap %s %s %s} from {Planet %s %s} found nothing interesting.
 
 Regards,
 
diff --git a/var/messages/goodbye.txt b/var/messages/goodbye.txt
index e7926d6b..0882fa6e 100644
--- a/var/messages/goodbye.txt
+++ b/var/messages/goodbye.txt
@@ -2,4 +2,4 @@ Good Bye!
 ~~~
 I refuse to be a part of a cause I no longer believe in. Consider this my resignation.
 
-%s
+%s formerly of {Planet %s %s}
diff --git a/var/messages/hit_by_scow.txt b/var/messages/hit_by_scow.txt
index 76afad7f..472503e4 100644
--- a/var/messages/hit_by_scow.txt
+++ b/var/messages/hit_by_scow.txt
@@ -1,6 +1,6 @@
 Bombarded With Waste
 ~~~
-I can't tell if {Empire %s %s} doesn't like us, or if they love us. They just crash landed a Scow on %s, spilling %s waste in the process. If we clean this up quickly, it's an easy source of resources, but if they dump faster than we can handle, then we could be in trouble.
+I can't tell if {Empire %s %s} doesn't like us, or if they love us. They just crash landed a Scow on {Planet %s %s}, spilling %s waste in the process. If we clean this up quickly, it's an easy source of resources, but if they dump faster than we can handle, then we could be in trouble.
 
 Regards,
 
diff --git a/var/messages/i_have_escaped.txt b/var/messages/i_have_escaped.txt
index 0b36f4b3..ec623c5b 100644
--- a/var/messages/i_have_escaped.txt
+++ b/var/messages/i_have_escaped.txt
@@ -1,5 +1,5 @@
 I'm Back!
 ~~~
-I managed to break out of the %s prison. I'm ready for duty, put me to work.
+I managed to break out of the {Starmap %s %s %s} prison. I'm ready for duty, put me to work.
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/id_like_to_join_you.txt b/var/messages/id_like_to_join_you.txt
index f22fe9c2..75113fc4 100644
--- a/var/messages/id_like_to_join_you.txt
+++ b/var/messages/id_like_to_join_you.txt
@@ -4,4 +4,4 @@ I'm fed up with {Empire %s %s}. I'd like to be on a winning team. I'm yours to c
 
 Regards,
 
-%s
+%s now of {Planet %s %s}
diff --git a/var/messages/intel_report.txt b/var/messages/intel_report.txt
index 62c50c53..d01e79fe 100644
--- a/var/messages/intel_report.txt
+++ b/var/messages/intel_report.txt
@@ -1,8 +1,8 @@
 %s
 ~~~
-Here's some information about %s you may find interesting.
+Here's some information about {Starmap %s %s %s} you may find interesting.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
 
diff --git a/var/messages/interrogating_prisoners_failing.txt b/var/messages/interrogating_prisoners_failing.txt
index c562fd13..b461f0a4 100644
--- a/var/messages/interrogating_prisoners_failing.txt
+++ b/var/messages/interrogating_prisoners_failing.txt
@@ -1,7 +1,7 @@
 Prisoners Being Interrogated
 ~~~
-I broke in to %s prison to find out who they've got locked up. I saw an agent named %s that I've worked with in the past. It didn't look like they were getting any valuable information.
+I broke in to {Starmap %s %s %s} prison to find out who they've got locked up. I saw an agent named %s that I've worked with in the past. It didn't look like they were getting any valuable information.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/knocked_out_a_defender.txt b/var/messages/knocked_out_a_defender.txt
index 3da47bad..690ceb74 100644
--- a/var/messages/knocked_out_a_defender.txt
+++ b/var/messages/knocked_out_a_defender.txt
@@ -1,7 +1,7 @@
 Knocked Out A Defender
 ~~~
-As I went to carry out my mission I came upon one a defending agent. I was able to surprise him and knock him out. He'll be unconscious for a little while. Let's take advantage of this opportunity to run some more missions.
+As I went to carry out my mission I came upon on a defending agent. I was able to surprise him and knock him out. He'll be unconscious for a little while. Let's take advantage of this opportunity to run some more missions.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/mining_platform_deployed.txt b/var/messages/mining_platform_deployed.txt
index a8da1cd3..11a9f7b6 100644
--- a/var/messages/mining_platform_deployed.txt
+++ b/var/messages/mining_platform_deployed.txt
@@ -1,7 +1,7 @@
 Mining Platform Deployed
 ~~~
-The Mining Platform Ship from %s has deployed on %s. It is operational and awaiting cargo ships.
+The Mining Platform Ship from {Planet %s %s} has deployed on {Starmap %s %s %s}. It is operational and awaiting cargo ships.
 
 Regards,
 
-%s Mission Commander
+%s Commander
diff --git a/var/messages/must_have_been_knocked_out.txt b/var/messages/must_have_been_knocked_out.txt
index b31e0bf7..3c79bfda 100644
--- a/var/messages/must_have_been_knocked_out.txt
+++ b/var/messages/must_have_been_knocked_out.txt
@@ -2,4 +2,4 @@ Uhhhh.
 ~~~
 I must have been knocked unconscious. What was it you wanted me to do again?
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/narrow_escape.txt b/var/messages/narrow_escape.txt
index aff51d72..1d217b04 100644
--- a/var/messages/narrow_escape.txt
+++ b/var/messages/narrow_escape.txt
@@ -4,4 +4,4 @@ I don't know how, but %s is on to me. I narrowly escaped capture today. Perhaps
 
 Regards,
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/new_recruit.txt b/var/messages/new_recruit.txt
index 8e0ce682..bce544dc 100644
--- a/var/messages/new_recruit.txt
+++ b/var/messages/new_recruit.txt
@@ -1,8 +1,8 @@
 New Recruit!
 ~~~
-Good news! I have brought over a new recruit from %s that goes by %s.
+Good news! I have brought over a new recruit from {Empire %s %s} that goes by %s.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
 
diff --git a/var/messages/our_scow_hit.txt b/var/messages/our_scow_hit.txt
index ce207720..08ac2628 100644
--- a/var/messages/our_scow_hit.txt
+++ b/var/messages/our_scow_hit.txt
@@ -1,6 +1,6 @@
 Scow Hit Target
 ~~~
-Our Scow just crashed into %s dropping %s waste in the process.
+Our Scow just crashed into {Starmap %s %s %s} dropping %s waste in the process.
 
 Regards,
 
diff --git a/var/messages/our_ship_hit_building.txt b/var/messages/our_ship_hit_building.txt
index 1cec25ac..f90a10f4 100644
--- a/var/messages/our_ship_hit_building.txt
+++ b/var/messages/our_ship_hit_building.txt
@@ -1,6 +1,6 @@
 Target Hit
 ~~~
-Our %s reached %s and damaged the %s.
+Our %s reached {Starmap %s %s %s} and damaged the %s.
 
 Regards,
 
diff --git a/var/messages/plan_discovered_by_excavator.txt b/var/messages/plan_discovered_by_excavator.txt
index 730c318f..ddfcfa23 100644
--- a/var/messages/plan_discovered_by_excavator.txt
+++ b/var/messages/plan_discovered_by_excavator.txt
@@ -1,6 +1,6 @@
 Excavator Uncovered Plan
 ~~~
-While searching %s an Excavator has uncovered a plan to build a level %s %s. This is a rare and historic find which will have a profound impact on our people. The plan has been sent back to %s for further study.
+While searching {Starmap %s %s %s} an Excavator has uncovered a plan to build a level %s %s. This is a rare and historic find which will have a profound impact on our people. The plan has been sent back to {Planet %s %s} for further study.
 
 Regards,
 
diff --git a/var/messages/probe_destroyed.txt b/var/messages/probe_destroyed.txt
index 93e72f5e..0f0251f6 100644
--- a/var/messages/probe_destroyed.txt
+++ b/var/messages/probe_destroyed.txt
@@ -1,6 +1,6 @@
 Lost Contact With Probe
 ~~~
-We have just lost contact with the probe tasked to the %s system. We have to assume it has been disabled by enemy forces.
+We have just lost contact with the probe tasked to the {Starmap %s %s %s} system. We have to assume it has been disabled by enemy forces.
 
 Regards,
 
diff --git a/var/messages/probe_detected.txt b/var/messages/probe_detected.txt
index 9157b655..8f64340e 100644
--- a/var/messages/probe_detected.txt
+++ b/var/messages/probe_detected.txt
@@ -1,6 +1,6 @@
 Probe Detected!
 ~~~
-Our probe in the %s system just detected an incoming probe. Its markings indicate its from {Empire %s %s}.
+Our probe in the {Starmap %s %s %s} system just detected an incoming probe. Its markings indicate its from {Empire %s %s}.
 
 Regards,
 
diff --git a/var/messages/probe_detonated.txt b/var/messages/probe_detonated.txt
index c1e5a4cf..76acc181 100644
--- a/var/messages/probe_detonated.txt
+++ b/var/messages/probe_detonated.txt
@@ -1,6 +1,6 @@
 Probe Destroyed
 ~~~
-We just lost contact with our probe in the %s system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by {Empire %s %s}. We must assume the probe has been destroyed.
+We just lost contact with our probe in the {Starmap %s %s %s} system. Just before it went dark, our probe transmitted an image of an incoming ship. We've determined it was a Detonator sent by {Empire %s %s}. We must assume the probe has been destroyed.
 
 Regards,
 
diff --git a/var/messages/ready_for_assignment.txt b/var/messages/ready_for_assignment.txt
index 63d2b300..bbed501c 100644
--- a/var/messages/ready_for_assignment.txt
+++ b/var/messages/ready_for_assignment.txt
@@ -2,4 +2,4 @@ Put Me To Work
 ~~~
 I'm ready to work. What do you need from me?
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/resources_discovered_by_excavator.txt b/var/messages/resources_discovered_by_excavator.txt
index aae47d02..cb8e89d9 100644
--- a/var/messages/resources_discovered_by_excavator.txt
+++ b/var/messages/resources_discovered_by_excavator.txt
@@ -1,6 +1,6 @@
 Resources Discovered!
 ~~~
-Good news! While the Excavator you sent to %s has not uncovered a glyph, it did find %s %s. The resources have been sent back to %s and will be put to good use.
+Good news! While the Excavator you sent to {Starmap %s %s %s} has not uncovered a glyph, it did find %s %s. The resources have been sent back to {Planet %s %s} and will be put to good use.
 
 Regards,
 
diff --git a/var/messages/sabotage_report.txt b/var/messages/sabotage_report.txt
index 08710b2e..9ea082c6 100644
--- a/var/messages/sabotage_report.txt
+++ b/var/messages/sabotage_report.txt
@@ -1,8 +1,8 @@
 Sabotage Report
 ~~~
-We just sabotaged a %s on %s.
+We just sabotaged a %s on {Starmap %s %s %s}.
 
 More to come,
 
-%s
+%s of {Planet %s %s}
 
diff --git a/var/messages/scanner_data.txt b/var/messages/scanner_data.txt
index ec70a0ca..ac7a6daf 100644
--- a/var/messages/scanner_data.txt
+++ b/var/messages/scanner_data.txt
@@ -1,6 +1,6 @@
 Scan Results
 ~~~
-Our scanner captured the attached map of %s.
+Our scanner captured the attached map of {Starmap %s %s %s}.
 
 Regards,
 
diff --git a/var/messages/ship_blew_up_at_port.txt b/var/messages/ship_blew_up_at_port.txt
index c3a86d9e..45a0e861 100644
--- a/var/messages/ship_blew_up_at_port.txt
+++ b/var/messages/ship_blew_up_at_port.txt
@@ -2,7 +2,7 @@ Explosion at Space Port
 ~~~
 Oh no!
 
-I'm afraid I have terrible news. One of our %ss just exploded on the pad at the Space Port on %s.
+I'm afraid I have terrible news. One of our %ss just exploded on the pad at the Space Port on {Planet %s %s}.
 
 Regards,
 
diff --git a/var/messages/ship_hit_building.txt b/var/messages/ship_hit_building.txt
index ef0e2812..6fcd3b57 100644
--- a/var/messages/ship_hit_building.txt
+++ b/var/messages/ship_hit_building.txt
@@ -1,6 +1,6 @@
 We're Under Attack!!!
 ~~~
-We just tracked a %s as it broke through the atmosphere and struck the %s. From the wreckage it looks like it came from {Empire %s %s}.
+We just tracked a %s as it broke through the atmosphere and struck the %s on {Planet %s %s}. From the wreckage it looks like it came from {Empire %s %s}.
 
 Regards,
 
diff --git a/var/messages/ship_shot_down.txt b/var/messages/ship_shot_down.txt
index 025e698f..fce8abd6 100644
--- a/var/messages/ship_shot_down.txt
+++ b/var/messages/ship_shot_down.txt
@@ -1,6 +1,6 @@
 Ship Shot Down
 ~~~
-Our %s, on route to %s, was shot down before it could reach its target.
+Our %s, on route to {Starmap %s %s %s} from {Planet %s %s}, was shot down before it could reach its target.
 
 Regards,
 
diff --git a/var/messages/ship_stolen.txt b/var/messages/ship_stolen.txt
index 3fe9f37f..1069c15a 100644
--- a/var/messages/ship_stolen.txt
+++ b/var/messages/ship_stolen.txt
@@ -1,7 +1,7 @@
 Ship Stolen
 ~~~
-A %s was at the Space Port, ready to go, but sometime before the launch the pilot was replaced by a foreign agent. Unfortunately he got away with the ship.
+A %s was at the Space Port on {Planet %s %s}, ready to go, but sometime before the launch the pilot was replaced by a foreign agent. Unfortunately he got away with the ship.
 
 Regards,
 
-%s
+Your Humble Assistant
\ No newline at end of file
diff --git a/var/messages/ship_theft_report.txt b/var/messages/ship_theft_report.txt
index 4794e1af..4d44d875 100644
--- a/var/messages/ship_theft_report.txt
+++ b/var/messages/ship_theft_report.txt
@@ -4,5 +4,5 @@ I just snatched a %s and am on my way back home.
 
 Debrief you soon,
 
-%s
+%s of {Planet %s %s}
 
diff --git a/var/messages/spy_captured.txt b/var/messages/spy_captured.txt
index ef61ed7b..0394b562 100644
--- a/var/messages/spy_captured.txt
+++ b/var/messages/spy_captured.txt
@@ -1,7 +1,7 @@
 They Got Me
 ~~~
-I bribed a guard to send this message out for me. I was captured today on %s, and was given a 1 month prison sentence.
+I bribed a guard to send this message out for me. I was captured today on {Starmap %s %s %s}, and was given a one-month prison sentence.
 
 With Regret,
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/spy_executed.txt b/var/messages/spy_executed.txt
index 3932bfdb..9e25bd51 100644
--- a/var/messages/spy_executed.txt
+++ b/var/messages/spy_executed.txt
@@ -1,8 +1,8 @@
 Operative Executed
 ~~~
-For the crime of Espionage, %s has been found guilty and executed. See that no more of your people find their way to %s.
+For the crime of Espionage, %s of {Planet %s %s} has been found guilty and executed. See that no more of your people find their way to {Starmap %s %s %s}.
 
 Regards,
 
 Capital Crimes Division
-%s
+{Empire %s %s}
diff --git a/var/messages/spy_killed.txt b/var/messages/spy_killed.txt
index 4069e951..f681b08c 100644
--- a/var/messages/spy_killed.txt
+++ b/var/messages/spy_killed.txt
@@ -1,6 +1,6 @@
 Killed In Action
 ~~~
-%s was killed in the line of duty today on %s.
+%s of {Planet %s %s} was killed in the line of duty today on {Starmap %s %s %s}.
 
 Condolences,
 
diff --git a/var/messages/spy_released.txt b/var/messages/spy_released.txt
index d2bfd874..e169aa84 100644
--- a/var/messages/spy_released.txt
+++ b/var/messages/spy_released.txt
@@ -1,7 +1,7 @@
 I'm Free!
 ~~~
-I don't know what you said to %s, but they released me. I'm on %s and ready to be picked up for my next assignment.
+I don't know what you said to {Empire %s %s}, but they released me. I'm on {Starmap %s %s %s} and ready to be picked up for my next assignment.
 
 Regards,
 
-%s
+%s of {Planet %s %s}
diff --git a/var/messages/training_accident.txt b/var/messages/training_accident.txt
index 115c3eb6..888ee161 100644
--- a/var/messages/training_accident.txt
+++ b/var/messages/training_accident.txt
@@ -1,6 +1,6 @@
 Training Accident
 ~~~
-Sadly, one of our brave spies died in a training accident today on %s. We are investigating the matter to improve the odds it doesn't happen again.
+Sadly, one of our brave spies died in a training accident today on {Planet %s %s}. We are investigating the matter to improve the odds it doesn't happen again.
 
 Regards,
 
diff --git a/var/messages/uprising.txt b/var/messages/uprising.txt
index 69ce0a49..3284e2e6 100644
--- a/var/messages/uprising.txt
+++ b/var/messages/uprising.txt
@@ -1,6 +1,6 @@
 Uprising
 ~~~
-An individual known as %s has started an uprising on %s, which has cost us %s happiness.
+An individual known as %s has started an uprising on {Planet %s %s}, which has cost us %s happiness.
 
 Regards,
 
diff --git a/var/messages/we_captured_a_spy.txt b/var/messages/we_captured_a_spy.txt
index 9aa39c25..e4772f2b 100644
--- a/var/messages/we_captured_a_spy.txt
+++ b/var/messages/we_captured_a_spy.txt
@@ -1,6 +1,6 @@
 Enemy Captured
 ~~~
-We captured a spy on %s. We're not sure yet where he's from, but as long as you keep some people assigned to counter espionage, we'll get the answers we need.
+We captured a spy on {Planet %s %s}. We're not sure yet where he's from, but as long as you keep some people assigned to counter espionage, we'll get the answers we need.
 
 Regards,
 
diff --git a/var/messages/we_destroyed_a_probe.txt b/var/messages/we_destroyed_a_probe.txt
index d0b3d1ca..73ce48cb 100644
--- a/var/messages/we_destroyed_a_probe.txt
+++ b/var/messages/we_destroyed_a_probe.txt
@@ -1,6 +1,6 @@
 We Disabled A Probe
 ~~~
-We just disabled a probe tasked to the %s system. It was under the control of %s.
+We just disabled a probe tasked to the {Starmap %s %s %s} system. It was under the control of {Empire %s %s}.
 
 More to come,
 
diff --git a/var/messages/we_disabled_a_building.txt b/var/messages/we_disabled_a_building.txt
index fbd524a1..4837246e 100644
--- a/var/messages/we_disabled_a_building.txt
+++ b/var/messages/we_disabled_a_building.txt
@@ -1,6 +1,6 @@
 Disabled A Building
 ~~~
-We have disabled the %s on %s.
+We have disabled the %s on {Starmap %s %s %s}.
 
 More to come,
 
diff --git a/var/messages/we_disabled_a_mining_platform.txt b/var/messages/we_disabled_a_mining_platform.txt
index 1e64e960..dfd8464a 100644
--- a/var/messages/we_disabled_a_mining_platform.txt
+++ b/var/messages/we_disabled_a_mining_platform.txt
@@ -1,6 +1,6 @@
 Mining Platform Disabled
 ~~~
-We have shut down a mining platform on %s, which was controlled by %s.
+We have shut down a mining platform on {Starmap %s %s %s}, which was controlled by {Empire %s %s}.
 
 More to come,
 
diff --git a/var/messages/we_have_taken_control_of_a_probe.txt b/var/messages/we_have_taken_control_of_a_probe.txt
index 55ff3a9d..3580f447 100644
--- a/var/messages/we_have_taken_control_of_a_probe.txt
+++ b/var/messages/we_have_taken_control_of_a_probe.txt
@@ -1,6 +1,6 @@
 Probe Seized
 ~~~
-We have taken control of a probe in the %s system, from %s. 
+We have taken control of a probe in the {Starmap %s %s %s} system, from {Empire %s %s}. 
 
 More to come,
 
diff --git a/var/messages/we_incited_a_rebellion.txt b/var/messages/we_incited_a_rebellion.txt
index ae3f18ce..74999505 100644
--- a/var/messages/we_incited_a_rebellion.txt
+++ b/var/messages/we_incited_a_rebellion.txt
@@ -1,6 +1,6 @@
 Rebellion Started
 ~~~
-The leadership over at %s cannot be happy today. We were able to start a rebellion on %s, which cost them %s happiness.
+The leadership over at {Empire %s %s} cannot be happy today. We were able to start a rebellion on {Starmap %s %s %s}, which cost them %s happiness.
 
 More to come,
 
diff --git a/var/messages/we_killed_a_spy.txt b/var/messages/we_killed_a_spy.txt
index e8d5dc42..cfe5a9b7 100644
--- a/var/messages/we_killed_a_spy.txt
+++ b/var/messages/we_killed_a_spy.txt
@@ -1,6 +1,6 @@
 Enemy Killed
 ~~~
-We killed an enemy agent on %s. Unfortunately, with the agent dead no other information could be gathered.
+We killed an enemy agent on {Starmap %s %s %s}. Unfortunately, with the agent dead no other information could be gathered.
 
 Regards,
 
diff --git a/var/messages/we_lost_contact_with_a_mining_platform.txt b/var/messages/we_lost_contact_with_a_mining_platform.txt
index b63073cd..ba427650 100644
--- a/var/messages/we_lost_contact_with_a_mining_platform.txt
+++ b/var/messages/we_lost_contact_with_a_mining_platform.txt
@@ -1,6 +1,6 @@
 Mining Platform Lost
 ~~~
-I'm sorry to say we have lost contact with the mining platform on %s. Our technicians do not believe this is a recoverable situation.
+I'm sorry to say we have lost contact with the mining platform on {Starmap %s %s %s}. Our technicians do not believe this is a recoverable situation.
 
 Regards,
 
diff --git a/var/messages/we_missed_a_spy.txt b/var/messages/we_missed_a_spy.txt
index 9436e387..3f76a454 100644
--- a/var/messages/we_missed_a_spy.txt
+++ b/var/messages/we_missed_a_spy.txt
@@ -1,6 +1,6 @@
 Plot Foiled
 ~~~
-I'm pretty sure we averted a catastrophe on %s. It's impossible to know what the agent was up to, because we were unable to capture him or her, but at least we scared them off for now.
+I'm pretty sure we averted a catastrophe on {Starmap %s %s %s}. It's impossible to know what the agent was up to, because we were unable to capture him or her, but at least we scared them off for now.
 
 Regards,
 
diff --git a/var/messages/we_shot_down_a_ship.txt b/var/messages/we_shot_down_a_ship.txt
index d7166291..235dd8a9 100644
--- a/var/messages/we_shot_down_a_ship.txt
+++ b/var/messages/we_shot_down_a_ship.txt
@@ -1,6 +1,6 @@
 Target Neutralized
 ~~~
-Our defensive squadron was able to shoot down a %s before it reached %s. Its markings indicate that it was from {Empire %s %s}.
+Our defensive squadron was able to shoot down a %s before it reached {Planet %s %s}. Its markings indicate that it was from {Empire %s %s}.
 
 Regards,
 
diff --git a/var/messages/we_were_scanned.txt b/var/messages/we_were_scanned.txt
index b1f2dcd3..b9d82e4c 100644
--- a/var/messages/we_were_scanned.txt
+++ b/var/messages/we_were_scanned.txt
@@ -1,6 +1,6 @@
 We've Been Scanned
 ~~~
-Our sensors indicate that %s has just been scanned by {Empire %s %s}. This could be idle curiosity or an indication of a pending attack. We need to get some Drones built to stop future scans, and other types of attacks.
+Our sensors indicate that {Planet %s %s} has just been scanned by {Empire %s %s}. This could be idle curiosity or an indication of a pending attack. We need to get some Drones built to stop future scans, and other types of attacks.
 
 Regards,