diff --git a/lib/Lacuna/RPC/Body.pm b/lib/Lacuna/RPC/Body.pm
index 64aba0d4..bd01e850 100644
--- a/lib/Lacuna/RPC/Body.pm
+++ b/lib/Lacuna/RPC/Body.pm
@@ -25,7 +25,7 @@ sub abandon {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'AbandonStation',
             name            => 'Abandon Station',
-            description     => 'Abandon the station named "'.$body->name.'".',            
+            description     => 'Abandon the station named {Planet '.$body->id.' '.$body->name.'}.',            
             proposed_by_id  => $empire->id,
         });
         $proposition->station($body);
@@ -57,7 +57,7 @@ sub rename {
             type            => 'RenameStation',
             name            => 'Rename Station',
             scratch         => { name => $name },
-            description     => 'Rename the station from "'.$body->name.'" to "'.$name.'".',            
+            description     => 'Rename the station from {Planet '.$body->id.' '.$body->name.'} to "'.$name.'".',            
             proposed_by_id  => $empire->id,
         });
         $proposition->station($body);
diff --git a/lib/Lacuna/RPC/Building.pm b/lib/Lacuna/RPC/Building.pm
index eacd8d9e..0673032b 100644
--- a/lib/Lacuna/RPC/Building.pm
+++ b/lib/Lacuna/RPC/Building.pm
@@ -58,7 +58,7 @@ sub upgrade {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'UpgradeModule',
             name            => 'Upgrade '.$name,
-            description     => 'Upgrade '.$name.' on the station named "'.$body->name.'" from level '.$building->level.' to '.($building->level + 1).'.',
+            description     => 'Upgrade '.$name.' on {Planet '.$body->id.' '.$body->name.'} from level '.$building->level.' to '.($building->level + 1).'.',
             scratch         => { building_id => $building->id, to_level => $building->level + 1 },
             proposed_by_id  => $empire->id,
         });
@@ -185,7 +185,7 @@ sub build {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'InstallModule',
             name            => 'Install '.$name,
-            description     => 'Install '.$name.' on the station named "'.$body->name.'".',
+            description     => 'Install '.$name.' on {Planet '.$body->id.' '.$body->name.'}.',
             scratch         => { building_id => $building->id, to_level => $building->level + 1 },
             proposed_by_id  => $empire->id,
         });
@@ -219,7 +219,7 @@ sub demolish {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'DemolishModule',
             name            => 'Demolish '.$name,
-            description     => 'Demolish '.$name.' on the station named "'.$body->name.'".',
+            description     => 'Demolish '.$name.' on {Planet '.$body->id.' '.$body->name.'}.',
             scratch         => { building_id => $building->id },
             proposed_by_id  => $empire->id,
         });
@@ -249,7 +249,7 @@ sub downgrade {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'DowngradeModule',
             name            => 'Downgrade '.$name,
-            description     => 'Downgrade '.$name.' on the station named "'.$body->name.'" from level '.$self->level.' to '.($self->level - 1).'.',
+            description     => 'Downgrade '.$name.' on {Planet '.$body->id.' '.$body->name.'} from level '.$self->level.' to '.($self->level - 1).'.',
             scratch         => { building_id => $building->id },
             proposed_by_id  => $empire->id,
         });
@@ -311,7 +311,7 @@ sub repair {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'RepairModule',
             name            => 'Repair '.$name,
-            description     => 'Repair '.$name.' on the station named "'.$body->name.'".',
+            description     => 'Repair '.$name.' on {Planet '.$body->id.' '.$body->name.'}.',
             scratch         => { building_id => $building->id },
             proposed_by_id  => $empire->id,
         });
diff --git a/lib/Lacuna/RPC/Building/Parliament.pm b/lib/Lacuna/RPC/Building/Parliament.pm
index 6f41281e..c7a9494f 100644
--- a/lib/Lacuna/RPC/Building/Parliament.pm
+++ b/lib/Lacuna/RPC/Building/Parliament.pm
@@ -164,8 +164,8 @@ sub propose_fire_bfg {
     my $name = $body->name.' ('.$body->x.','.$body->y.')';
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'FireBfg',
-        name            => 'Fire BFG at '.$name,
-        description     => 'Fire the BFG at '.$name.' from the station named "'.$building->body->name.'". Reason cited: '.$reason,
+        name            => 'Fire BFG at '.$body->name,
+        description     => 'Fire the BFG at {Starmap '.$body->x.' '.$body->y.' '.$body->name.'} from {Planet '.$building->body->id.' '.$building->body->name.'}. Reason cited: '.$reason,
         scratch         => { body_id => $body->id },
         proposed_by_id  => $empire->id,
     });
@@ -233,7 +233,7 @@ sub propose_transfer_station_ownership {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'TransferStationOwnership',
         name            => 'Transfer Station',
-        description     => 'Transfer ownership of station named '.$self->body->name.' from '.$self->body->empire->name.' to '.$to_empire->name.'.',
+        description     => 'Transfer ownership of {Planet '.$building->body->id.' '.$building->body->name.'} from {Empire '.$self->body->empire_id.' '.$self->body->empire->name.'} to {Empire '.$to_empire->id.' '.$to_empire->name.'}.',
         scratch         => { empire_id => $to_empire->id },
         proposed_by_id  => $empire->id,
     });
@@ -273,7 +273,7 @@ sub propose_seize_star {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'SeizeStar',
         name            => 'Seize '.$star->name,
-        description     => 'Seize control of '.$star->name.' ('.$star->x.','.$star->y.'), and apply all present laws to said star and its inhabitants.',
+        description     => 'Seize control of {Starmap '.$star->x.' '.$star->y.' '.$star->name.'} by {Planet '.$building->body->id.' '.$building->body->name.'}, and apply all present laws to said star and its inhabitants.',
         scratch         => { star_id => $star->id },
         proposed_by_id  => $empire->id,
     });
@@ -349,7 +349,7 @@ sub propose_rename_star {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'RenameStar',
         name            => 'Rename '.$star->name,
-        description     => 'Rename '.$star->name.' ('.$star->x.','.$star->y.') to '.$star_name.'.',
+        description     => 'Rename {Starmap '.$star->x.' '.$star->y.' '.$star->name.'} to '.$star_name.'.',
         scratch         => { star_id => $star->id, name => $star_name },
         proposed_by_id  => $empire->id,
     });
@@ -423,7 +423,7 @@ sub propose_rename_asteroid {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'RenameAsteroid',
         name            => 'Rename '.$asteroid->name,
-        description     => 'Rename '.$asteroid->name.' ('.$asteroid->x.','.$asteroid->y.') to '.$name.'.',
+        description     => 'Rename {Starmap '.$asteroid->x.' '.$asteroid->y.' '.$asteroid->name.'} to '.$name.'.',
         scratch         => { asteroid_id => $asteroid->id, name => $name },
         proposed_by_id  => $empire->id,
     });
@@ -449,7 +449,7 @@ sub propose_members_only_mining_rights {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'MembersOnlyMiningRights',
         name            => 'Members Only Mining Rights',
-        description     => 'Only members of '.$building->body->alliance->name.' should be allowed to mine asteroids in the jurisdiction of this station.',
+        description     => 'Only members of {Alliance '.$building->body->alliance_id.' '.$building->body->alliance->name.'} should be allowed to mine asteroids in the jurisdiction of this station.',
         proposed_by_id  => $empire->id,
     });
     $proposition->station($building->body);
@@ -484,7 +484,7 @@ sub propose_evict_mining_platform {
     my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
         type            => 'EvictMiningPlatform',
         name            => 'Evict '.$platform->planet->empire->name.' Mining Platform',
-        description     => 'Evict a mining platform on '.$platform->asteroid->name.' controlled by '.$platform->planet->empire->name.'.',
+        description     => 'Evict a mining platform on {Starmap '.$platform->asteroid->x.' '.$platform->asteroid->y.' '.$platform->asteroid->name.'} controlled by {Empire '.$platform->planet->empire_id.' '.$platform->planet->empire->name.'}.',
         scratch         => { platform_id => $platform_id },
         proposed_by_id  => $empire->id,
     });