diff --git a/applications/solvers/potentialFoam/potentialFoam.C b/applications/solvers/potentialFoam/potentialFoam.C
index 6973c7bd0a..c76448cfd8 100644
--- a/applications/solvers/potentialFoam/potentialFoam.C
+++ b/applications/solvers/potentialFoam/potentialFoam.C
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
         "Calculate and write the pressure field"
     );
 
-    #include "addWithFunctionObjectsOption.H"
+    #include "addFunctionObjectsOption.H"
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index fd62425882..3bbbdbcada 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2017-2024 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -1144,7 +1144,7 @@ _foamListTimes_ ()
     local line=${COMP_LINE}
     local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
 
-    opts="-case -constant -doc -fileHandler -help -latestTime -libs -noFunctionObjects -noZero -processor -rm -srcDoc -time -withFunctionEntries -withFunctionObjects -withZero"
+    opts="-case -constant -doc -fileHandler -help -latestTime -libs -noFunctionObjects -noZero -processor -rm -srcDoc -time -functionEntries -functionObjects -withZero"
     for o in $used ; do opts="${opts/$o/}" ; done
     extra=""
 
@@ -2342,7 +2342,7 @@ _potentialFoam_ ()
     local line=${COMP_LINE}
     local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
 
-    opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -noFunctionObjects -parallel -pName -roots -srcDoc -withFunctionObjects -writep -writePhi"
+    opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -parallel -pName -roots -srcDoc -functionObjects -writep -writePhi"
     for o in $used ; do opts="${opts/$o/}" ; done
     extra=""
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 1965fe21a0..9b3246e5e6 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -391,8 +391,8 @@ Foam::Time::Time
     (
         *this,
         enableFunctionObjects
-      ? argList::validOptions.found("withFunctionObjects")
-        ? args.optionFound("withFunctionObjects")
+      ? argList::validOptions.found("functionObjects")
+        ? args.optionFound("functionObjects")
         : !args.optionFound("noFunctionObjects")
       : false
     )
diff --git a/src/OpenFOAM/include/addWithFunctionObjectsOption.H b/src/OpenFOAM/include/addFunctionObjectsOption.H
similarity index 80%
rename from src/OpenFOAM/include/addWithFunctionObjectsOption.H
rename to src/OpenFOAM/include/addFunctionObjectsOption.H
index 341813b6f9..3d4ee1ae90 100644
--- a/src/OpenFOAM/include/addWithFunctionObjectsOption.H
+++ b/src/OpenFOAM/include/addFunctionObjectsOption.H
@@ -2,6 +2,6 @@ Foam::argList::removeOption("noFunctionObjects");
 
 Foam::argList::addBoolOption
 (
-    "withFunctionObjects",
+    "functionObjects",
     "Execute functionObjects"
 );
diff --git a/tutorials/potentialFoam/cylinder/Allrun b/tutorials/potentialFoam/cylinder/Allrun
index 757e102c36..47302e8060 100755
--- a/tutorials/potentialFoam/cylinder/Allrun
+++ b/tutorials/potentialFoam/cylinder/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=$(getApplication)
 
 runApplication blockMesh
-runApplication $application -withFunctionObjects -writePhi -writep
+runApplication $application -functionObjects -writePhi -writep
 runApplication foamPostProcess -func streamFunction
 
 #------------------------------------------------------------------------------