diff --git a/test/TestCellSortingLiteratePaper.hpp b/test/TestCellSortingLiteratePaper.hpp
index c1ce94d..8e75701 100644
--- a/test/TestCellSortingLiteratePaper.hpp
+++ b/test/TestCellSortingLiteratePaper.hpp
@@ -43,7 +43,8 @@
 
 #include "MeshBasedCellPopulationWithGhostNodes.hpp"
 #include "HoneycombMeshGenerator.hpp"
-#include "DifferentialAdhesionGeneralisedLinearSpringForce.hpp"
+#include "DifferentialAdhesionPathmanathanInteractionForce.hpp"
+#include "DifferentialAdhesionLinearSpringForce.hpp"
 
 #include "OnLatticeSimulation.hpp"
 #include "CellPopulationAdjacencyMatrixWriter.hpp"
@@ -311,8 +312,8 @@ class TestCellSortingLiteratePaper : public AbstractCellBasedWithTimingsTestSuit
         simulator.SetEndTime(M_TIME_TO_STEADY_STATE);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(DifferentialAdhesionGeneralisedLinearSpringForce<2>, p_differential_adhesion_force);
-        p_differential_adhesion_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(DifferentialAdhesionPathmanathanInteractionForce<2>, p_differential_adhesion_force);
+        p_differential_adhesion_force->SetSpringStiffness(50.0);
         p_differential_adhesion_force->SetHomotypicLabelledSpringConstantMultiplier(1.0);
         p_differential_adhesion_force->SetHeterotypicSpringConstantMultiplier(0.1);
         p_differential_adhesion_force->SetCutOffLength(cut_off_length);
@@ -384,8 +385,8 @@ class TestCellSortingLiteratePaper : public AbstractCellBasedWithTimingsTestSuit
         simulator.SetEndTime(M_TIME_TO_STEADY_STATE);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(DifferentialAdhesionGeneralisedLinearSpringForce<2>, p_differential_adhesion_force);
-        p_differential_adhesion_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(DifferentialAdhesionLinearSpringForce<2>, p_differential_adhesion_force);
+        p_differential_adhesion_force->SetSpringStiffness(50.0);
         p_differential_adhesion_force->SetHomotypicLabelledSpringConstantMultiplier(1.0);
         p_differential_adhesion_force->SetHeterotypicSpringConstantMultiplier(0.1);
         simulator.AddForce(p_differential_adhesion_force);
diff --git a/test/TestCylindricalCryptLiteratePaper.hpp b/test/TestCylindricalCryptLiteratePaper.hpp
index 4251564..e1a3094 100644
--- a/test/TestCylindricalCryptLiteratePaper.hpp
+++ b/test/TestCylindricalCryptLiteratePaper.hpp
@@ -47,7 +47,8 @@
 #include "OnLatticeSimulation.hpp"
 
 #include "NagaiHondaForce.hpp"
-#include "RepulsionForce.hpp"
+#include "LinearSpringForce.hpp"
+#include "PathmanathanInteractionForce.hpp"
 #include "DiffusionCaUpdateRule.hpp"
 #include "VolumeConstraintPottsUpdateRule.hpp"
 #include "AdhesionPottsUpdateRule.hpp"
@@ -329,8 +330,8 @@ class TestCylindricalCryptLiteratePaper : public AbstractCellBasedWithTimingsTes
         simulator.AddSimulationModifier(p_modifier);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         p_linear_force->SetCutOffLength(cut_off_length);
         simulator.AddForce(p_linear_force);
 
@@ -407,8 +408,8 @@ class TestCylindricalCryptLiteratePaper : public AbstractCellBasedWithTimingsTes
         simulator.AddSimulationModifier(p_modifier);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(LinearSpringForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         simulator.AddForce(p_linear_force);
 
         // Solid base boundary condition
diff --git a/test/TestDeltaNotchLiteratePaper.hpp b/test/TestDeltaNotchLiteratePaper.hpp
index 89c8ad2..5be3823 100644
--- a/test/TestDeltaNotchLiteratePaper.hpp
+++ b/test/TestDeltaNotchLiteratePaper.hpp
@@ -41,9 +41,11 @@
 
 #include "MeshBasedCellPopulationWithGhostNodes.hpp"
 #include "HoneycombMeshGenerator.hpp"
+#include "NodesOnlyMesh.hpp"
+#include "NodeBasedCellPopulation.hpp"
 #include "DiffusionForce.hpp"
-#include "RepulsionForce.hpp"
-#include "GeneralisedLinearSpringForce.hpp"
+#include "LinearSpringForce.hpp"
+#include "PathmanathanInteractionForce.hpp"
 
 #include "OnLatticeSimulation.hpp"
 #include "DeltaNotchTrackingModifier.hpp"
@@ -314,8 +316,8 @@ class TestDeltaNotchLiteratePaper: public AbstractCellBasedWithTimingsTestSuite
         simulator.AddSimulationModifier(p_differentiation_modifier);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         p_linear_force->SetCutOffLength(cut_off_length);
         simulator.AddForce(p_linear_force);
 
@@ -378,8 +380,8 @@ class TestDeltaNotchLiteratePaper: public AbstractCellBasedWithTimingsTestSuite
         simulator.AddSimulationModifier(p_differentiation_modifier);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(LinearSpringForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         p_linear_force->SetCutOffLength(1.5);
         simulator.AddForce(p_linear_force);
 
diff --git a/test/TestMorphogenMonolayerLiteratePaper.hpp b/test/TestMorphogenMonolayerLiteratePaper.hpp
index d801af4..60ae90b 100644
--- a/test/TestMorphogenMonolayerLiteratePaper.hpp
+++ b/test/TestMorphogenMonolayerLiteratePaper.hpp
@@ -44,10 +44,10 @@
 
 #include "MeshBasedCellPopulationWithGhostNodes.hpp"
 #include "HoneycombMeshGenerator.hpp"
-#include "GeneralisedLinearSpringForce.hpp"
+#include "LinearSpringForce.hpp"
+#include "PathmanathanInteractionForce.hpp"
 
 #include "NodeBasedCellPopulation.hpp"
-#include "RepulsionForce.hpp"
 
 #include "VertexBasedCellPopulation.hpp"
 #include "HoneycombVertexMeshGenerator.hpp"
@@ -341,8 +341,8 @@ class TestMorphogenMonolayerLiteratePaper : public AbstractCellBasedWithTimingsT
         simulator.SetOutputDivisionLocations(true);
 
         // Create a force law and pass it to the simulation
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         p_linear_force->SetCutOffLength(cut_off_length);
         simulator.AddForce(p_linear_force);
 
@@ -416,8 +416,8 @@ class TestMorphogenMonolayerLiteratePaper : public AbstractCellBasedWithTimingsT
 
         simulator.SetOutputDivisionLocations(true);
 
-        MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
-        p_linear_force->SetMeinekeSpringStiffness(50.0);
+        MAKE_PTR(LinearSpringForce<2>, p_linear_force);
+        p_linear_force->SetSpringStiffness(50.0);
         p_linear_force->SetCutOffLength(1.5);
         simulator.AddForce(p_linear_force);