diff --git a/demos/bombs/.cvsignore b/demos/bombs/.cvsignore
index b2ecb02d1f..8581df89ea 100644
--- a/demos/bombs/.cvsignore
+++ b/demos/bombs/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+BombsM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
diff --git a/demos/bombs/makemac.mcp b/demos/bombs/BombsM5.mcp
similarity index 94%
rename from demos/bombs/makemac.mcp
rename to demos/bombs/BombsM5.mcp
index 4c985ee5ec..22bee37551 100644
Binary files a/demos/bombs/makemac.mcp and b/demos/bombs/BombsM5.mcp differ
diff --git a/demos/dbbrowse/.cvsignore b/demos/dbbrowse/.cvsignore
new file mode 100644
index 0000000000..f55c23f803
--- /dev/null
+++ b/demos/dbbrowse/.cvsignore
@@ -0,0 +1,5 @@
+DbbrowseM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*
diff --git a/demos/dbbrowse/DbbrowseM5.mcp b/demos/dbbrowse/DbbrowseM5.mcp
new file mode 100644
index 0000000000..520ee0ce47
Binary files /dev/null and b/demos/dbbrowse/DbbrowseM5.mcp differ
diff --git a/demos/forty/.cvsignore b/demos/forty/.cvsignore
index b2ecb02d1f..c6afb3181b 100644
--- a/demos/forty/.cvsignore
+++ b/demos/forty/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+FortyM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
diff --git a/demos/forty/makemac.mcp b/demos/forty/FortyM5.mcp
similarity index 97%
rename from demos/forty/makemac.mcp
rename to demos/forty/FortyM5.mcp
index b390538194..834c18d582 100644
Binary files a/demos/forty/makemac.mcp and b/demos/forty/FortyM5.mcp differ
diff --git a/demos/fractal/.cvsignore b/demos/fractal/.cvsignore
index b2ecb02d1f..32cf6e2538 100644
--- a/demos/fractal/.cvsignore
+++ b/demos/fractal/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+FractalM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
diff --git a/demos/fractal/makemac.mcp b/demos/fractal/FractalM5.mcp
similarity index 98%
rename from demos/fractal/makemac.mcp
rename to demos/fractal/FractalM5.mcp
index 5e73ce78a4..ffec805fa9 100644
Binary files a/demos/fractal/makemac.mcp and b/demos/fractal/FractalM5.mcp differ
diff --git a/demos/life/.cvsignore b/demos/life/.cvsignore
index b2ecb02d1f..c5c1cf2ebe 100644
--- a/demos/life/.cvsignore
+++ b/demos/life/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+LifeM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
diff --git a/demos/life/makemac.mcp b/demos/life/LifeM5.mcp
similarity index 96%
rename from demos/life/makemac.mcp
rename to demos/life/LifeM5.mcp
index 8f79299112..2cc6fe64f4 100644
Binary files a/demos/life/makemac.mcp and b/demos/life/LifeM5.mcp differ
diff --git a/demos/poem/.cvsignore b/demos/poem/.cvsignore
index b2ecb02d1f..e7327a1d98 100644
--- a/demos/poem/.cvsignore
+++ b/demos/poem/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+PoemM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*
diff --git a/demos/poem/makemac.mcp b/demos/poem/PoemM5.mcp
similarity index 85%
rename from demos/poem/makemac.mcp
rename to demos/poem/PoemM5.mcp
index 0cc2179a77..0ca6d044f9 100644
Binary files a/demos/poem/makemac.mcp and b/demos/poem/PoemM5.mcp differ