diff --git a/build/main/hop.bat b/build/main/hop.bat
index dd3b026d..d10bb016 100755
--- a/build/main/hop.bat
+++ b/build/main/hop.bat
@@ -10,4 +10,4 @@ set HOP_PORT=8080
 
 echo Starting Web server on port %HOP_PORT%
 
-java -classpath c:\winnt\java\packages\rmi.zip;%JARS% helma.objectmodel.db.Server -w %HOP_PORT%
+java -classpath c:\winnt\java\packages\rmi.zip;%JARS% helma.main.Server -w %HOP_PORT%
diff --git a/build/main/hop.sh b/build/main/hop.sh
index 7aeaa563..451ca1eb 100644
--- a/build/main/hop.sh
+++ b/build/main/hop.sh
@@ -8,4 +8,4 @@ export JARS=lib/helma.jar:lib/berkeley.jar:lib/village.jar:lib/jsdk.jar:lib/open
 export JARS=$JARS:lib/sax.jar:lib/regexp.jar:lib/netcomponents.jar:lib/jimi.jar
 export JARS=$JARS:lib/mail.jar:lib/activation.jar:lib/mysql.jar:lib/jdom.jar:lib/minml.jar
 
-java -classpath $CLASSPATH:$JARS helma.objectmodel.db.Server -w $HOP_PORT
+java -classpath $CLASSPATH:$JARS helma.main.Server -w $HOP_PORT
diff --git a/hop.bat b/hop.bat
index dd3b026d..d10bb016 100755
--- a/hop.bat
+++ b/hop.bat
@@ -10,4 +10,4 @@ set HOP_PORT=8080
 
 echo Starting Web server on port %HOP_PORT%
 
-java -classpath c:\winnt\java\packages\rmi.zip;%JARS% helma.objectmodel.db.Server -w %HOP_PORT%
+java -classpath c:\winnt\java\packages\rmi.zip;%JARS% helma.main.Server -w %HOP_PORT%
diff --git a/hop.sh b/hop.sh
index 7aeaa563..451ca1eb 100755
--- a/hop.sh
+++ b/hop.sh
@@ -8,4 +8,4 @@ export JARS=lib/helma.jar:lib/berkeley.jar:lib/village.jar:lib/jsdk.jar:lib/open
 export JARS=$JARS:lib/sax.jar:lib/regexp.jar:lib/netcomponents.jar:lib/jimi.jar
 export JARS=$JARS:lib/mail.jar:lib/activation.jar:lib/mysql.jar:lib/jdom.jar:lib/minml.jar
 
-java -classpath $CLASSPATH:$JARS helma.objectmodel.db.Server -w $HOP_PORT
+java -classpath $CLASSPATH:$JARS helma.main.Server -w $HOP_PORT