diff --git a/src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
similarity index 95%
rename from src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java
rename to src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
index 2490a06270a137d023d49387edfcc0ae08520510..3739548fa992de43167b7e7e0bb9803fc2123862 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java
+++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
@@ -43,9 +43,9 @@ import de.thm.arsnova.services.IQuestionService;
 
 @Controller
 @RequestMapping("/audiencequestion")
-public class QuestionByAudienceController extends AbstractController {
+public class AudienceQuestionController extends AbstractController {
 
-	public static final Logger LOGGER = LoggerFactory.getLogger(QuestionByAudienceController.class);
+	public static final Logger LOGGER = LoggerFactory.getLogger(AudienceQuestionController.class);
 
 	@Autowired
 	private IQuestionService questionService;
diff --git a/src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
similarity index 98%
rename from src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java
rename to src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 7a6c1be4344fa27ed66d9d3644a2ded6e51f8a22..281cc59930f37417410ed049681ff0bca71cdd86 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -45,9 +45,9 @@ import de.thm.arsnova.services.IQuestionService;
 
 @Controller
 @RequestMapping("/lecturerquestion")
-public class QuestionByLecturerController extends AbstractController {
+public class LecturerQuestionController extends AbstractController {
 
-	public static final Logger LOGGER = LoggerFactory.getLogger(QuestionByLecturerController.class);
+	public static final Logger LOGGER = LoggerFactory.getLogger(LecturerQuestionController.class);
 
 	@Autowired
 	private IQuestionService questionService;
diff --git a/src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
similarity index 93%
rename from src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java
rename to src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
index bed22194e6958f79304ade068d9474ea78f270fb..3ea9fb83d1eab66be3813cda4a7eec8933b43e8f 100644
--- a/src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
@@ -30,7 +30,7 @@ import de.thm.arsnova.services.StubUserService;
 		"file:src/main/webapp/WEB-INF/spring/arsnova-servlet.xml",
 		"file:src/main/webapp/WEB-INF/spring/spring-main.xml",
 		"file:src/test/resources/test-config.xml" })
-public class QuestionByLecturerControllerTest {
+public class LecturerQuestionControllerTest {
 
 	@Inject
 	private ApplicationContext applicationContext;
@@ -39,7 +39,7 @@ public class QuestionByLecturerControllerTest {
 	private HandlerAdapter handlerAdapter;
 
 	@Autowired
-	private QuestionByLecturerController questionByLecturerController;
+	private LecturerQuestionController lecturerQuestionController;
 	
 	@Autowired
 	private StubUserService userService;
@@ -68,7 +68,7 @@ public class QuestionByLecturerControllerTest {
 		
 		request.setMethod("GET");
 		request.setRequestURI("/session/00000000/questionids");
-		final ModelAndView mav = handlerAdapter.handle(request, response, questionByLecturerController);
+		final ModelAndView mav = handlerAdapter.handle(request, response, lecturerQuestionController);
 		
 		assertNull(mav);
 		assertTrue(response.getStatus() == 404);
@@ -82,7 +82,7 @@ public class QuestionByLecturerControllerTest {
 		
 		request.setMethod("GET");
 		request.setRequestURI("/session/00000000/questionids");
-		final ModelAndView mav = handlerAdapter.handle(request, response, questionByLecturerController);
+		final ModelAndView mav = handlerAdapter.handle(request, response, lecturerQuestionController);
 		
 		assertNull(mav);
 		assertTrue(response.getStatus() == 401);