diff --git a/.gitignore b/.gitignore
index a5f7db3bdb..889d38a5bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,9 @@
 /build/OpenLayers.js
 /build/ol3.js
 /build/ol3-compiled.js
-/demos/*/*.html
-/demos/*/advanced-optimizations.js
-/demos/*/whitespace-only.js
+/demos/*/advanced-optimizations.*
+/demos/*/debug.html
+/demos/*/simple-optimizations.*
 /doc/apidocs/
 /examples/example-list.js
 /examples/example-list.xml
diff --git a/Makefile b/Makefile
index 726daeb3bd..7157ab6584 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PLOVR_JAR=bin/plovr-4b3caf2b7d84.jar
 SRC = $(shell find externs src/ol -name \*.js)
-TARGETS = $(shell find demos -name advanced-optimizations.js -o -name whitespace-only.js)
+TARGETS = $(shell find demos -name advanced-optimizations.js -o -name simple-optimizations.js)
 comma := ,
 empty :=
 space := $(empty) $(empty)
@@ -28,8 +28,8 @@ demos/side-by-side: \
 	demos/side-by-side/advanced-optimizations.html \
 	demos/side-by-side/advanced-optimizations.js \
 	demos/side-by-side/debug.html \
-	demos/side-by-side/whitespace-only.html \
-	demos/side-by-side/whitespace-only.js
+	demos/side-by-side/simple-optimizations.html \
+	demos/side-by-side/simple-optimizations.js
 
 demos/side-by-side/advanced-optimizations.html: demos/side-by-side/index.html.in
 	sed -e 's|@SRC@|advanced-optimizations.js|' $< > $@
@@ -43,13 +43,13 @@ demos/side-by-side/advanced-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
 demos/side-by-side/debug.html: demos/side-by-side/index.html.in
 	sed -e 's|@SRC@|http://localhost:9810/compile?id=demo-side-by-side|' $< > $@
 
-demos/side-by-side/whitespace-only.html: demos/side-by-side/index.html.in
-	sed -e 's|@SRC@|whitespace-only.js|' $< > $@
+demos/side-by-side/simple-optimizations.html: demos/side-by-side/index.html.in
+	sed -e 's|@SRC@|simple-optimizations.js|' $< > $@
 
 # FIXME invoke plovr directly, rather than assuming that the server is running
-demos/side-by-side/whitespace-only.js: $(PLOVR_JAR) $(SRC) base.json \
+demos/side-by-side/simple-optimizations.js: $(PLOVR_JAR) $(SRC) base.json \
 	demos/side-by-side/side-by-side.json demos/side-by-side/side-by-side.js
-	curl 'http://localhost:9810/compile?id=demo-side-by-side&mode=WHITESPACE' > $@
+	curl 'http://localhost:9810/compile?id=demo-side-by-side&mode=SIMPLE' > $@
 	@echo $@ "uncompressed:" $$(wc -c <$@) bytes
 	@echo $@ "  compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
 
@@ -70,7 +70,9 @@ $(PLOVR_JAR):
 clean:
 	rm -f build/all.js
 	rm -f build/ol3.js
-	rm -f demos/*/compiled.js
+	rm -f demos/*/advanced-optimizations.*
+	rm -f demos/*/debug.html
+	rm -f demos/*/simple-optimizations.*
 
 reallyclean: clean
 	rm -f $(PLOVR_JAR)
diff --git a/demos/side-by-side/index.html.in b/demos/side-by-side/index.html.in
index 4c8f1a150a..75d65daab2 100644
--- a/demos/side-by-side/index.html.in
+++ b/demos/side-by-side/index.html.in
@@ -62,7 +62,7 @@
             </tr>
         </table>
         <p><b>Notes:</b> the two maps share the same center, resolution, rotation and layers.  Currently the DOM map does not support rotation.</p>
-        <p><b>Console tips:</b> If you want to play around with the API in the console, first make sure that you're using the <a href="whitespace-only.html">whitespace only version</a> of this demo, then open a console and experiment with the <code>domMap</code>, <code>webglMap</code> and <code>layer</code> variables in the console. The source code is in <a href="side-by-side.js">side-by-side.js</a>.</p>
+        <p><b>Console tips:</b> If you want to play around with the API in the console, first make sure that you're using the <a href="simple-optimizations.html">simple optimizations version</a> of this demo, then open a console and experiment with the <code>domMap</code>, <code>webglMap</code> and <code>layer</code> variables in the console. The source code is in <a href="side-by-side.js">side-by-side.js</a>.</p>
         <p><b>Known bugs:</b> Dragging is captured on the entire page, not just on the maps. When the map is rotated, panning on the WebGL map doesn't work as expected.</p>
         <script src="@SRC@" type="text/javascript"></script>
     </body>