diff --git a/Procfile b/Procfile
index 555b9c0..ea6bffa 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: java -jar server/target/lingo-websocket-server.jar
+web: java -jar server/target/lingo-server.jar
diff --git a/client-api/pom.xml b/client-api/pom.xml
index 960ff5c..d58147f 100644
--- a/client-api/pom.xml
+++ b/client-api/pom.xml
@@ -4,18 +4,18 @@
 
 	<parent>
 		<groupId>com.charego</groupId>
-		<artifactId>lingo-websocket</artifactId>
+		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>
 
-	<artifactId>lingo-websocket-client-api</artifactId>
-	<name>Lingo WebSocket :: Client API</name>
+	<artifactId>lingo-client-api</artifactId>
+	<name>Lingo :: Client API</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
-			<artifactId>lingo-websocket-common</artifactId>
+			<artifactId>lingo-common</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/client/pom.xml b/client/pom.xml
index 6c4a418..871a26c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -4,12 +4,12 @@
 
 	<parent>
 		<groupId>com.charego</groupId>
-		<artifactId>lingo-websocket</artifactId>
+		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>
 
-	<artifactId>lingo-websocket-client</artifactId>
-	<name>Lingo WebSocket :: Client</name>
+	<artifactId>lingo-client</artifactId>
+	<name>Lingo :: Client</name>
 
 	<properties>
 		<javafx.version>11.0.2</javafx.version>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
-			<artifactId>lingo-websocket-client-api</artifactId>
+			<artifactId>lingo-client-api</artifactId>
 		</dependency>
 
 		<!-- Web -->
diff --git a/common/pom.xml b/common/pom.xml
index ecf01d2..cf62770 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,12 +4,12 @@
 
 	<parent>
 		<groupId>com.charego</groupId>
-		<artifactId>lingo-websocket</artifactId>
+		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>
 
-	<artifactId>lingo-websocket-common</artifactId>
-	<name>Lingo WebSocket :: Common</name>
+	<artifactId>lingo-common</artifactId>
+	<name>Lingo :: Common</name>
 
 	<dependencies>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index d01269a..dc123d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,11 @@
 	</parent>
 
 	<groupId>com.charego</groupId>
-	<artifactId>lingo-websocket</artifactId>
+	<artifactId>lingo-parent</artifactId>
 	<version>1.0</version>
 	<packaging>pom</packaging>
 
-	<name>Lingo WebSocket</name>
+	<name>Lingo</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/server/pom.xml b/server/pom.xml
index a366bf4..3102f82 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,18 +4,18 @@
 
 	<parent>
 		<groupId>com.charego</groupId>
-		<artifactId>lingo-websocket</artifactId>
+		<artifactId>lingo-parent</artifactId>
 		<version>1.0</version>
 	</parent>
 
-	<artifactId>lingo-websocket-server</artifactId>
-	<name>Lingo WebSocket :: Server</name>
+	<artifactId>lingo-server</artifactId>
+	<name>Lingo :: Server</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
-			<artifactId>lingo-websocket-client-api</artifactId>
+			<artifactId>lingo-client-api</artifactId>
 		</dependency>
 
 		<!-- Web -->
@@ -56,6 +56,7 @@
 						</goals>
 						<configuration>
 							<finalName>${project.artifactId}</finalName>
+							<mainClass>lingo.server.LingoServer</mainClass>
 						</configuration>
 					</execution>
 				</executions>