diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm b/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm
index 8c0c9b36..f40675f3 100644
--- a/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm
+++ b/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm
@@ -7,6 +7,7 @@ extends 'Lacuna::DB::Result::Map::Body::Planet';
 use Lacuna::Util qw(randint);
 
 use constant image => 'station';
+__PACKAGE__->has_many('propositions','Lacuna::DB::Result::Propositions','station_id');
 
 before sanitize => sub {
     my $self = shift;
diff --git a/lib/Lacuna/RPC/Body.pm b/lib/Lacuna/RPC/Body.pm
index b3e0bf73..cb512736 100644
--- a/lib/Lacuna/RPC/Body.pm
+++ b/lib/Lacuna/RPC/Body.pm
@@ -21,7 +21,7 @@ sub abandon {
     my ($self, $session_id, $body_id) = @_;
     my $empire = $self->get_empire_by_session($session_id);
     my $body = $self->get_body($empire, $body_id);
-    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::SpaceStation')) { 
+    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::Station')) { 
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'AbandonStation',
             name            => 'Abandon Station',
@@ -49,7 +49,7 @@ sub rename {
     
     my $empire = $self->get_empire_by_session($session_id);
     my $body = $self->get_body($empire, $body_id);
-    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::SpaceStation')) {
+    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::Station')) {
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'RenameStation',
             name            => 'Rename Station',
@@ -114,7 +114,7 @@ sub get_buildable {
     my $empire = $self->get_empire_by_session($session_id);
     my $body = $self->get_body($empire, $body_id);
     
-    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::SpaceStation')) { # short circuiting for better performance
+    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::Station')) { # short circuiting for better performance
         confess [1010, 'Space stations can only be expanded through an act of Parliament.'];
     }
     
diff --git a/lib/Lacuna/RPC/Building.pm b/lib/Lacuna/RPC/Building.pm
index 0c86d59b..f5facc2e 100644
--- a/lib/Lacuna/RPC/Building.pm
+++ b/lib/Lacuna/RPC/Building.pm
@@ -181,7 +181,7 @@ sub demolish {
     my $building = $self->get_building($empire, $building_id, skip_offline => 1);
     my $body = $building->body;
     $building->can_demolish;
-    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::SpaceStation')) {
+    if ($body->isa('Lacuna::DB::Result::Map::Body::Planet::Station')) {
         my $name = $building->name.' ('.$building->x.','.$building->y.')';
         my $proposition = Lacuna->db->resultset('Lacuna::DB::Result::Propositions')->new({
             type            => 'DemolishBuilding',