diff --git a/Makefile b/Makefile
index fd3ec36..e0d2ff0 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ test-build: $(BUILD_DIR) $(C_OBJECTS) $(CPP_OBJECTS) $(TEST_OBJECTS)
 		build/config_loader.o \
 		build/config_validator.o \
 		build/maneuver.o \
-		build/rendezvous_hohmann.o \
+		build/rendezvous.o \
 		-o $(TEST_TARGET) -lCatch2Main -lCatch2 -lm
 
 # Run automated test suite
diff --git a/src/rendezvous_hohmann.cpp b/src/rendezvous.cpp
similarity index 99%
rename from src/rendezvous_hohmann.cpp
rename to src/rendezvous.cpp
index e837032..60017b3 100644
--- a/src/rendezvous_hohmann.cpp
+++ b/src/rendezvous.cpp
@@ -1,4 +1,4 @@
-#include "rendezvous_hohmann.h"
+#include "rendezvous.h"
 #include <math.h>
 #include <float.h>
 
diff --git a/src/rendezvous_hohmann.h b/src/rendezvous.h
similarity index 98%
rename from src/rendezvous_hohmann.h
rename to src/rendezvous.h
index 55e70ed..0f97760 100644
--- a/src/rendezvous_hohmann.h
+++ b/src/rendezvous.h
@@ -1,5 +1,5 @@
-#ifndef RENDEZVOUS_HOHMANN_H
-#define RENDEZVOUS_HOHMANN_H
+#ifndef RENDEZVOUS_H
+#define RENDEZVOUS_H
 
 #include "orbital_mechanics.h"
 #include "simulation.h"
diff --git a/tests/test_rendezvous_hohmann.cpp b/tests/test_rendezvous.cpp
similarity index 97%
rename from tests/test_rendezvous_hohmann.cpp
rename to tests/test_rendezvous.cpp
index bc33073..9c6d862 100644
--- a/tests/test_rendezvous_hohmann.cpp
+++ b/tests/test_rendezvous.cpp
@@ -4,7 +4,7 @@
 #include "../src/orbital_mechanics.h"
 #include "../src/simulation.h"
 #include "../src/orbital_objects.h"
-#include "../src/rendezvous_hohmann.h"
+#include "../src/rendezvous.h"
 #include "../src/config_loader.h"
 #include "../src/test_utilities.h"
 #include <cmath>
@@ -33,7 +33,7 @@ TEST_CASE("Config loading for Hohmann transfer", "[rendezvous_hohmann][config]")
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
 
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
 
     REQUIRE(sim->body_count == 1);
     REQUIRE(std::string(sim->bodies[0].name) == "Earth");
@@ -63,7 +63,7 @@ TEST_CASE("Calculate wait time for Hohmann transfer (lower to higher)", "[rendez
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
 
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
 
     int target_idx = find_spacecraft_by_name(sim, "Target_Satellite");
     int chaser_lower_idx = find_spacecraft_by_name(sim, "Chaser_Lower");
@@ -118,7 +118,7 @@ TEST_CASE("Calculate wait time for Hohmann transfer (higher to lower)", "[rendez
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
 
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
 
     int target_idx = find_spacecraft_by_name(sim, "Target_Satellite");
     int chaser_higher_idx = find_spacecraft_by_name(sim, "Chaser_Higher");
@@ -162,7 +162,7 @@ TEST_CASE("Calculate required separation for Hohmann transfer", "[rendezvous_hoh
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
 
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
 
     int target_idx = find_spacecraft_by_name(sim, "Target_Satellite");
     int chaser_lower_idx = find_spacecraft_by_name(sim, "Chaser_Lower");
@@ -220,7 +220,7 @@ TEST_CASE("Validate Hohmann transfer parameters", "[rendezvous_hohmann][validati
     const double TIME_STEP = 30.0;
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
     initialize_orbital_objects(sim);
 
     Spacecraft* chaser_lower = &sim->spacecraft[1];
@@ -281,7 +281,7 @@ TEST_CASE("Calculate relative orbit period", "[rendezvous_hohmann][phasing]") {
     const double TIME_STEP = 30.0;
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
     initialize_orbital_objects(sim);
 
     Spacecraft* chaser_lower = &sim->spacecraft[1];
@@ -344,7 +344,7 @@ TEST_CASE("Calculate next valid wait time for Hohmann transfer", "[rendezvous_ho
     const double TIME_STEP = 30.0;
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
     initialize_orbital_objects(sim);
 
     Spacecraft* chaser_lower = &sim->spacecraft[1];
@@ -434,7 +434,7 @@ SCENARIO("Hohmann transfer rendezvous with validation", "[rendezvous_hohmann][in
     const double TIME_STEP = 0.1;
 
     SimulationState* sim = create_simulation(3, 5, 10, TIME_STEP);
-    REQUIRE(load_system_config(sim, "tests/test_rendezvous_hohmann.toml"));
+    REQUIRE(load_system_config(sim, "tests/test_rendezvous.toml"));
 
     int target_idx = find_spacecraft_by_name(sim, "Target_Satellite");
     int chaser_lower_idx = find_spacecraft_by_name(sim, "Chaser_Lower");
diff --git a/tests/test_rendezvous_hohmann.toml b/tests/test_rendezvous.toml
similarity index 100%
rename from tests/test_rendezvous_hohmann.toml
rename to tests/test_rendezvous.toml