diff --git a/exercises/exercise-coupling-ff-pm/README.md b/exercises/exercise-coupling-ff-pm/README.md
index f5ae0cc6e46840453279d7bebec9ff75605f616c..45fe72ca64ef500c66a3fc620eec97ce33af8ed6 100644
--- a/exercises/exercise-coupling-ff-pm/README.md
+++ b/exercises/exercise-coupling-ff-pm/README.md
@@ -131,7 +131,7 @@ values.setDirichlet(Indices::velocityXIdx); // assume no slip on interface
 ```
 with a Beavers-Joseph-Saffman (BJS) boundary condition for the respective momentum balance:
 ``` cpp
-values.setBJS(Indices::momentumXBalanceIdx);
+values.setBeaversJoseph(Indices::momentumXBalanceIdx);
 ```
 
 at the position where the coupling boundary conditions are set in `interface/freeflowsubproblem.hh`.
@@ -187,7 +187,7 @@ in `main.cc` in the subfolder `interface`.
 
 The same is true for the BJS condition, however, here we need to consider the tangential direction:
 ```cpp
-values.setBJS(1 - scvf.directionIndex());
+values.setBeaversJoseph(1 - scvf.directionIndex());
 ```
 
 The final result should look something like this:
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 6cbd7bab85238ad33422d53b4d721713833b7092..fffa77211255875644a109eace92c54659343ac7 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -184,7 +184,7 @@ public:
             values.setCouplingNeumann(Indices::conti0EqIdx);
             values.setCouplingNeumann(Indices::conti0EqIdx + 1);
             values.setCouplingNeumann(Indices::momentumYBalanceIdx);
-            values.setBJS(Indices::momentumXBalanceIdx);
+            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
         }
 
         return values;
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index d4aec3fa7e516582b484679133e7f3ec38fa6d89..0299d328e8e0268788bcc529d47dc2e8321621e2 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -209,7 +209,7 @@ public:
             values.setCouplingNeumann(Indices::conti0EqIdx + 1);
             values.setCouplingNeumann(Indices::energyEqIdx);
             values.setCouplingNeumann(Indices::momentumYBalanceIdx);
-            values.setBJS(Indices::momentumXBalanceIdx);
+            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
         }
         return values;
     }
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index a5a93f69b2846daa49132c2aea8943c9a6d71536..3e3de450d657cbbefef11efc39ff87e2eb2f0e7a 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -196,11 +196,11 @@ public:
             values.setDirichlet(Indices::velocityXIdx); // assume no slip on interface
 #elif EXNUMBER == 2
             // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation
-            values.setBJS(Indices::momentumXBalanceIdx);
+            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
 #else
             // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation,
             // consider orientation of face automatically
-            values.setBJS(1 - scvf.directionIndex());
+            values.setBeaversJoseph(1 - scvf.directionIndex());
 #endif
         }
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 412aa252dcaa937c3b696747a3fd1f21a86de08f..be8ed6a6df4b72a322059544ec26d2044b5906b6 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -187,7 +187,7 @@ public:
             values.setCouplingNeumann(Indices::conti0EqIdx);
             values.setCouplingNeumann(Indices::conti0EqIdx + 1);
             values.setCouplingNeumann(Indices::momentumYBalanceIdx);
-            values.setBJS(Indices::momentumXBalanceIdx);
+            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
         }
 
         return values;
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index f66af592ca2faec9eee22b519ed02456b8a02166..2167f06d81a2cd75d9e0619e84b20555ccfbcc30 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -220,7 +220,7 @@ public:
             values.setCouplingNeumann(Indices::conti0EqIdx + 1);
             values.setCouplingNeumann(Indices::energyEqIdx);
             values.setCouplingNeumann(Indices::momentumYBalanceIdx);
-            values.setBJS(Indices::momentumXBalanceIdx);
+            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
         }
         return values;
     }