diff --git a/src/main/java/de/thm/arsnova/dao/CacheBuster.java b/src/main/java/de/thm/arsnova/dao/CacheBuster.java
index a0254dcaf9fe2b7e4f8d6e2c25f708004ed231b7..cd9cc80a2c1c351014e0340dee34e3e37939d871 100644
--- a/src/main/java/de/thm/arsnova/dao/CacheBuster.java
+++ b/src/main/java/de/thm/arsnova/dao/CacheBuster.java
@@ -36,7 +36,7 @@ import de.thm.arsnova.events.NewAnswerEvent;
 import de.thm.arsnova.events.NewFeedbackEvent;
 import de.thm.arsnova.events.NewInterposedQuestionEvent;
 import de.thm.arsnova.events.NewQuestionEvent;
-import de.thm.arsnova.events.NewQuestionsEvent;
+import de.thm.arsnova.events.UnlockQuestionsEvent;
 import de.thm.arsnova.events.NewSessionEvent;
 import de.thm.arsnova.events.NovaEventVisitor;
 import de.thm.arsnova.events.PiRoundCancelEvent;
@@ -64,7 +64,7 @@ public class CacheBuster implements ICacheBuster, NovaEventVisitor {
 	public void visit(NewQuestionEvent event) {}
 
 	@Override
-	public void visit(NewQuestionsEvent newQuestionsEvent) {}
+	public void visit(UnlockQuestionsEvent newQuestionsEvent) {}
 
 	@Override
 	public void visit(LockQuestionEvent lockQuestionEvent) {}
diff --git a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
index 84f6e4860b2994b1063d3102e67f370cfd197aa7..198ae7d5f9cc608bdbd78975c7f2c9a5f924f392 100644
--- a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
+++ b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
@@ -40,7 +40,7 @@ import de.thm.arsnova.events.NewAnswerEvent;
 import de.thm.arsnova.events.NewFeedbackEvent;
 import de.thm.arsnova.events.NewInterposedQuestionEvent;
 import de.thm.arsnova.events.NewQuestionEvent;
-import de.thm.arsnova.events.NewQuestionsEvent;
+import de.thm.arsnova.events.UnlockQuestionsEvent;
 import de.thm.arsnova.events.NewSessionEvent;
 import de.thm.arsnova.events.NovaEventVisitor;
 import de.thm.arsnova.events.PiRoundCancelEvent;
@@ -83,7 +83,7 @@ public class LearningProgressFactory implements NovaEventVisitor, ILearningProgr
 
 	@CacheEvict(value = "learningprogress", key = "#event.Session")
 	@Override
-	public void visit(NewQuestionsEvent event) {
+	public void visit(UnlockQuestionsEvent event) {
 		this.publisher.publishEvent(new ChangeLearningProgressEvent(this, event.getSession()));
 	}
 
diff --git a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
index 416ab61431741dec518328cfc9cbafb25cba4fb8..c23fec9c59fbdda0bd6ca118d4934676a326edaf 100644
--- a/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
+++ b/src/main/java/de/thm/arsnova/events/NovaEventVisitor.java
@@ -25,7 +25,7 @@ public interface NovaEventVisitor {
 
 	void visit(NewQuestionEvent newQuestionEvent);
 
-	void visit(NewQuestionsEvent newQuestionsEvent);
+	void visit(UnlockQuestionsEvent newQuestionsEvent);
 
 	void visit(LockQuestionEvent lockQuestionEvent);
 
diff --git a/src/main/java/de/thm/arsnova/events/NewQuestionsEvent.java b/src/main/java/de/thm/arsnova/events/UnlockQuestionsEvent.java
similarity index 89%
rename from src/main/java/de/thm/arsnova/events/NewQuestionsEvent.java
rename to src/main/java/de/thm/arsnova/events/UnlockQuestionsEvent.java
index 4516dbbb82341004236e28fa3f05724cd901785d..5f1e4617e6a2207a8af634ef7daf715792519a99 100644
--- a/src/main/java/de/thm/arsnova/events/NewQuestionsEvent.java
+++ b/src/main/java/de/thm/arsnova/events/UnlockQuestionsEvent.java
@@ -22,13 +22,13 @@ import java.util.List;
 import de.thm.arsnova.entities.Question;
 import de.thm.arsnova.entities.Session;
 
-public class NewQuestionsEvent extends SessionEvent {
+public class UnlockQuestionsEvent extends SessionEvent {
 
 	private static final long serialVersionUID = 1L;
 
 	private List<Question> questions;
 
-	public NewQuestionsEvent(Object source, Session session, List<Question> questions) {
+	public UnlockQuestionsEvent(Object source, Session session, List<Question> questions) {
 		super(source, session);
 		this.questions = questions;
 	}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 079a927f5706ab7a7e2247fb62bc204eaa844ea2..e48f1aadb6c2d4f802b9cc5e30027063ff5da2f8 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -58,7 +58,7 @@ import de.thm.arsnova.events.LockVotingEvent;
 import de.thm.arsnova.events.NewAnswerEvent;
 import de.thm.arsnova.events.NewInterposedQuestionEvent;
 import de.thm.arsnova.events.NewQuestionEvent;
-import de.thm.arsnova.events.NewQuestionsEvent;
+import de.thm.arsnova.events.UnlockQuestionsEvent;
 import de.thm.arsnova.events.NovaEvent;
 import de.thm.arsnova.events.PiRoundCancelEvent;
 import de.thm.arsnova.events.PiRoundDelayedStartEvent;
@@ -871,7 +871,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		final List<Question> questions = databaseDao.publishAllQuestions(session, publish);
 		NovaEvent event;
 		if (publish) {
-			event = new NewQuestionsEvent(this, session, questions);
+			event = new UnlockQuestionsEvent(this, session, questions);
 		} else {
 			event = new LockQuestionsEvent(this, session, questions);
 		}
@@ -889,7 +889,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		databaseDao.publishQuestions(session, publish, questions);
 		NovaEvent event;
 		if (publish) {
-			event = new NewQuestionsEvent(this, session, questions);
+			event = new UnlockQuestionsEvent(this, session, questions);
 		} else {
 			event = new LockQuestionsEvent(this, session, questions);
 		}
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 1e1f975e6e0b2ae04f68b698950ad19578083040..9b658f6010e6bfb3c1a795577591f377c9950cd7 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -66,7 +66,7 @@ import de.thm.arsnova.events.NewAnswerEvent;
 import de.thm.arsnova.events.NewFeedbackEvent;
 import de.thm.arsnova.events.NewInterposedQuestionEvent;
 import de.thm.arsnova.events.NewQuestionEvent;
-import de.thm.arsnova.events.NewQuestionsEvent;
+import de.thm.arsnova.events.UnlockQuestionsEvent;
 import de.thm.arsnova.events.NewSessionEvent;
 import de.thm.arsnova.events.NovaEventVisitor;
 import de.thm.arsnova.events.PiRoundCancelEvent;
@@ -477,7 +477,7 @@ public class ARSnovaSocketIOServer implements ARSnovaSocket, NovaEventVisitor {
 	}
 
 	@Override
-	public void visit(NewQuestionsEvent event) {
+	public void visit(UnlockQuestionsEvent event) {
 		this.reportLecturerQuestionAvailable(event.getSession(), event.getQuestions());
 	}