diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index f8ae45310f..365e8662be 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -29,7 +29,7 @@
 #include <openspace/documentation/documentation.h>
 
 #include <openspace/rendering/renderable.h>
-#include <openspace/scene/ephemeris.h>
+#include <openspace/scene/translation.h>
 #include <openspace/scene/rotation.h>
 #include <openspace/scene/scale.h>
 #include <openspace/properties/propertyowner.h>
diff --git a/include/openspace/scene/ephemeris.h b/include/openspace/scene/translation.h
similarity index 97%
rename from include/openspace/scene/ephemeris.h
rename to include/openspace/scene/translation.h
index 2b900c82f0..d2d64118fa 100644
--- a/include/openspace/scene/ephemeris.h
+++ b/include/openspace/scene/translation.h
@@ -22,8 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __EPHEMERIS_H__
-#define __EPHEMERIS_H__
+#ifndef __TRANSLATION_H__
+#define __TRANSLATION_H__
 
 #include <openspace/properties/propertyowner.h>
 
@@ -48,4 +48,4 @@ public:
 
 }  // namespace openspace
 
-#endif // __EPHEMERIS_H__
+#endif // __TRANSLATION_H__
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 163dc6e976..26ca3f53be 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -42,8 +42,8 @@ set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h
     ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h
@@ -68,8 +68,8 @@ set(SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimage.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index e27873ed41..d5a0d62923 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -48,8 +48,8 @@
 #include <modules/base/rendering/screenspaceimage.h>
 #include <modules/base/rendering/screenspaceframebuffer.h>
 
-#include <modules/base/ephemeris/staticephemeris.h>
-#include <modules/base/ephemeris/spiceephemeris.h>
+#include <modules/base/translation/statictranslation.h>
+#include <modules/base/translation/spicetranslation.h>
 
 #include <modules/base/rotation/staticrotation.h>
 #include <modules/base/rotation/spicerotation.h>
diff --git a/modules/base/ephemeris/spiceephemeris.cpp b/modules/base/translation/spicetranslation.cpp
similarity index 99%
rename from modules/base/ephemeris/spiceephemeris.cpp
rename to modules/base/translation/spicetranslation.cpp
index 3b0d41eae8..dbb6060933 100644
--- a/modules/base/ephemeris/spiceephemeris.cpp
+++ b/modules/base/translation/spicetranslation.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/ephemeris/spiceephemeris.h>
+#include <modules/base/translation/spicetranslation.h>
 
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
diff --git a/modules/base/ephemeris/spiceephemeris.h b/modules/base/translation/spicetranslation.h
similarity index 95%
rename from modules/base/ephemeris/spiceephemeris.h
rename to modules/base/translation/spicetranslation.h
index 122f03cc08..38a19c35fa 100644
--- a/modules/base/ephemeris/spiceephemeris.h
+++ b/modules/base/translation/spicetranslation.h
@@ -22,10 +22,10 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __SPICEEPHEMERIS_H__
-#define __SPICEEPHEMERIS_H__
+#ifndef __SPICETRANSLATION_H__
+#define __SPICETRANSLATION_H__
 
-#include <openspace/scene/ephemeris.h>
+#include <openspace/scene/translation.h>
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/properties/stringproperty.h>
@@ -50,4 +50,4 @@ private:
     
 } // namespace openspace
 
-#endif // __SPICEEPHEMERIS_H__
+#endif // __SPICETRANSLATION_H__
diff --git a/modules/base/ephemeris/staticephemeris.cpp b/modules/base/translation/statictranslation.cpp
similarity index 98%
rename from modules/base/ephemeris/staticephemeris.cpp
rename to modules/base/translation/statictranslation.cpp
index ef7ef2b0f4..1b6bb288ce 100644
--- a/modules/base/ephemeris/staticephemeris.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/ephemeris/staticephemeris.h>
+#include <modules/base/translation/statictranslation.h>
 
 #include <openspace/documentation/verifier.h>
 
diff --git a/modules/base/ephemeris/staticephemeris.h b/modules/base/translation/statictranslation.h
similarity index 94%
rename from modules/base/ephemeris/staticephemeris.h
rename to modules/base/translation/statictranslation.h
index 3956c046ff..3a71266c28 100644
--- a/modules/base/ephemeris/staticephemeris.h
+++ b/modules/base/translation/statictranslation.h
@@ -22,10 +22,10 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __STATICEPHEMERIS_H__
-#define __STATICEPHEMERIS_H__
+#ifndef __STATICTRANSLATION_H__
+#define __STATICTRANSLATION_H__
 
-#include <openspace/scene/ephemeris.h>
+#include <openspace/scene/translation.h>
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/properties/vectorproperty.h>
@@ -48,4 +48,4 @@ private:
     
 } // namespace openspace
 
-#endif // __STATICEPHEMERIS_H__
+#endif // __STATICTRANSLATION_H__
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adb4caf015..c7a423b957 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,7 +83,7 @@ set(OPENSPACE_SOURCE
     ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
     ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
     ${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp
-    ${OPENSPACE_BASE_DIR}/src/scene/ephemeris.cpp
+    ${OPENSPACE_BASE_DIR}/src/scene/translation.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/scale.cpp
     ${OPENSPACE_BASE_DIR}/src/scene/scene.cpp
@@ -183,7 +183,7 @@ set(OPENSPACE_HEADER
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
     ${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h
-    ${OPENSPACE_BASE_DIR}/include/openspace/scene/ephemeris.h
+    ${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h
     ${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index efdce43beb..f98bb193e2 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -45,7 +45,7 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/scripting/scriptscheduler.h>
-#include <openspace/scene/ephemeris.h>
+#include <openspace/scene/translation.h>
 #include <openspace/scene/scene.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/time.h>
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 817b65378a..afb4c0e01a 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -84,10 +84,6 @@
 #include <sgct.h>
 #include <stack>
 
-// These are temporary ---abock
-#include <modules/base/ephemeris/spiceephemeris.h>
-#include <modules/base/ephemeris/staticephemeris.h>
-
 // ABuffer defines
 #define RENDERER_FRAMEBUFFER 0
 #define RENDERER_ABUFFER 1
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 24702a6828..a87e7a9b52 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -39,7 +39,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/shaderobject.h>
 
-#include <modules/base/ephemeris/staticephemeris.h>
+#include <modules/base/translation/statictranslation.h>
 #include <modules/base/rotation/staticrotation.h>
 #include <modules/base/scale/staticscale.h>
 
diff --git a/src/scene/ephemeris.cpp b/src/scene/translation.cpp
similarity index 98%
rename from src/scene/ephemeris.cpp
rename to src/scene/translation.cpp
index e6fe5d00cc..b355f50163 100644
--- a/src/scene/ephemeris.cpp
+++ b/src/scene/translation.cpp
@@ -22,7 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <openspace/scene/ephemeris.h>
+#include <openspace/scene/translation.h>
+
 #include <openspace/util/factorymanager.h>
 #include <ghoul/logging/logmanager.h>