diff --git a/apps/pc/1981/visicalc/manifest.xml b/apps/pc/1981/visicalc/manifest.xml
index 4823e9b66..27871b0d5 100644
--- a/apps/pc/1981/visicalc/manifest.xml
+++ b/apps/pc/1981/visicalc/manifest.xml
@@ -13,7 +13,7 @@
 	<license href="http://www.bricklin.com/history/vclicense.htm">Lotus Development</license>
 	<machine href="/devices/pc/machine/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
 	<disk id="disk01" size="163840" chs="40:1:8" dir="archive/" href="/apps/pc/1981/visicalc/disk.json" md5="61494f998d5fb0e31e7b8bd99f1cc588" md5json="3ad82ed815725e6bd786f92a4714e84f">
-		<name>Demo: VisiCalc (1981)</name>
+		<name>VisiCalc (1981)</name>
 		<file size="27520" time="1981-12-16 23:00:00" attr="0x20" md5="28997dfedb2440c6054d8be835be8634">VC.COM</file>
 		<file dir="../">README.md</file>
 		<link href="http://www.bricklin.com/history/vclicense.htm">VisiCalc License</link>
diff --git a/apps/pc/1982/esuite/manifest.xml b/apps/pc/1982/esuite/manifest.xml
index 762c444d8..de0607cf3 100644
--- a/apps/pc/1982/esuite/manifest.xml
+++ b/apps/pc/1982/esuite/manifest.xml
@@ -9,7 +9,7 @@
 	<releaseDate>1982</releaseDate>
 	<machine href="/devices/pc/machine/5160/mda/256kb/fake188/machine.xml" state="/apps/pc/1982/esuite/state.json"/>
 	<disk id="disk01" size="368640" chs="40:2:9" dir="archive/" href="/apps/pc/1982/esuite/disk.json" md5="7721a7bc9fcbd0005e7c1d87ecc055c5" md5json="dbf0a2c0176b8128d87e2465794764f4">
-		<name>Demo: Executive Suite (1982)</name>
+		<name>Executive Suite (1982)</name>
 		<file size="384" time="2000-02-29 08:04:48" attr="0x20" md5="3e638560a5f483cdbd1be486b07c767e">ESUITE.COM</file>
 		<file size="163840" time="2000-02-29 06:57:40" attr="0x20" md5="dcc72026cdc906109cf0e3b2d07ffd5d">GAME.DAT</file>
 		<link href="http://www.mobygames.com/game/executive-suite">MobyGames</link>
diff --git a/apps/pc/1985/rogue/manifest.xml b/apps/pc/1985/rogue/manifest.xml
index a49221705..d04aa21fe 100644
--- a/apps/pc/1985/rogue/manifest.xml
+++ b/apps/pc/1985/rogue/manifest.xml
@@ -13,7 +13,7 @@
 	<author>Jon Lane</author>
 	<author>Michael Toy</author>
 	<disk id="disk01" size="163840" chs="40:1:8" dir="archive/" href="/apps/pc/1985/rogue/disk.json" md5="91fab29636a7517e17eaa38b30ff156a" md5json="c531e9f249b20adad667a3c376e427c8">
-		<name>Demo: Rogue (1985)</name>
+		<name>Rogue (1985)</name>
 		<file size="14016" time="1985-03-25 14:33:18" attr="0x20" md5="e8f7c7b97210f480c7b741a0d58951bd">MKOPT.EXE</file>
 		<file size="2616" time="1995-09-01 18:46:18" attr="0x20" md5="275fd64a3502af22b56e23934c79e9ef">ROGUE.COM</file>
 		<file size="71520" time="1986-05-30 12:55:50" attr="0x20" md5="11cc922975d21f9a32812ff6c5ed3430">ROGUE.EXE</file>
diff --git a/apps/pc/1987/thinktank/manifest.xml b/apps/pc/1987/thinktank/manifest.xml
index e7d2232a6..09ca05171 100644
--- a/apps/pc/1987/thinktank/manifest.xml
+++ b/apps/pc/1987/thinktank/manifest.xml
@@ -8,7 +8,7 @@
 	<company>Living Videotext</company>
 	<releaseDate>September 25, 1987</releaseDate>
 	<disk id="disk01" size="368640" chs="40:2:9" dir="archive/" href="/apps/pc/1987/thinktank/disk.json" md5="94053339672452fba42da85481893d68" md5json="bd39020bff244db9af3ac9eb656e7878">
-		<name>Demo: ThinkTank (1987)</name>
+		<name>ThinkTank (1987)</name>
 		<file size="6" time="2012-11-20 15:29:40" attr="0x20" md5="50b68f3f99eda119c661b2b50cb9f4de">AUTOEXEC.BAT</file>
 		<file size="8192" time="2012-11-20 15:29:35" attr="0x20" md5="3355afbc122700f13647ee0d1bbf9ed7">READ_ME.DB</file>
 		<file size="512" time="2012-11-20 15:29:31" attr="0x20" md5="8b989397eb275032eb8cf929def9c6cc">READ_ME.SAV</file>
diff --git a/apps/pc/1988/moria/manifest.xml b/apps/pc/1988/moria/manifest.xml
index bc0771df1..537552ea7 100644
--- a/apps/pc/1988/moria/manifest.xml
+++ b/apps/pc/1988/moria/manifest.xml
@@ -15,7 +15,7 @@
 		<desc>MSDOS port</desc>
 	</author>
 	<disk id="disk01" size="1228800" chs="80:2:15" dir="archive/" href="/apps/pc/1988/moria/disk.json" md5="7bb84a7ac4e9b03e8cd1e6753b1359fb" md5json="7630122397a57af2d0c767141af3817c">
-		<name>Demo: Moria 4.872 (1988)</name>
+		<name>Moria 4.872 (1988)</name>
 		<file size="11143" time="1988-11-01 00:00:00" attr="0x20" md5="dae278b77133f32949d0e8940f944c0d">CONFIG.DOC</file>
 		<file size="91154" time="1991-06-01 14:50:02" attr="0x20" md5="66593e83a2aa3870d7a9e8b43079ce42">GOD</file>
 		<file size="91154" time="1991-06-01 15:13:50" attr="0x20" md5="4a7c6e2ddf649f9700786624aaa91199">MADNESS1</file>
diff --git a/apps/pc/1992/moria/manifest.xml b/apps/pc/1992/moria/manifest.xml
index 23d6e182b..0967ea257 100644
--- a/apps/pc/1992/moria/manifest.xml
+++ b/apps/pc/1992/moria/manifest.xml
@@ -93,7 +93,7 @@
 		<desc>Macintosh port for Think C</desc>
 	</contributor>
 	<disk id="disk01" size="368640" chs="40:2:9" dir="archive/bin/" href="/apps/pc/1992/moria/disk.json" md5="da0023280238bc2ee9053ad2b9548816" md5json="1473be159bb5f9001db31c06b3a366c1">
-		<name>Demo: Moria 5.5 (1992)</name>
+		<name>Moria 5.5 (1992)</name>
 		<file size="6074" time="1992-11-01 23:15:36" attr="0x20" md5="078aca44b845ee8a787a324c1e827200">EXP.DOC</file>
 		<file size="2560" time="1992-11-01 23:15:36" attr="0x20" md5="a5c8620efd0dc841956f9cdc2e46220a">MORIA.CNF</file>
 		<file size="49267" time="1992-11-01 23:15:36" attr="0x20" md5="32c9f15c70256f540f531675ad0e217f">MORIA1.TXT</file>
diff --git a/disks/pc/compiled/library.xml b/disks/pc/compiled/library.xml
index e6ccfa3a3..7ed57a354 100644
--- a/disks/pc/compiled/library.xml
+++ b/disks/pc/compiled/library.xml
@@ -298,14 +298,14 @@
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK02.json">UNIX System V Runtime (Disk 1)</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK03.json">UNIX System V Runtime (Disk 2)</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK04.json">UNIX System V Runtime (Disk 3)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json">UNIX System V Runtime Utility Disk</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json">UNIX System V Runtime System Vision</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json">UNIX System V Runtime Utilities</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json">UNIX System V Runtime System</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK07.json">UNIX System V Runtime Link Kit</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json">UNIX System V Software Dev (Disk 1)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json">UNIX System V Software Dev (Disk 2)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json">UNIX System V Software Dev (Disk 3)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json">UNIX System V Software Dev (Disk 4)</disk>
-		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json">UNIX System V Software Dev Upgrade</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json">UNIX System V Software (Disk 1)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json">UNIX System V Software (Disk 2)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json">UNIX System V Software (Disk 3)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json">UNIX System V Software (Disk 4)</disk>
+		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json">UNIX System V Software Upgrade</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK13.json">UNIX System V Text Prep (Disk 1)</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK14.json">UNIX System V Text Prep (Disk 2)</disk>
 		<disk path="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK15.json">UNIX System V Text Prep (Disk 3)</disk>
@@ -503,11 +503,11 @@
 		<disk path="/disks/pc/games/id/wolf3d/1WOLF14.json">Wolfenstein 3D 1.4</disk>
 		<disk path="/disks/pc/games/microsoft/flightsim/1982/FLIGHTSIM-1982.json">MS Flight Simulator (1982)</disk>
 		<disk path="/disks/pc/games/microsoft/flightsim/1984/FLIGHTSIM-1984.json">MS Flight Simulator (1984)</disk>
-		<disk path="/apps/pc/1981/visicalc/disk.json">Demo: VisiCalc (1981)</disk>
-		<disk path="/apps/pc/1982/esuite/disk.json">Demo: Executive Suite (1982)</disk>
-		<disk path="/apps/pc/1985/rogue/disk.json">Demo: Rogue (1985)</disk>
-		<disk path="/apps/pc/1987/thinktank/disk.json">Demo: ThinkTank (1987)</disk>
-		<disk path="/apps/pc/1992/moria/disk.json">Demo: Moria 5.5 (1992)</disk>
+		<disk path="/apps/pc/1981/visicalc/disk.json">VisiCalc (1981)</disk>
+		<disk path="/apps/pc/1982/esuite/disk.json">Executive Suite (1982)</disk>
+		<disk path="/apps/pc/1985/rogue/disk.json">Rogue (1985)</disk>
+		<disk path="/apps/pc/1987/thinktank/disk.json">ThinkTank (1987)</disk>
+		<disk path="/apps/pc/1992/moria/disk.json">Moria 5.5 (1992)</disk>
 		<disk path="/pubs/pc/programming/DOS_Internals/DOS-INTERN.json">Book: DOS Internals</disk>
 		<disk path="/pubs/pc/programming/The_Undocumented_PC/UNDOC.json">Book: The Undocumented PC</disk>
 		<disk path="/pubs/pc/programming/Undocumented_DOS/UNDOC-DOS-DISK1.json">Book: Undocumented DOS (Disk 1)</disk>
diff --git a/disks/pc/compiled/samples.xml b/disks/pc/compiled/samples.xml
index 792102076..3add95300 100644
--- a/disks/pc/compiled/samples.xml
+++ b/disks/pc/compiled/samples.xml
@@ -7,7 +7,7 @@
 		<disk path="/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json">PC-DOS 2.00 (Disk 1)</disk>
 		<disk path="/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json">PC-DOS 2.00 (Disk 2)</disk>
 		<disk path="/disks/pc/games/microsoft/adventure/ADVENTURE-1981.json">Microsoft Adventure</disk>
-		<disk path="/apps/pc/1981/visicalc/disk.json">Demo: VisiCalc (1981)</disk>
+		<disk path="/apps/pc/1981/visicalc/disk.json">VisiCalc (1981)</disk>
 	</control>
 	<control type="button" binding="loadDrive">Load</control>
 	<control type="button" binding="saveDrive" padright="8px">Save</control>
diff --git a/disks/pc/unix/microport/system-v/2.3/manifest.xml b/disks/pc/unix/microport/system-v/2.3/manifest.xml
index 6c39cc267..41d52c215 100644
--- a/disks/pc/unix/microport/system-v/2.3/manifest.xml
+++ b/disks/pc/unix/microport/system-v/2.3/manifest.xml
@@ -15,28 +15,28 @@
 		<name>UNIX System V Runtime (Disk 3)</name>
 	</disk>
 	<disk id="disk05" size="1228800" chs="80:2:15" img="archive/05 - Runtime Utility Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK05.json" md5="a1c2923f7116a29d1ab68a82ea2ac262" md5json="c19f5dcf0892da7f1372dc8d83d73f26">
-		<name>UNIX System V Runtime Utility Disk</name>
+		<name>UNIX System V Runtime Utilities</name>
 	</disk>
 	<disk id="disk06" size="1228800" chs="80:2:15" img="archive/06 - Runtime System Vision.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK06.json" md5="19ffd026dd55bb39645e859a7ba86b06" md5json="104f8e9ef40b13418141674d84cf908f">
-		<name>UNIX System V Runtime System Vision</name>
+		<name>UNIX System V Runtime System</name>
 	</disk>
 	<disk id="disk07" size="1228800" chs="80:2:15" img="archive/07 - Runtime Link Kit Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK07.json" md5="d010e85d690a23be6807694dfd99b7cd" md5json="9ca249bd570ad07c94c5c238ab9ca7ca">
 		<name>UNIX System V Runtime Link Kit</name>
 	</disk>
 	<disk id="disk08" size="1228800" chs="80:2:15" img="archive/08 - Software Development Disk 1 EXPROGDEV.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK08.json" md5="f13ae1e2fb556423bd418b0f336203b9" md5json="74f7c32c7ab7a344fa0afee04a816fef">
-		<name>UNIX System V Software Dev (Disk 1)</name>
+		<name>UNIX System V Software (Disk 1)</name>
 	</disk>
 	<disk id="disk09" size="1228800" chs="80:2:15" img="archive/09 - Software Development Disk 2 PROGDEV.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK09.json" md5="684d16091cac18152c3259455bc51023" md5json="1a4a0f327831f524ab86d253091b0362">
-		<name>UNIX System V Software Dev (Disk 2)</name>
+		<name>UNIX System V Software (Disk 2)</name>
 	</disk>
 	<disk id="disk10" size="1228800" chs="80:2:15" img="archive/10 - Software Development Disk 3 PROGDEV.2.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK10.json" md5="5ae1c5f8ca25564374d74d91b0c08bfc" md5json="e685e80181a017857664c305435d928a">
-		<name>UNIX System V Software Dev (Disk 3)</name>
+		<name>UNIX System V Software (Disk 3)</name>
 	</disk>
 	<disk id="disk11" size="1228800" chs="80:2:15" img="archive/11 - Software Development Disk 4 PROGDEV.3.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK11.json" md5="62798053f89cdf8c4012a64e1092629b" md5json="f3e2062d106aeece5c32d3efdd80dcb6">
-		<name>UNIX System V Software Dev (Disk 4)</name>
+		<name>UNIX System V Software (Disk 4)</name>
 	</disk>
 	<disk id="disk12" size="1228800" chs="80:2:15" img="archive/12 - Software Development Upgrade Disk.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK12.json" md5="0fd28b9b7110a2455fa32ce94fb24905" md5json="4a005f9c97cb5b39b2d49ab5f3f61c36">
-		<name>UNIX System V Software Dev Upgrade</name>
+		<name>UNIX System V Software Upgrade</name>
 	</disk>
 	<disk id="disk13" size="1228800" chs="80:2:15" img="archive/13 - Text Preparation Disk 1 EXTEXT.1.img" href="/disks/pc/unix/microport/system-v/2.3/SYSTEMV23-DISK13.json" md5="c8ac3211e216dde23523714cb7ae8001" md5json="f378778e542e0c97518a0548ebcaa106">
 		<name>UNIX System V Text Prep (Disk 1)</name>
diff --git a/modules/pc8080/README.md b/modules/pc8080/README.md
index 7ff058655..8a86ab9c0 100644
--- a/modules/pc8080/README.md
+++ b/modules/pc8080/README.md
@@ -12,7 +12,7 @@ Overview
 PC8080 is an 8080-based Machine Emulation Module.  The code is derived from [PCjs](/modules/pcjs/),
 the IBM PC Emulation Module.
 
-It is still a work-in-progress, so it likely contains code that will be removed from the finished version.
+It is still a work-in-progress.  The only demo currently available is this [8080 Test Machine](/devices/pc8080/machine/test/). 
 
 PC8080 is currently comprised of the following non-shared components, as listed in [package.json](../../package.json)
 (see the *pc8080Files* property):