diff --git a/core/src/main/java/ai/timefold/solver/core/enterprise/TimefoldSolverEnterpriseService.java b/core/src/main/java/ai/timefold/solver/core/enterprise/TimefoldSolverEnterpriseService.java
index 59c301148b..1378722578 100644
--- a/core/src/main/java/ai/timefold/solver/core/enterprise/TimefoldSolverEnterpriseService.java
+++ b/core/src/main/java/ai/timefold/solver/core/enterprise/TimefoldSolverEnterpriseService.java
@@ -29,7 +29,7 @@
 import ai.timefold.solver.core.impl.localsearch.decider.LocalSearchDecider;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.Acceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.forager.LocalSearchForager;
-import ai.timefold.solver.core.impl.localsearch.decider.reconfiguration.RestartStrategy;
+import ai.timefold.solver.core.impl.localsearch.decider.restart.RestartStrategy;
 import ai.timefold.solver.core.impl.partitionedsearch.PartitionedSearchPhase;
 import ai.timefold.solver.core.impl.solver.termination.Termination;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/DefaultLocalSearchPhaseFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/DefaultLocalSearchPhaseFactory.java
index d1fc083447..f0a98b2c38 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/DefaultLocalSearchPhaseFactory.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/DefaultLocalSearchPhaseFactory.java
@@ -32,7 +32,7 @@
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.AcceptorFactory;
 import ai.timefold.solver.core.impl.localsearch.decider.forager.LocalSearchForager;
 import ai.timefold.solver.core.impl.localsearch.decider.forager.LocalSearchForagerFactory;
-import ai.timefold.solver.core.impl.localsearch.decider.reconfiguration.RestoreBestSolutionRestartStrategy;
+import ai.timefold.solver.core.impl.localsearch.decider.restart.RestoreBestSolutionRestartStrategy;
 import ai.timefold.solver.core.impl.phase.AbstractPhaseFactory;
 import ai.timefold.solver.core.impl.solver.recaller.BestSolutionRecaller;
 import ai.timefold.solver.core.impl.solver.termination.Termination;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/LocalSearchDecider.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/LocalSearchDecider.java
index 98b6c5f478..306556a797 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/LocalSearchDecider.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/LocalSearchDecider.java
@@ -6,7 +6,7 @@
 import ai.timefold.solver.core.impl.heuristic.selector.move.MoveSelector;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.Acceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.forager.LocalSearchForager;
-import ai.timefold.solver.core.impl.localsearch.decider.reconfiguration.RestartStrategy;
+import ai.timefold.solver.core.impl.localsearch.decider.restart.RestartStrategy;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/AcceptorFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/AcceptorFactory.java
index 580441f954..2b3561840c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/AcceptorFactory.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/AcceptorFactory.java
@@ -15,10 +15,10 @@
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.hillclimbing.HillClimbingAcceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.lateacceptance.DiversifiedLateAcceptanceAcceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.lateacceptance.LateAcceptanceAcceptor;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.DiminishedReturnsStuckCriterion;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.simulatedannealing.SimulatedAnnealingAcceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stepcountinghillclimbing.StepCountingHillClimbingAcceptor;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.DiminishedReturnsStuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.tabu.EntityTabuAcceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.tabu.MoveTabuAcceptor;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.tabu.ValueTabuAcceptor;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/RestartableAcceptor.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/RestartableAcceptor.java
index 11fe342b7d..d914566394 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/RestartableAcceptor.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/RestartableAcceptor.java
@@ -1,6 +1,6 @@
 package ai.timefold.solver.core.impl.localsearch.decider.acceptor;
 
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptor.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptor.java
index 4ceb91f5db..1b5f5a70c1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptor.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptor.java
@@ -4,7 +4,7 @@
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.RestartableAcceptor;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptor.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptor.java
index d6c3832d5c..6433f3ca3e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptor.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptor.java
@@ -4,7 +4,7 @@
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.RestartableAcceptor;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/AbstractGeometricStuckCriterion.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/AbstractGeometricStuckCriterion.java
similarity index 99%
rename from core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/AbstractGeometricStuckCriterion.java
rename to core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/AbstractGeometricStuckCriterion.java
index e114b2f8ff..179fec99fd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/AbstractGeometricStuckCriterion.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/AbstractGeometricStuckCriterion.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart;
+package ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion;
 
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterion.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterion.java
similarity index 99%
rename from core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterion.java
rename to core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterion.java
index 827a115f05..18e7fa2b5b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterion.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterion.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart;
+package ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion;
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchMoveScope;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/StuckCriterion.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/StuckCriterion.java
similarity index 97%
rename from core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/StuckCriterion.java
rename to core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/StuckCriterion.java
index 50ed41342a..0d06ac35d7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/StuckCriterion.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/StuckCriterion.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart;
+package ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion;
 
 import ai.timefold.solver.core.api.solver.Solver;
 import ai.timefold.solver.core.impl.localsearch.event.LocalSearchPhaseLifecycleListener;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategy.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategy.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategy.java
rename to core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategy.java
index eeb48ba18c..135abfd8c8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategy.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategy.java
@@ -1,7 +1,7 @@
-package ai.timefold.solver.core.impl.localsearch.decider.reconfiguration;
+package ai.timefold.solver.core.impl.localsearch.decider.restart;
 
 import ai.timefold.solver.core.impl.localsearch.decider.LocalSearchDecider;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.phase.event.PhaseLifecycleListener;
 import ai.timefold.solver.core.impl.phase.scope.AbstractStepScope;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestoreBestSolutionRestartStrategy.java b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestoreBestSolutionRestartStrategy.java
similarity index 96%
rename from core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestoreBestSolutionRestartStrategy.java
rename to core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestoreBestSolutionRestartStrategy.java
index 347a6e1f55..0f1b8c2751 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestoreBestSolutionRestartStrategy.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestoreBestSolutionRestartStrategy.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.localsearch.decider.reconfiguration;
+package ai.timefold.solver.core.impl.localsearch.decider.restart;
 
 import java.util.Objects;
 
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptorTest.java b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptorTest.java
index 11a83b6568..523168feab 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptorTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/DiversifiedLateAcceptanceAcceptorTest.java
@@ -6,7 +6,7 @@
 
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.AbstractAcceptorTest;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
 import ai.timefold.solver.core.impl.solver.scope.SolverScope;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptorTest.java b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptorTest.java
index 9a6d42bcc5..a0d04cb89a 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptorTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/lateacceptance/LateAcceptanceAcceptorTest.java
@@ -8,7 +8,7 @@
 
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
 import ai.timefold.solver.core.impl.localsearch.decider.acceptor.AbstractAcceptorTest;
-import ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.StuckCriterion;
+import ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.StuckCriterion;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchPhaseScope;
 import ai.timefold.solver.core.impl.localsearch.scope.LocalSearchStepScope;
 import ai.timefold.solver.core.impl.solver.scope.SolverScope;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterionTest.java b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterionTest.java
similarity index 97%
rename from core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterionTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterionTest.java
index e4a8237970..1ba0c0f594 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/restart/DiminishedReturnsStuckCriterionTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/acceptor/stuckcriterion/DiminishedReturnsStuckCriterionTest.java
@@ -1,6 +1,6 @@
-package ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart;
+package ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion;
 
-import static ai.timefold.solver.core.impl.localsearch.decider.acceptor.restart.DiminishedReturnsStuckCriterion.TIME_WINDOW_MILLIS;
+import static ai.timefold.solver.core.impl.localsearch.decider.acceptor.stuckcriterion.DiminishedReturnsStuckCriterion.TIME_WINDOW_MILLIS;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategyTest.java b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategyTest.java
similarity index 95%
rename from core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategyTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategyTest.java
index 3588e01210..1614155a31 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/reconfiguration/RestartStrategyTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/localsearch/decider/restart/RestartStrategyTest.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.localsearch.decider.reconfiguration;
+package ai.timefold.solver.core.impl.localsearch.decider.restart;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.*;