diff --git a/lib/Lacuna/DB/Result/Building/Water/AtmosphericEvaporator.pm b/lib/Lacuna/DB/Result/Building/Water/AtmosphericEvaporator.pm
index 3d83ba8f..c67b4f51 100644
--- a/lib/Lacuna/DB/Result/Building/Water/AtmosphericEvaporator.pm
+++ b/lib/Lacuna/DB/Result/Building/Water/AtmosphericEvaporator.pm
@@ -7,7 +7,7 @@ extends 'Lacuna::DB::Result::Building::Water';
 
 use constant controller_class => 'Lacuna::RPC::Building::AtmosphericEvaporator';
 
-use constant image => 'atmposphericevaporator';
+use constant image => 'atmosphericevaporator';
 
 use constant name => 'Atmospheric Evaporator';
 
diff --git a/lib/Lacuna/RPC/Building/AtmosphericEvaporator.pm b/lib/Lacuna/RPC/Building/AtmosphericEvaporator.pm
index 39817d53..f8a7a7fa 100644
--- a/lib/Lacuna/RPC/Building/AtmosphericEvaporator.pm
+++ b/lib/Lacuna/RPC/Building/AtmosphericEvaporator.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::AtmosphericEvaporator';
+    return 'Lacuna::DB::Result::Building::Water::AtmosphericEvaporator';
 }
 
 no Moose;
diff --git a/lib/Lacuna/RPC/Building/GreatBallOfJunk.pm b/lib/Lacuna/RPC/Building/GreatBallOfJunk.pm
index a8e9cbaa..569590d4 100644
--- a/lib/Lacuna/RPC/Building/GreatBallOfJunk.pm
+++ b/lib/Lacuna/RPC/Building/GreatBallOfJunk.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::GreatBallOfJunk';
+    return 'Lacuna::DB::Result::Building::Permanent::GreatBallOfJunk';
 }
 
 no Moose;
diff --git a/lib/Lacuna/RPC/Building/JunkHengeSculpture.pm b/lib/Lacuna/RPC/Building/JunkHengeSculpture.pm
index 0ee7dd1f..1ca907fb 100644
--- a/lib/Lacuna/RPC/Building/JunkHengeSculpture.pm
+++ b/lib/Lacuna/RPC/Building/JunkHengeSculpture.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::JunkHengeSculpture';
+    return 'Lacuna::DB::Result::Building::Permanent::JunkHengeSculpture';
 }
 
 no Moose;
diff --git a/lib/Lacuna/RPC/Building/MetalJunkArches.pm b/lib/Lacuna/RPC/Building/MetalJunkArches.pm
index 317a572e..80bb3db9 100644
--- a/lib/Lacuna/RPC/Building/MetalJunkArches.pm
+++ b/lib/Lacuna/RPC/Building/MetalJunkArches.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::MetalJunkArches';
+    return 'Lacuna::DB::Result::Building::Permanent::MetalJunkArches';
 }
 
 no Moose;
diff --git a/lib/Lacuna/RPC/Building/PyramidJunkSculpture.pm b/lib/Lacuna/RPC/Building/PyramidJunkSculpture.pm
index ac915992..5b11c967 100644
--- a/lib/Lacuna/RPC/Building/PyramidJunkSculpture.pm
+++ b/lib/Lacuna/RPC/Building/PyramidJunkSculpture.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::PyramidJunkSculpture';
+    return 'Lacuna::DB::Result::Building::Permanent::PyramidJunkSculpture';
 }
 
 no Moose;
diff --git a/lib/Lacuna/RPC/Building/SpaceJunkPark.pm b/lib/Lacuna/RPC/Building/SpaceJunkPark.pm
index 88b64692..67c0130d 100644
--- a/lib/Lacuna/RPC/Building/SpaceJunkPark.pm
+++ b/lib/Lacuna/RPC/Building/SpaceJunkPark.pm
@@ -10,7 +10,7 @@ sub app_url {
 }
 
 sub model_class {
-    return 'Lacuna::DB::Result::Building::SpaceJunkPark';
+    return 'Lacuna::DB::Result::Building::Permanent::SpaceJunkPark';
 }
 
 no Moose;