refactor!: rename plural to singular (#200)

* refactor!: rename from plural to singular to align with the rest of the repo * refactor!: finish refactoring remaining * chore: suggestions to propagate the ephemerides->ephemeris change (#201) * refactor: rename moar * refactor: update test * Apply suggestions from code review Co-authored-by: kyle-cochran <kyle.ray.cochran@gmail.com> * refactor: suggestions for naming MR (#202) * refactor: suggestions for naming MR * fix: hardcoded IERS remote path must reflect what is in OSTk Data * fix: last failing test --------- Co-authored-by: kyle-cochran <kyle.ray.cochran@gmail.com>
open-space-collective · Feb 8, 2024 · 200528d · 200528d
1 parent 977dfe6
commit 200528d
Show file tree

Hide file tree

Showing 328 changed files with 1,245 additions and 1,275 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -320,9 +320,9 @@ ENDIF ()
 
 ## Versioning
 
-IF (DEFINED PROJECT_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp.in")
+IF (DEFINED PROJECT_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp.in")
 
-    CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/${PROJECT_PATH}/Utilities/Version.cpp" @ONLY)
+    CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/src/${PROJECT_PATH}/Utility/Version.cpp" @ONLY)
 
 ENDIF ()
 

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ Documentation is available here:
 The library exhibits the following structure:
 
 ```txt
-├── Units
+├── Unit
 │   ├── Length
 │   ├── Mass
 │   ├── Time
@@ -142,10 +142,10 @@ The library exhibits the following structure:
 │   ├── Coordinate Reference System (CRS)
 │   └── Universal Transverse Mercator (UTM)
 └── Environment
-    ├── Constants
+    ├── Constant
     ├── Object
     │   └── Celestial
-    ├── Ephemerides
+    ├── Ephemeris
     │   ├── Analytical
     │   ├── Tabulated
     │   └── SPICE (JPL)
@@ -183,11 +183,11 @@ The following table shows the availabe data source settings:
 | Environment Variable                                                                 | Default Value                                                            |
 | ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------ |
 | `OSTK_PHYSICS_DATA_LOCAL_REPOSITORY`                                                 | `./.open-space-toolkit/physics/data` [Bulk setting. Overridden by specific repository settings below.] |
-| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_MODE`                          | `Automatic`                                                              |
-| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_LOCAL_REPOSITORY`              | `./.open-space-toolkit/physics/data/coordinate/frame/providers/iers`          |
-| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60`                                                                     |
-| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIDES_SPICE_ENGINE_MODE`                             | `Automatic`                                                              |
-| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIDES_SPICE_MANAGER_LOCAL_REPOSITORY`                | `./.open-space-toolkit/physics/data/environment/ephemerides/spice`            |
+| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_MODE`                          | `Automatic`                                                              |
+| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_LOCAL_REPOSITORY`              | `./.open-space-toolkit/physics/data/coordinate/frame/provider/iers`          |
+| `OSTK_PHYSICS_COORDINATE_FRAME_PROVIDER_IERS_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60`                                                                     |
+| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIS_SPICE_ENGINE_MODE`                             | `Automatic`                                                              |
+| `OSTK_PHYSICS_ENVIRONMENT_EPHEMERIS_SPICE_MANAGER_LOCAL_REPOSITORY`                | `./.open-space-toolkit/physics/data/environment/ephemeris/spice`            |
 | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_MODE`                          | `Automatic`                                                                  |
 | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_LOCAL_REPOSITORY`              | `./.open-space-toolkit/physics/data/environment/gravitational/earth`          |
 | `OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_LOCAL_REPOSITORY_LOCK_TIMEOUT` | `60`                                                                        |

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx b/bindings/python/src/OpenSpaceToolkitPhysicsPy.cxx
@@ -1,8 +1,8 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkitPhysicsPy/Utilities/ArrayCasting.hpp>
-#include <OpenSpaceToolkitPhysicsPy/Utilities/DateTimeCasting.hpp>
-#include <OpenSpaceToolkitPhysicsPy/Utilities/ShiftToString.hpp>
+#include <OpenSpaceToolkitPhysicsPy/Utility/ArrayCasting.hpp>
+#include <OpenSpaceToolkitPhysicsPy/Utility/DateTimeCasting.hpp>
+#include <OpenSpaceToolkitPhysicsPy/Utility/ShiftToString.hpp>
 #include <pybind11/chrono.h>
 #include <pybind11/eigen.h>
 #include <pybind11/numpy.h>
@@ -12,7 +12,7 @@
 #include <OpenSpaceToolkitPhysicsPy/Coordinate.cpp>
 #include <OpenSpaceToolkitPhysicsPy/Environment.cpp>
 #include <OpenSpaceToolkitPhysicsPy/Time.cpp>
-#include <OpenSpaceToolkitPhysicsPy/Units.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Unit.cpp>
 
 PYBIND11_MODULE(OpenSpaceToolkitPhysicsPy, m)
 {
@@ -33,7 +33,7 @@ PYBIND11_MODULE(OpenSpaceToolkitPhysicsPy, m)
 #endif
 
     // Add python submodules to OpenSpaceToolkitPhysicsPy
-    OpenSpaceToolkitPhysicsPy_Units(m);
+    OpenSpaceToolkitPhysicsPy_Unit(m);
     OpenSpaceToolkitPhysicsPy_Time(m);
     OpenSpaceToolkitPhysicsPy_Coordinate(m);
     OpenSpaceToolkitPhysicsPy_Environment(m);

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame.cpp
@@ -3,7 +3,6 @@
 #include <OpenSpaceToolkit/Physics/Coordinate/Frame.hpp>
 
 #include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp>
-#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp>
 
 inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame(pybind11::module& aModule)
 {
@@ -67,5 +66,4 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame(pybind11::module& aModule
     frame.attr("__path__") = "ostk.physics.coordinate.frame";
 
     OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(frame);
-    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers(frame);
 }
diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider.cpp
@@ -2,6 +2,11 @@
 
 #include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider.hpp>
 
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Dynamic.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/Static.cpp>
+
 inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(pybind11::module& aModule)
 {
     using namespace pybind11;
@@ -18,6 +23,18 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider(pybind11::module
 
         ;
 
+    // Create "provider" python submodule
+    auto provider = aModule.def_submodule("provider");
+
+    // Add __path__ attribute for "provider" submodule
+    provider.attr("__path__") = "ostk.physics.coordinate.frame.provider";
+
+    // Add objects to python "provider" submodules
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Static(provider);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Dynamic(provider);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS(provider);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU(provider);
+
     // register_ptr_to_python<Shared<const Provider>>() ;
 
     // implicitly_convertible<Shared<Provider>, Shared<const Provider>>() ;

diff --git a/...Py/Coordinate/Frame/Providers/Dynamic.cpp → ...sPy/Coordinate/Frame/Provider/Dynamic.cpp b/...Py/Coordinate/Frame/Providers/Dynamic.cpp → ...sPy/Coordinate/Frame/Provider/Dynamic.cpp
@@ -1,10 +1,10 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/Dynamic.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/Dynamic.hpp>
 #include <OpenSpaceToolkit/Physics/Coordinate/Transform.hpp>
 #include <OpenSpaceToolkit/Physics/Time/Instant.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Dynamic(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Dynamic(pybind11::module& aModule)
 {
     using namespace pybind11;
 

diff --git a/...sicsPy/Coordinate/Frame/Providers/IAU.cpp → ...ysicsPy/Coordinate/Frame/Provider/IAU.cpp b/...sicsPy/Coordinate/Frame/Providers/IAU.cpp → ...ysicsPy/Coordinate/Frame/Provider/IAU.cpp
@@ -1,15 +1,15 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IAU/Theory.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IAU/Theory.cpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU(pybind11::module& aModule)
 {
     // Create "IAU" python submodule
     auto IAU = aModule.def_submodule("iau");
 
     // Add __path__ attribute for "IAU" submodule
-    IAU.attr("__path__") = "ostk.physics.coordinate.frame.providers.iau";
+    IAU.attr("__path__") = "ostk.physics.coordinate.frame.provider.iau";
 
     // Add objects to python "IAU" submodules
-    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU_Theory(IAU);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU_Theory(IAU);
 }
diff --git a/...Coordinate/Frame/Providers/IAU/Theory.cpp → .../Coordinate/Frame/Provider/IAU/Theory.cpp b/...Coordinate/Frame/Providers/IAU/Theory.cpp → .../Coordinate/Frame/Provider/IAU/Theory.cpp
@@ -1,12 +1,12 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IAU/Theory.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/IAU/Theory.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IAU_Theory(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IAU_Theory(pybind11::module& aModule)
 {
     using namespace pybind11;
 
-    using ostk::physics::coord::frame::providers::iau::Theory;
+    using ostk::physics::coord::frame::provider::iau::Theory;
 
     enum_<Theory>(aModule, "Theory")
 

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS.cpp
@@ -0,0 +1,19 @@
+/// Apache License 2.0
+
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/BulletinA.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Finals2000A.cpp>
+#include <OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Provider/IERS/Manager.cpp>
+
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS(pybind11::module& aModule)
+{
+    // Create "iers" python submodule
+    auto iers = aModule.def_submodule("iers");
+
+    // Add __path__ attribute for "iers" submodule
+    iers.attr("__path__") = "ostk.physics.coordinate.frame.provider.iers";
+
+    // Add objects to python "iers" submodules
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Manager(iers);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_BulletinA(iers);
+    OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Finals2000A(iers);
+}
diff --git a/...dinate/Frame/Providers/IERS/BulletinA.cpp → ...rdinate/Frame/Provider/IERS/BulletinA.cpp b/...dinate/Frame/Providers/IERS/BulletinA.cpp → ...rdinate/Frame/Provider/IERS/BulletinA.cpp
@@ -1,8 +1,8 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/BulletinA.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/IERS/BulletinA.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_BulletinA(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_BulletinA(pybind11::module& aModule)
 {
     using namespace pybind11;
 

diff --git a/...nate/Frame/Providers/IERS/Finals2000A.cpp → ...inate/Frame/Provider/IERS/Finals2000A.cpp b/...nate/Frame/Providers/IERS/Finals2000A.cpp → ...inate/Frame/Provider/IERS/Finals2000A.cpp
@@ -1,8 +1,8 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/Finals2000A.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/IERS/Finals2000A.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Finals2000A(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Finals2000A(pybind11::module& aModule)
 {
     using namespace pybind11;
 

diff --git a/...ordinate/Frame/Providers/IERS/Manager.cpp → ...oordinate/Frame/Provider/IERS/Manager.cpp b/...ordinate/Frame/Providers/IERS/Manager.cpp → ...oordinate/Frame/Provider/IERS/Manager.cpp
@@ -1,8 +1,8 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/Manager.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/IERS/Manager.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_IERS_Manager(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_IERS_Manager(pybind11::module& aModule)
 {
     using namespace pybind11;
 

diff --git a/...sPy/Coordinate/Frame/Providers/Static.cpp → ...csPy/Coordinate/Frame/Provider/Static.cpp b/...sPy/Coordinate/Frame/Providers/Static.cpp → ...csPy/Coordinate/Frame/Provider/Static.cpp
@@ -1,8 +1,8 @@
 /// Apache License 2.0
 
-#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/Static.hpp>
+#include <OpenSpaceToolkit/Physics/Coordinate/Frame/Provider/Static.hpp>
 
-inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Providers_Static(pybind11::module& aModule)
+inline void OpenSpaceToolkitPhysicsPy_Coordinate_Frame_Provider_Static(pybind11::module& aModule)
 {
     using namespace pybind11;
 

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers.cpp
diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Frame/Providers/IERS.cpp
diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/AER.cpp
@@ -6,8 +6,8 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Spherical_AER(pybind11::module&
 {
     using namespace pybind11;
 
-    using ostk::physics::units::Length;
-    using ostk::physics::units::Angle;
+    using ostk::physics::unit::Length;
+    using ostk::physics::unit::Angle;
     using ostk::physics::coord::Position;
     using ostk::physics::coord::spherical::AER;
 

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Spherical/LLA.cpp
@@ -6,8 +6,8 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Spherical_LLA(pybind11::module&
 {
     using namespace pybind11;
 
-    using ostk::physics::units::Length;
-    using ostk::physics::units::Angle;
+    using ostk::physics::unit::Length;
+    using ostk::physics::unit::Angle;
     using ostk::physics::coord::spherical::LLA;
 
     class_<LLA>(aModule, "LLA")

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment.cpp
@@ -6,7 +6,6 @@
 #include <OpenSpaceToolkitPhysicsPy/Environment/Gravitational.cpp>
 #include <OpenSpaceToolkitPhysicsPy/Environment/Magnetic.cpp>
 #include <OpenSpaceToolkitPhysicsPy/Environment/Object.cpp>
-#include <OpenSpaceToolkitPhysicsPy/Environment/Objects.cpp>
 
 inline void OpenSpaceToolkitPhysicsPy_Environment(pybind11::module& aModule)
 {
@@ -63,7 +62,6 @@ inline void OpenSpaceToolkitPhysicsPy_Environment(pybind11::module& aModule)
     environment.attr("__path__") = "ostk.physics.environment";
 
     OpenSpaceToolkitPhysicsPy_Environment_Object(environment);
-    OpenSpaceToolkitPhysicsPy_Environment_Objects(environment);
     OpenSpaceToolkitPhysicsPy_Environment_Gravitational(environment);
     OpenSpaceToolkitPhysicsPy_Environment_Magnetic(environment);
     OpenSpaceToolkitPhysicsPy_Environment_Atmospheric(environment);

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth.cpp
@@ -21,7 +21,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth(pybind11::mo
     using EarthGravityModel = ostk::physics::environment::gravitational::Earth;
 
     using ostk::physics::environment::object::Celestial;
-    using ostk::physics::units::Length;
+    using ostk::physics::unit::Length;
     using ostk::physics::time::Instant;
     using ostk::physics::coord::Position;
     using ostk::physics::coord::spherical::LLA;

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Atmospheric/Earth/NRLMSISE00.cpp
@@ -2,7 +2,7 @@
 
 #include <OpenSpaceToolkit/Physics/Environment/Atmospheric/Earth.hpp>
 #include <OpenSpaceToolkit/Physics/Environment/Atmospheric/Earth/NRLMSISE00.hpp>
-#include <OpenSpaceToolkit/Physics/Environment/Objects/Celestial.hpp>
+#include <OpenSpaceToolkit/Physics/Environment/Object/Celestial.hpp>
 
 inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth_NRLMSISE00(pybind11::module& aModule)
 {
@@ -11,7 +11,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth_NRLMSISE00(p
     using ostk::core::type::Shared;
     using ostk::core::type::Real;
 
-    using ostk::physics::units::Length;
+    using ostk::physics::unit::Length;
     using ostk::physics::time::Instant;
     using ostk::physics::coord::Frame;
     using ostk::physics::coord::spherical::LLA;

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Model.cpp
@@ -9,8 +9,8 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Gravitational_Model(pybind11::
     using ostk::core::type::Real;
     using ostk::core::type::Shared;
 
-    using ostk::physics::units::Derived;
-    using ostk::physics::units::Length;
+    using ostk::physics::unit::Derived;
+    using ostk::physics::unit::Length;
     using ostk::physics::environment::gravitational::Model;
 
     {

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp
@@ -12,7 +12,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Magnetic_Earth(pybind11::modul
     using ostk::core::filesystem::Directory;
     using ostk::core::type::Shared;
 
-    using ostk::physics::units::Derived;
+    using ostk::physics::unit::Derived;
     using ostk::physics::environment::magnetic::Earth;
     using ostk::physics::environment::magnetic::earth::Manager;
 

diff --git a/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp b/bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object.cpp
@@ -2,6 +2,7 @@
 
 #include <OpenSpaceToolkit/Physics/Environment/Object.hpp>
 
+#include <OpenSpaceToolkitPhysicsPy/Environment/Object/Celestial.cpp>
 #include <OpenSpaceToolkitPhysicsPy/Environment/Object/Geometry.cpp>
 
 inline void OpenSpaceToolkitPhysicsPy_Environment_Object(pybind11::module& aModule)
@@ -50,4 +51,5 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Object(pybind11::module& aModu
 
     // Add elements to object
     OpenSpaceToolkitPhysicsPy_Environment_Object_Geometry(object);
+    OpenSpaceToolkitPhysicsPy_Environment_Object_Celestial(object);
 }