diff --git a/data/scene/mercury/mercury.mod b/data/scene/mercury/mercury.mod
index ba64f42565..83b2146d18 100644
--- a/data/scene/mercury/mercury.mod
+++ b/data/scene/mercury/mercury.mod
@@ -3,6 +3,14 @@ return {
     {
         Name = "MercuryBarycenter",
         Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "MERCURY BARYCENTER",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            },
+        }
     },
     -- Mercury module
     {   
@@ -28,12 +36,6 @@ return {
             }
         },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "MERCURY",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_MERCURY",
@@ -48,7 +50,7 @@ return {
     -- MercuryTrail module
     {   
         Name = "MercuryTrail",
-        Parent = "MercuryBarycenter",
+        Parent = "SolarSystemBarycenter",
         Renderable = {
             Type = "RenderableTrail",
             Body = "MERCURY",
diff --git a/data/scene/venus/venus.mod b/data/scene/venus/venus.mod
index 6b96b1ca1b..6ea5a5afac 100644
--- a/data/scene/venus/venus.mod
+++ b/data/scene/venus/venus.mod
@@ -3,8 +3,15 @@ return {
     {
         Name = "VenusBarycenter",
         Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "VENUS BARYCENTER",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            },
+        }
     },
-
     -- Venus module
     {   
         Name = "Venus",
@@ -28,25 +35,19 @@ return {
                 MieColor = {1.0, 1.0, 1.0}
             }
         },
-        Ephemeris = {
-            Type = "Spice",
-            Body = "VENUS",
-            Observer = "SUN",
-            Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-        },
         Rotation = {
-            Type = "Spice",
+            Type = "SpiceRotation",
             Frame = "IAU_VENUS",
-            Reference = "ECLIPJ2000"
+            Reference = "GALACTIC"
         },
     },
     -- VenusTrail module
     {   
         Name = "VenusTrail",
-        Parent = "VenusBarycenter",
+        Parent = "SolarSystemBarycenter",
         Renderable = {
             Type = "RenderableTrail",
-            Body = "VENUS",
+            Body = "VENUS BARYCENTER",
             Frame = "GALACTIC",
             Observer = "SUN",
             RGB = {1, 0.5, 0.2},