diff --git a/distribution/src/main/scripts/moquette.bat b/distribution/src/main/scripts/moquette.bat
index 5c1e606d..5502de87 100644
--- a/distribution/src/main/scripts/moquette.bat
+++ b/distribution/src/main/scripts/moquette.bat
@@ -42,4 +42,4 @@ set JAVA_OPTS=
 set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true
 set MOQUETTE_PATH=%MOQUETTE_HOME%
 set LOG_FILE=%MOQUETTE_HOME%\config\moquette-log.properties
-%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* Server
+%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* io.moquette.server.Server
diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh
index 2090f196..c034019c 100644
--- a/distribution/src/main/scripts/moquette.sh
+++ b/distribution/src/main/scripts/moquette.sh
@@ -52,5 +52,5 @@ MOQUETTE_PATH=$MOQUETTE_HOME/
 #LOG_FILE_LEVEL=fine
 JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
 
-$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/*" Server
+$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/*" io.moquette.server.Server