diff --git a/README.md b/README.md
index 3629080..f077bdc 100644
--- a/README.md
+++ b/README.md
@@ -4,17 +4,17 @@ Small utility to measure network performance between two hosts.
 
 ## Requirements
 
-You need Java (JRE) version 8 or later to run jperf.
+You need Java (JRE) version 8 or later to run jnetperf.
 
 ## Usage Instructions
 
-- Install the jperf package (*.deb*, *.rpm* or *.jar*) from [downloads](https://bitbucket.org/mnellemann/jperf/downloads/) or compile from source.
-- Run **/opt/jperf/bin/jperf**, if installed from package
-- Or as **java -jar /path/to/jperf.jar**
+- Install the jnetperf package (*.deb*, *.rpm* or *.jar*) from [downloads](https://bitbucket.org/mnellemann/jnetperf/downloads/) or compile from source.
+- Run **/opt/jnetperf/bin/jperf**, if installed from package
+- Or as **java -jar /path/to/jnetperf.jar**
 
 ```shell
-Usage: jperf [-hV] [-l=SIZE] [-n=NUM] [-p=PORT] (-c=HOST | -s)
-Network performance measurement tool.
+Usage: jnetperf [-hV] [-l=SIZE] [-n=NUM] [-p=PORT] (-c=HOST | -s)
+Network Performance Testing.
   -c, --connect=HOST   Connect to remote server
   -h, --help           Show this help message and exit.
   -l, --pkt-len=SIZE   Datagram size in bytes, max 65507 [default: 65507]
@@ -26,7 +26,7 @@ Network performance measurement tool.
 
 ## Development Information
 
-You need Java (JDK) version 8 or later to build jperf.
+You need Java (JDK) version 8 or later to build jnetperf.
 
 ### Build & Test
 
diff --git a/build.gradle b/build.gradle
index b54450a..583992f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ java {
 
 
 application {
-    mainClass = 'biz.nellemann.jperf.Application'
+    mainClass = 'biz.nellemann.jnetperf.Application'
 }
 
 tasks.named('test') {
@@ -59,12 +59,12 @@ jar {
 
 apply plugin: 'com.netflix.nebula.ospackage'
 ospackage {
-    packageName = 'jperf'
+    packageName = 'jnetperf'
     release = '1'
     user = 'root'
     packager = "Mark Nellemann <mark.nellemann@gmail.com>"
 
-    into '/opt/jperf'
+    into '/opt/jnetperf'
 
     from(shadowJar.outputs.files) {
         into 'lib'
diff --git a/gradle.properties b/gradle.properties
index 8341974..56ae239 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-projectId               = jperf
-projectGroup            = biz.nellemann.jperf
-projectVersion          = 0.0.4
+projectId               = jnetperf
+projectGroup            = biz.nellemann.jnetperf
+projectVersion          = 0.0.5
diff --git a/settings.gradle b/settings.gradle
index dbf3c4b..c6b9619 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,4 @@ plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }
 
-rootProject.name = 'jperf'
+rootProject.name = 'jnetperf'
diff --git a/src/main/java/biz/nellemann/jperf/Application.java b/src/main/java/biz/nellemann/jnetperf/Application.java
similarity index 89%
rename from src/main/java/biz/nellemann/jperf/Application.java
rename to src/main/java/biz/nellemann/jnetperf/Application.java
index 419ee19..5069210 100644
--- a/src/main/java/biz/nellemann/jperf/Application.java
+++ b/src/main/java/biz/nellemann/jnetperf/Application.java
@@ -13,11 +13,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 
@@ -25,12 +23,10 @@ import java.io.IOException;
 import java.net.SocketException;
 import java.util.concurrent.Callable;
 
-@Command(name = "jperf", mixinStandardHelpOptions = true, versionProvider = VersionProvider.class, description = "Network performance measurement tool.")
+
+@Command(name = "jnetperf", mixinStandardHelpOptions = true, versionProvider = VersionProvider.class, description = "Network Performance Testing.")
 public class Application implements Callable<Integer> {
 
-    final Logger log = LoggerFactory.getLogger(Application.class);
-
-
     @CommandLine.ArgGroup(exclusive = true, multiplicity = "1")
     RunMode runMode;
 
diff --git a/src/main/java/biz/nellemann/jperf/DataType.java b/src/main/java/biz/nellemann/jnetperf/DataType.java
similarity index 96%
rename from src/main/java/biz/nellemann/jperf/DataType.java
rename to src/main/java/biz/nellemann/jnetperf/DataType.java
index a6386bc..973b938 100644
--- a/src/main/java/biz/nellemann/jperf/DataType.java
+++ b/src/main/java/biz/nellemann/jnetperf/DataType.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 public enum DataType {
 
diff --git a/src/main/java/biz/nellemann/jperf/Datagram.java b/src/main/java/biz/nellemann/jnetperf/Datagram.java
similarity index 99%
rename from src/main/java/biz/nellemann/jperf/Datagram.java
rename to src/main/java/biz/nellemann/jnetperf/Datagram.java
index f98905d..d1233aa 100644
--- a/src/main/java/biz/nellemann/jperf/Datagram.java
+++ b/src/main/java/biz/nellemann/jnetperf/Datagram.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/biz/nellemann/jperf/Statistics.java b/src/main/java/biz/nellemann/jnetperf/Statistics.java
similarity index 99%
rename from src/main/java/biz/nellemann/jperf/Statistics.java
rename to src/main/java/biz/nellemann/jnetperf/Statistics.java
index 391f844..17aa357 100644
--- a/src/main/java/biz/nellemann/jperf/Statistics.java
+++ b/src/main/java/biz/nellemann/jnetperf/Statistics.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/src/main/java/biz/nellemann/jperf/UdpClient.java b/src/main/java/biz/nellemann/jnetperf/UdpClient.java
similarity index 99%
rename from src/main/java/biz/nellemann/jperf/UdpClient.java
rename to src/main/java/biz/nellemann/jnetperf/UdpClient.java
index cdbf3e0..edead01 100644
--- a/src/main/java/biz/nellemann/jperf/UdpClient.java
+++ b/src/main/java/biz/nellemann/jnetperf/UdpClient.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/src/main/java/biz/nellemann/jperf/UdpServer.java b/src/main/java/biz/nellemann/jnetperf/UdpServer.java
similarity index 99%
rename from src/main/java/biz/nellemann/jperf/UdpServer.java
rename to src/main/java/biz/nellemann/jnetperf/UdpServer.java
index d5aa9c3..c5901f2 100644
--- a/src/main/java/biz/nellemann/jperf/UdpServer.java
+++ b/src/main/java/biz/nellemann/jnetperf/UdpServer.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/src/main/java/biz/nellemann/jperf/VersionProvider.java b/src/main/java/biz/nellemann/jnetperf/VersionProvider.java
similarity index 97%
rename from src/main/java/biz/nellemann/jperf/VersionProvider.java
rename to src/main/java/biz/nellemann/jnetperf/VersionProvider.java
index 71e8b92..7cb3ee3 100644
--- a/src/main/java/biz/nellemann/jperf/VersionProvider.java
+++ b/src/main/java/biz/nellemann/jnetperf/VersionProvider.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package biz.nellemann.jperf;
+package biz.nellemann.jnetperf;
 
 import picocli.CommandLine;
 
diff --git a/src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy b/src/test/groovy/biz/nellemann/jnetperf/ApplicationTest.groovy
similarity index 83%
rename from src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy
rename to src/test/groovy/biz/nellemann/jnetperf/ApplicationTest.groovy
index 605ceb4..7b74a28 100644
--- a/src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy
+++ b/src/test/groovy/biz/nellemann/jnetperf/ApplicationTest.groovy
@@ -1,7 +1,7 @@
 /*
  * This Spock specification was generated by the Gradle 'init' task.
  */
-package biz.nellemann.jperf
+package biz.nellemann.jnetperf
 
 import spock.lang.Specification