diff --git a/src/Listener.h b/src/Listener.h
index 4474ced..31def5a 100644
--- a/src/Listener.h
+++ b/src/Listener.h
@@ -3,10 +3,10 @@
 #include <iostream>
 #include "Event.h"
 
-template <typename EventType>
+template <typename T>
 class Listener {
 public:
-	virtual void accept(EventType *) {}
+	virtual void accept(T *) {}
 };
 
 class InputListener : public Listener<InputEvent> {
diff --git a/src/Queue.h b/src/Queue.h
index 2a55595..63c295e 100644
--- a/src/Queue.h
+++ b/src/Queue.h
@@ -52,11 +52,11 @@ public:
 };
 
 
-template <typename EventType>
-class EventQueue : private Queue<EventType>{
-	std::set<Listener<EventType> *> listeners;
+template <typename T>
+class EventQueue : private Queue<T>{
+	std::set<Listener<T> *> listeners;
 	void update() override {
-		EventType * event = this->pop();
+		T * event = this->pop();
 
 		for (auto listener : listeners)
 			listener->accept(event);
@@ -64,13 +64,13 @@ class EventQueue : private Queue<EventType>{
 		delete event;
 	}
 public:
-	void submitEvent(EventType * event){
+	void submitEvent(T * event){
 		this->push(event);
 	}
-	void registerListener(Listener<EventType> * listener){
+	void registerListener(Listener<T> * listener){
 		listeners.insert(listener);
 	}
-	void unregisterListener(Listener<EventType> * listener){
+	void unregisterListener(Listener<T> * listener){
 		listeners.erase(listener);
 	}
 };