diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
index 20f6b34bd8c9..47df3bdc4fa5 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
@@ -97,4 +97,4 @@ clean :
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_INC))
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_GEN))
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_OBJ))
-	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*SimpleBootstrap*))
+	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*FirstLoadComponent*))
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
index 94f2332ca066..091c9bcda3e0 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute the example!
 	@echo -
-	@echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+	@echo $(MAKE) $(APP_NAME).run
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(OUT_APP_CLASS)/%.jar
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
index dca5fa92506b..a996044c602a 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
@@ -97,4 +97,4 @@ clean :
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_INC))
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_GEN))
 	-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_OBJ))
-	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*SimpleBootstrap*))
+	-$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*FirstUnoContact*))
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
index 4dca4468f74a..eae7d4452ffe 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute the example!
 	@echo -
-	@echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+	@echo $(MAKE) $(APP_NAME).run
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(OUT_APP_CLASS)/%.jar
diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
index a208b6eb6006..615e86bf3f25 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute the example!
 	@echo -
-	@echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+	@echo $(MAKE) $(APP_NAME).run
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(OUT_APP_CLASS)/%.jar