diff --git a/pom.xml b/pom.xml
index 3393873..6311831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>lu.jpt</groupId>
-	<artifactId>CSPARQL-TestPack</artifactId>
+	<artifactId>CSPARQL-Carsimulation</artifactId>
 	<version>0.0.1</version>
 	<packaging>jar</packaging>
 
-	<name>csparql-testpack</name>
+	<name>csparql-carsimulation</name>
 
 	<url></url>
 
@@ -83,7 +83,7 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>lu.jpt.csparqltest.Main</mainClass>
+							<mainClass>lu.jpt.csparqlproject.Main</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
diff --git a/src/main/java/lu/jpt/csparqltest/Main.java b/src/main/java/lu/jpt/csparqlproject/Main.java
similarity index 93%
rename from src/main/java/lu/jpt/csparqltest/Main.java
rename to src/main/java/lu/jpt/csparqlproject/Main.java
index b8cda92..ef6d355 100644
--- a/src/main/java/lu/jpt/csparqltest/Main.java
+++ b/src/main/java/lu/jpt/csparqlproject/Main.java
@@ -1,10 +1,10 @@
-package lu.jpt.csparqltest;
+package lu.jpt.csparqlproject;
 
 import org.apache.log4j.PropertyConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import lu.jpt.csparqltest.gui.SimulationControlWindow;
+import lu.jpt.csparqlproject.gui.SimulationControlWindow;
 
 /**
  * This is the main entry point of the whole project. A logger is being set up
diff --git a/src/main/java/lu/jpt/csparqltest/SimulationContext.java b/src/main/java/lu/jpt/csparqlproject/SimulationContext.java
similarity index 97%
rename from src/main/java/lu/jpt/csparqltest/SimulationContext.java
rename to src/main/java/lu/jpt/csparqlproject/SimulationContext.java
index b773263..56f4cbe 100644
--- a/src/main/java/lu/jpt/csparqltest/SimulationContext.java
+++ b/src/main/java/lu/jpt/csparqlproject/SimulationContext.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest;
+package lu.jpt.csparqlproject;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -11,9 +11,9 @@ import eu.larkc.csparql.cep.api.RdfStream;
 import eu.larkc.csparql.core.engine.CsparqlEngine;
 import eu.larkc.csparql.core.engine.CsparqlEngineImpl;
 import eu.larkc.csparql.core.engine.CsparqlQueryResultProxy;
-import lu.jpt.csparqltest.gui.TextObserverWindow;
-import lu.jpt.csparqltest.rentacar.RentACarSimulation;
-import lu.jpt.csparqltest.util.CsparqlQueryHelper;
+import lu.jpt.csparqlproject.gui.TextObserverWindow;
+import lu.jpt.csparqlproject.rentacar.RentACarSimulation;
+import lu.jpt.csparqlproject.util.CsparqlQueryHelper;
 
 /**
  * This class encapsulates the use of the C-SPARQL Engine. Here, the RentACarSimulation,
diff --git a/src/main/java/lu/jpt/csparqltest/gui/SimulationControlWindow.java b/src/main/java/lu/jpt/csparqlproject/gui/SimulationControlWindow.java
similarity index 97%
rename from src/main/java/lu/jpt/csparqltest/gui/SimulationControlWindow.java
rename to src/main/java/lu/jpt/csparqlproject/gui/SimulationControlWindow.java
index 35821b7..1739d33 100644
--- a/src/main/java/lu/jpt/csparqltest/gui/SimulationControlWindow.java
+++ b/src/main/java/lu/jpt/csparqlproject/gui/SimulationControlWindow.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.gui;
+package lu.jpt.csparqlproject.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
@@ -9,7 +9,7 @@ import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import lu.jpt.csparqltest.SimulationContext;
+import lu.jpt.csparqlproject.SimulationContext;
 
 /**
  * Basically a window with control buttons that trigger actions 
diff --git a/src/main/java/lu/jpt/csparqltest/gui/TextObserverWindow.java b/src/main/java/lu/jpt/csparqlproject/gui/TextObserverWindow.java
similarity index 99%
rename from src/main/java/lu/jpt/csparqltest/gui/TextObserverWindow.java
rename to src/main/java/lu/jpt/csparqlproject/gui/TextObserverWindow.java
index 95a3fba..b1ee952 100644
--- a/src/main/java/lu/jpt/csparqltest/gui/TextObserverWindow.java
+++ b/src/main/java/lu/jpt/csparqlproject/gui/TextObserverWindow.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.gui;
+package lu.jpt.csparqlproject.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
diff --git a/src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java b/src/main/java/lu/jpt/csparqlproject/misc/TestStreamGenerator.java
similarity index 90%
rename from src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java
rename to src/main/java/lu/jpt/csparqlproject/misc/TestStreamGenerator.java
index 581bad4..6da88aa 100644
--- a/src/main/java/lu/jpt/csparqltest/misc/TestStreamGenerator.java
+++ b/src/main/java/lu/jpt/csparqlproject/misc/TestStreamGenerator.java
@@ -1,11 +1,11 @@
-package lu.jpt.csparqltest.misc;
+package lu.jpt.csparqlproject.misc;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
-import lu.jpt.csparqltest.util.RandomHelper;
-import lu.jpt.csparqltest.util.WindowLoggingRdfStream;
+import lu.jpt.csparqlproject.util.RandomHelper;
+import lu.jpt.csparqlproject.util.WindowLoggingRdfStream;
 
 /**
  * This event stream generator was used for debugging and experimenting
diff --git a/src/main/java/lu/jpt/csparqltest/misc/UnusedQueryCollection.java b/src/main/java/lu/jpt/csparqlproject/misc/UnusedQueryCollection.java
similarity index 98%
rename from src/main/java/lu/jpt/csparqltest/misc/UnusedQueryCollection.java
rename to src/main/java/lu/jpt/csparqlproject/misc/UnusedQueryCollection.java
index a85fd62..cf47f69 100644
--- a/src/main/java/lu/jpt/csparqltest/misc/UnusedQueryCollection.java
+++ b/src/main/java/lu/jpt/csparqlproject/misc/UnusedQueryCollection.java
@@ -1,6 +1,6 @@
-package lu.jpt.csparqltest.misc;
+package lu.jpt.csparqlproject.misc;
 
-import lu.jpt.csparqltest.rentacar.RentACarSimulation;
+import lu.jpt.csparqlproject.rentacar.RentACarSimulation;
 
 /**
  * This class contains a bunch of unused C-SPARQL queries.
diff --git a/src/main/java/lu/jpt/csparqltest/rentacar/Car.java b/src/main/java/lu/jpt/csparqlproject/rentacar/Car.java
similarity index 99%
rename from src/main/java/lu/jpt/csparqltest/rentacar/Car.java
rename to src/main/java/lu/jpt/csparqlproject/rentacar/Car.java
index bcbb4c2..796a9e5 100644
--- a/src/main/java/lu/jpt/csparqltest/rentacar/Car.java
+++ b/src/main/java/lu/jpt/csparqlproject/rentacar/Car.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.rentacar;
+package lu.jpt.csparqlproject.rentacar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
-import lu.jpt.csparqltest.util.RandomHelper;
+import lu.jpt.csparqlproject.util.RandomHelper;
 
 /**
  * This class is all about simulating aspects of different cars.
diff --git a/src/main/java/lu/jpt/csparqltest/rentacar/CarPool.java b/src/main/java/lu/jpt/csparqlproject/rentacar/CarPool.java
similarity index 97%
rename from src/main/java/lu/jpt/csparqltest/rentacar/CarPool.java
rename to src/main/java/lu/jpt/csparqlproject/rentacar/CarPool.java
index 78612aa..db504c2 100644
--- a/src/main/java/lu/jpt/csparqltest/rentacar/CarPool.java
+++ b/src/main/java/lu/jpt/csparqlproject/rentacar/CarPool.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.rentacar;
+package lu.jpt.csparqlproject.rentacar;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/lu/jpt/csparqltest/rentacar/Driver.java b/src/main/java/lu/jpt/csparqlproject/rentacar/Driver.java
similarity index 98%
rename from src/main/java/lu/jpt/csparqltest/rentacar/Driver.java
rename to src/main/java/lu/jpt/csparqlproject/rentacar/Driver.java
index b74ebc1..7168ce2 100644
--- a/src/main/java/lu/jpt/csparqltest/rentacar/Driver.java
+++ b/src/main/java/lu/jpt/csparqlproject/rentacar/Driver.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.rentacar;
+package lu.jpt.csparqlproject.rentacar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
-import lu.jpt.csparqltest.util.RandomHelper;
+import lu.jpt.csparqlproject.util.RandomHelper;
 
 /**
  * Since simulating cars is boring without simulating persons that drive these cars,
diff --git a/src/main/java/lu/jpt/csparqltest/rentacar/RentACarSimulation.java b/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
similarity index 98%
rename from src/main/java/lu/jpt/csparqltest/rentacar/RentACarSimulation.java
rename to src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
index a938115..171b647 100644
--- a/src/main/java/lu/jpt/csparqltest/rentacar/RentACarSimulation.java
+++ b/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.rentacar;
+package lu.jpt.csparqlproject.rentacar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
 import eu.larkc.csparql.cep.api.RdfStream;
-import lu.jpt.csparqltest.util.WindowLoggingRdfStream;
+import lu.jpt.csparqlproject.util.WindowLoggingRdfStream;
 
 /**
  * This is the main simulation part of the project.
diff --git a/src/main/java/lu/jpt/csparqltest/util/CsparqlQueryHelper.java b/src/main/java/lu/jpt/csparqlproject/util/CsparqlQueryHelper.java
similarity index 96%
rename from src/main/java/lu/jpt/csparqltest/util/CsparqlQueryHelper.java
rename to src/main/java/lu/jpt/csparqlproject/util/CsparqlQueryHelper.java
index 6f209da..5c9a8cc 100644
--- a/src/main/java/lu/jpt/csparqltest/util/CsparqlQueryHelper.java
+++ b/src/main/java/lu/jpt/csparqlproject/util/CsparqlQueryHelper.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.util;
+package lu.jpt.csparqlproject.util;
 
 import java.util.StringTokenizer;
 
diff --git a/src/main/java/lu/jpt/csparqltest/util/LoggableRdfStream.java b/src/main/java/lu/jpt/csparqlproject/util/LoggableRdfStream.java
similarity index 94%
rename from src/main/java/lu/jpt/csparqltest/util/LoggableRdfStream.java
rename to src/main/java/lu/jpt/csparqlproject/util/LoggableRdfStream.java
index 8f50679..7315723 100644
--- a/src/main/java/lu/jpt/csparqltest/util/LoggableRdfStream.java
+++ b/src/main/java/lu/jpt/csparqlproject/util/LoggableRdfStream.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.util;
+package lu.jpt.csparqlproject.util;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
 import eu.larkc.csparql.cep.api.RdfStream;
diff --git a/src/main/java/lu/jpt/csparqltest/util/RandomHelper.java b/src/main/java/lu/jpt/csparqlproject/util/RandomHelper.java
similarity index 95%
rename from src/main/java/lu/jpt/csparqltest/util/RandomHelper.java
rename to src/main/java/lu/jpt/csparqlproject/util/RandomHelper.java
index a74ea2b..a42f5b3 100644
--- a/src/main/java/lu/jpt/csparqltest/util/RandomHelper.java
+++ b/src/main/java/lu/jpt/csparqlproject/util/RandomHelper.java
@@ -1,4 +1,4 @@
-package lu.jpt.csparqltest.util;
+package lu.jpt.csparqlproject.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/lu/jpt/csparqltest/util/WindowLoggingRdfStream.java b/src/main/java/lu/jpt/csparqlproject/util/WindowLoggingRdfStream.java
similarity index 90%
rename from src/main/java/lu/jpt/csparqltest/util/WindowLoggingRdfStream.java
rename to src/main/java/lu/jpt/csparqlproject/util/WindowLoggingRdfStream.java
index 12eb8ae..0b2621a 100644
--- a/src/main/java/lu/jpt/csparqltest/util/WindowLoggingRdfStream.java
+++ b/src/main/java/lu/jpt/csparqlproject/util/WindowLoggingRdfStream.java
@@ -1,7 +1,7 @@
-package lu.jpt.csparqltest.util;
+package lu.jpt.csparqlproject.util;
 
 import eu.larkc.csparql.cep.api.RdfQuadruple;
-import lu.jpt.csparqltest.gui.TextObserverWindow;
+import lu.jpt.csparqlproject.gui.TextObserverWindow;
 
 /**
  * Using this class, RdfStreams can automatically be made visible