diff --git a/src/main/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluator.java b/src/main/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluator.java
similarity index 96%
rename from src/main/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluator.java
rename to src/main/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluator.java
index 1de39d7467df53200d5ec14faecf91bb1ec637f3..522f49c50867add3e8f1a495006448a78b505608 100644
--- a/src/main/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluator.java
+++ b/src/main/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluator.java
@@ -35,9 +35,9 @@ import org.olat.modules.assessment.model.AssessmentObligation;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class DefaultStatusEvaluator implements StatusEvaluator {
+public class DefaultLearningPathStatusEvaluator implements StatusEvaluator {
 
-	private static final Logger log = Tracing.createLoggerFor(DefaultStatusEvaluator.class);
+	private static final Logger log = Tracing.createLoggerFor(DefaultLearningPathStatusEvaluator.class);
 
 	@Override
 	public AssessmentEntryStatus getStatus(AssessmentEvaluation currentEvaluation,
diff --git a/src/main/java/org/olat/course/learningpath/evaluation/LearningPathEvaluatorBuilder.java b/src/main/java/org/olat/course/learningpath/evaluation/LearningPathEvaluatorBuilder.java
index badac54dd0d80b949c9efa4c2346fbd989c28458..d8c5343e1bf97741fda4c1e4c6b9d90d373aad57 100644
--- a/src/main/java/org/olat/course/learningpath/evaluation/LearningPathEvaluatorBuilder.java
+++ b/src/main/java/org/olat/course/learningpath/evaluation/LearningPathEvaluatorBuilder.java
@@ -37,7 +37,7 @@ public class LearningPathEvaluatorBuilder {
 	private static final EndDateEvaluator CONFIG_END_DATE_EVALUATOR = new ConfigEndDateEvaluator();
 	private static final ConfigObligationEvaluator CONFIG_OBLIGATION_EVALUATOR = new ConfigObligationEvaluator();
 	private static final ConfigDurationEvaluator CONFIG_DURATION_EVALUATOR = new ConfigDurationEvaluator();
-	private static final StatusEvaluator STATUS_EVALUATOR = new DefaultStatusEvaluator();
+	private static final StatusEvaluator STATUS_EVALUATOR = new DefaultLearningPathStatusEvaluator();
 	private static final AccountingEvaluators DEFAULT = AccountingEvaluatorsBuilder
 			.builder()
 			.withStartDateEvaluator(CONFIG_START_DATE_EVALUATOR)
diff --git a/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentHandler.java b/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentHandler.java
index d04e83f959a4fcbabdfdb098c6c47b8fa249344d..0b1928fdc99284abaf6ded7e9f54733837637ba3 100644
--- a/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentHandler.java
+++ b/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentHandler.java
@@ -79,8 +79,8 @@ public class STAssessmentHandler implements AssessmentHandler {
 	private static final ScoreEvaluator AVG_SCORE_EVALUATOR = new CumulatingScoreEvaluator(true);
 	private static final PassedEvaluator CONDITION_PASSED_EVALUATOR = new ConditionPassedEvaluator();
 	private static final RootPassedEvaluator ROOT_PASSED_EVALUATOR = new STRootPassedEvaluator();
-	private static final StatusEvaluator SCORE_STATUS_EVALUATOR = new ScoreStatusEvaluator();
-	private static final StatusEvaluator LEARNING_PATH_STATUS_EVALUATOR = new STStatusEvaluator();
+	private static final StatusEvaluator SCORE_STATUS_EVALUATOR = new STConditionStatusEvaluator();
+	private static final StatusEvaluator LEARNING_PATH_STATUS_EVALUATOR = new STLearningPathStatusEvaluator();
 	private static final FullyAssessedEvaluator FULLY_ASSESSED_EVALUATOR = new STFullyAssessedEvaluator();
 	private static final LastModificationsEvaluator LAST_MODIFICATION_EVALUATOR = new STLastModificationsEvaluator();
 	
diff --git a/src/main/java/org/olat/course/nodes/st/assessment/ScoreStatusEvaluator.java b/src/main/java/org/olat/course/nodes/st/assessment/STConditionStatusEvaluator.java
similarity index 96%
rename from src/main/java/org/olat/course/nodes/st/assessment/ScoreStatusEvaluator.java
rename to src/main/java/org/olat/course/nodes/st/assessment/STConditionStatusEvaluator.java
index 5e5689724c463ab04ec28e93a7e9fb4631fe75e9..d12e6443c85d9c47385976fe84c86babc12ec126 100644
--- a/src/main/java/org/olat/course/nodes/st/assessment/ScoreStatusEvaluator.java
+++ b/src/main/java/org/olat/course/nodes/st/assessment/STConditionStatusEvaluator.java
@@ -32,7 +32,7 @@ import org.olat.modules.assessment.model.AssessmentEntryStatus;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class ScoreStatusEvaluator implements StatusEvaluator {
+public class STConditionStatusEvaluator implements StatusEvaluator {
 
 	@Override
 	public AssessmentEntryStatus getStatus(AssessmentEvaluation currentEvaluation,
diff --git a/src/main/java/org/olat/course/nodes/st/assessment/STStatusEvaluator.java b/src/main/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluator.java
similarity index 95%
rename from src/main/java/org/olat/course/nodes/st/assessment/STStatusEvaluator.java
rename to src/main/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluator.java
index 545d3b5642287b6297916b20e7d888035057b227..fb62c55c7dcfb51c4daa4e2dbd397649d78496ed 100644
--- a/src/main/java/org/olat/course/nodes/st/assessment/STStatusEvaluator.java
+++ b/src/main/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluator.java
@@ -35,9 +35,9 @@ import org.olat.modules.assessment.model.AssessmentObligation;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class STStatusEvaluator implements StatusEvaluator {
+public class STLearningPathStatusEvaluator implements StatusEvaluator {
 
-	private static final Logger log = Tracing.createLoggerFor(STStatusEvaluator.class);
+	private static final Logger log = Tracing.createLoggerFor(STLearningPathStatusEvaluator.class);
 
 	@Override
 	public AssessmentEntryStatus getStatus(AssessmentEvaluation currentEvaluation,
diff --git a/src/test/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluatorTest.java b/src/test/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluatorTest.java
similarity index 96%
rename from src/test/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluatorTest.java
rename to src/test/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluatorTest.java
index ebd0de100099d4db95df4b9a061a080193f410b0..b6c74c2ff205dd92653551a42b9ff883e2898b34 100644
--- a/src/test/java/org/olat/course/learningpath/evaluation/DefaultStatusEvaluatorTest.java
+++ b/src/test/java/org/olat/course/learningpath/evaluation/DefaultLearningPathStatusEvaluatorTest.java
@@ -35,9 +35,9 @@ import org.olat.modules.assessment.model.AssessmentObligation;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class DefaultStatusEvaluatorTest {
+public class DefaultLearningPathStatusEvaluatorTest {
 	
-	private DefaultStatusEvaluator sut = new DefaultStatusEvaluator();
+	private DefaultLearningPathStatusEvaluator sut = new DefaultLearningPathStatusEvaluator();
 	
 	@Test
 	public void shouldBlockIfMandatoryAndNotFullyAssessed() {
diff --git a/src/test/java/org/olat/course/nodes/st/assessment/STStatusEvaluatorTest.java b/src/test/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluatorTest.java
similarity index 98%
rename from src/test/java/org/olat/course/nodes/st/assessment/STStatusEvaluatorTest.java
rename to src/test/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluatorTest.java
index e9d637c8a23bbb585a982301c83d46d11a95866a..4d5651981d0574b0b79fa0e5426952ab98ecf4f4 100644
--- a/src/test/java/org/olat/course/nodes/st/assessment/STStatusEvaluatorTest.java
+++ b/src/test/java/org/olat/course/nodes/st/assessment/STLearningPathStatusEvaluatorTest.java
@@ -37,9 +37,9 @@ import org.olat.modules.assessment.model.AssessmentObligation;
  * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
  *
  */
-public class STStatusEvaluatorTest {
+public class STLearningPathStatusEvaluatorTest {
 	
-	private STStatusEvaluator sut = new STStatusEvaluator();
+	private STLearningPathStatusEvaluator sut = new STLearningPathStatusEvaluator();
 	
 	@Test
 	public void shouldNotBlockIfMandatoryAndNotFullyAssessed() {
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index f41a49b23ede4dbee6b80786532dfdaa9411ba5b..be7aaf6aeedd0886a8cde8152f8d964043bc7f17 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -481,7 +481,7 @@ import org.junit.runners.Suite;
 	org.olat.core.util.DateUtilsTest.class,
 	org.olat.course.learningpath.evaluation.ConfigEndDateEvaluatorTest.class,
 	org.olat.course.learningpath.evaluation.ConfigStartDateEvaluatorTest.class,
-	org.olat.course.learningpath.evaluation.DefaultStatusEvaluatorTest.class,
+	org.olat.course.learningpath.evaluation.DefaultLearningPathStatusEvaluatorTest.class,
 	org.olat.course.learningpath.evaluation.LinearAccessEvaluatorTest.class,
 	org.olat.course.learningpath.manager.LearningPathNodeAccessProviderTest.class,
 	org.olat.course.nodes.st.assessment.PassCounterTest.class,
@@ -493,7 +493,7 @@ import org.junit.runners.Suite;
 	org.olat.course.nodes.st.assessment.STFullyAssessedEvaluatorTest.class,
 	org.olat.course.nodes.st.assessment.STLastModificationsEvaluatorTest.class,
 	org.olat.course.nodes.st.assessment.STRootPassedEvaluatorTest.class,
-	org.olat.course.nodes.st.assessment.STStatusEvaluatorTest.class,
+	org.olat.course.nodes.st.assessment.STLearningPathStatusEvaluatorTest.class,
 	org.olat.course.run.scoring.AverageCompletionEvaluatorTest.class,
 	org.olat.course.run.userview.UserCourseEnvironmentImplTest.class,
 	org.olat.login.validation.PasswordSyntaxValidatorTest.class,