diff --git a/build/linux/dist/processing b/build/linux/dist/processing
index ba32b1750..a4de76020 100755
--- a/build/linux/dist/processing
+++ b/build/linux/dist/processing
@@ -9,5 +9,4 @@ export CLASSPATH
 PATH=`pwd`/`dirname $0`:`pwd`/java/bin:${PATH}
 export PATH
 
-#exec java/bin/java PdeBase
-java PdeBase
+java processing.app.Base
diff --git a/build/macosx/dist/Processing.app/Contents/Info.plist b/build/macosx/dist/Processing.app/Contents/Info.plist
index 83eccd663..59027dac4 100755
--- a/build/macosx/dist/Processing.app/Contents/Info.plist
+++ b/build/macosx/dist/Processing.app/Contents/Info.plist
@@ -51,7 +51,7 @@
 		<key>VMOptions</key>
 		<string>-Xms128M -Xmx256M</string>
 		<key>MainClass</key>
-		<string>PdeBase</string>
+		<string>processing.app.Base</string>
 		<key>JVMVersion</key>
 		<string>1.4+</string>
 		<key>ClassPath</key>
diff --git a/build/macosx/run.sh b/build/macosx/run.sh
index 06a851db3..dabfd9910 100755
--- a/build/macosx/run.sh
+++ b/build/macosx/run.sh
@@ -6,4 +6,4 @@ CLASSPATH=/System/Library/Java/Extensions/QTJava.zip:lib:lib/build:lib/pde.jar:l
 export CLASSPATH
 
 #cd work && /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -Dcom.apple.macos.useScreenMenuBar=true PdeBase
-cd work && java -Dapple.laf.useScreenMenuBar=true -Dapple.awt.showGrowBox=false processing.app.PdeBase
+cd work && java -Dapple.laf.useScreenMenuBar=true -Dapple.awt.showGrowBox=false processing.app.Base
diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp
index 3706cc85e..f0a882c02 100644
--- a/build/windows/launcher/launcher.cpp
+++ b/build/windows/launcher/launcher.cpp
@@ -8,9 +8,8 @@
 // 2) if the user has a long path, and it gets copied five times over for the
 // classpath, the program runs the risk of crashing. Bad bad.
 
-//#define JAVA_ARGS "-Xms64m -Xmx64m "
 #define JAVA_ARGS "-Xms128m -Xmx128m "
-#define JAVA_MAIN_CLASS "processing.app.PdeBase"
+#define JAVA_MAIN_CLASS "processing.app.Base"
 
 #include <windows.h>
 #include <stdio.h>
diff --git a/build/windows/run.sh b/build/windows/run.sh
index bc0c1ff49..4484f01cb 100644
--- a/build/windows/run.sh
+++ b/build/windows/run.sh
@@ -34,5 +34,5 @@ CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\core.jar\;lib
 export CLASSPATH
 
 #cd work && ./java/bin/java -Xint PdeBase
-cd work && ./java/bin/java processing.app.PdeBase
+cd work && ./java/bin/java processing.app.Base
 #cd work && /cygdrive/c/jdk-1.3.1_11/bin/java PdeBase