diff --git a/media/index.xml b/media/index.xml
index ec20f2b..f845643 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,7 +11,7 @@
     CD or DVD should you so choose.
     <ul>
 
-<mediaitem title="PMAMC&amp;OC SASMS - Spring 2007" buttons="true">
+<mediaitem title="PMAMC&amp;OC Short Attention Span Math Seminars (SASMS) - Spring 2007" buttons="true">
   <mediafile file="pmc-sasms-spring-2007.avi" type="XviD" size="643M" />
   <mediafile file="pmc-sasms-spring-2007.ogg" type="OGG/Theora" size="598M" />
   <mediafile file="pmc-sasms-spring-2007.mp4" type="MP4" size="625M" />
@@ -19,7 +19,7 @@
   <flvfile file="pmc-sasms-spring-2007.flv" />
 </mediaitem>
 
-<mediaitem title="Copyright vs Community in the Age of Computer Networks" buttons="true">
+<mediaitem title="Richard Stallman - Copyright vs Community in the Age of Computer Networks" buttons="true">
   <abstract><p>
     Copyright developed in the age of the printing press, and was designed 
     to fit with the system of centralized copying imposed by the printing 
@@ -43,7 +43,7 @@
   <mediafile file="rms-qa.ogg" type="Q/A (OGG/Theora)" size="225M" />
 </mediaitem>
 
-<mediaitem title="Usability in the Wild">
+<mediaitem title="Dr Michael Terry - Usability in the Wild">
   <abstract>
     What is the typical monitor resolution of a GIMP user? How many monitors 
     do they have? What size images do they work on? How many layers are in 
@@ -65,7 +65,7 @@
   <flvfile file="mterry2.flv" preview="mterry2.png" />
 </mediaitem>
 
-<mediaitem title="Ralph Stanton 40th Anniversary of Math Faculty Talk">
+<mediaitem title="Ralph Stanton - 40th Anniversary of Math Faculty">
   <abstract>
     Ralph Stanton reflects on the founding of the University of 
     Waterloo Math Faculty.
@@ -77,7 +77,7 @@
   <flvfile file="ralph-stanton.flv" />
 </mediaitem>
 
-<mediaitem title="The Free Software Movement and GNULinux Operating System, a talk by Richard Stallman at UCSD">
+<mediaitem title="Richard Stallman - The Free Software Movement and GNULinux Operating System">
   <abstract>
     Richard Stallman will speak about the goals and philosophy of the Free 
     Software Movement, and the status and history the GNU Operating System, 
@@ -116,7 +116,7 @@
   <mediafile file="rms_ucsd.ogg" type="Ogg Theora" size="148MB" />
 </mediaitem>
 
-<mediaitem title="Introduction to 3-d Graphics">
+<mediaitem title="The Prof - Introduction to 3-d Graphics">
   <abstract>
     A talk for those interested in 3-dimensional graphics but unsure of where 
     to start. Covers the basic math and theory behind projecting 3-dimensional 
@@ -129,7 +129,7 @@
   <mediafile file="the-prof-graphics.ogg" type="OGG/Theora" size="274M"/>
 </mediaitem>
 
-<mediaitem title="UW Software Start-ups: What Worked and What Did Not">
+<mediaitem title="Larry Smith - UW Software Start-ups: What Worked and What Did Not">
   <abstract>
     A discussion of software start-ups founded by UW students and what they 
     did that helped them grow and what failed to help. In order to share the 
@@ -167,7 +167,7 @@
   <flvfile file="sdt.flv" />
 </mediaitem>
 
-<mediaitem title="ReactOS - An Open Source OS Platform for Learning">
+<mediaitem title="Alex Ionescu - ReactOS: An Open Source OS Platform for Learning">
   <abstract>
     The ReactOS operating system has been in development for over eight years 
     and aims to provide users with a fully functional and Windows-compatible 
@@ -211,7 +211,7 @@
   <flvfile file="alex-ionescu.flv" />
 </mediaitem>
 
-<mediaitem title="1989 Bill Gates Talk on Microsoft">
+<mediaitem title="Bill Gates - 1989 Talk on Microsoft">
   <abstract>
     Bill Gates discusses the software and computer industry, and how Microsoft 
     has contributed. Gates also discusses his views on the future of the 
@@ -255,7 +255,7 @@
 	<mediafile file="bill-gates-1989.wav" type="wav" size="945M" />
   </mediaitem>
 
-  <mediaitem title="Spam Filters: Do they work and Can you prove it">
+  <mediaitem title="Dr Gordon Cormack - Spam Filters: Do they work and Can you prove it">
     <abstract>
       Do spam filters work?  Which is the best one?  How might filters be
       improved?  Without standards, one must depend on unreliable evidence,
@@ -281,7 +281,7 @@
   <flvfile file="cormack-spam.flv" />
 </mediaitem>
 
-<mediaitem title="Software development gets on the Cluetrain">
+<mediaitem title="Simon Law - Software development gets on the Cluetrain">
   <abstract>
     Simon Law leads the Quality teams for Ubuntu, a free-software operating 
     system built on Debian GNU/Linux. As such, he leads one of the largest 
@@ -303,7 +303,7 @@
   <flvfile file="simon-talk.flv" />
 </mediaitem>
 
-<mediaitem title="Semacode - Image recognition on mobile camera phones">
+<mediaitem title="Simon Woodside - Semacode: Image recognition on mobile camera phones">
   <abstract>
     Could you write a good image recognizer for a 100 MHz mobile phone 
     processor with 1 MB heap, 320x240 image, on a poorly-optimized Java stack? 
@@ -319,7 +319,7 @@
   <mediafile file="semacode.mpg" type="Mpeg" size="180M"/>
 </mediaitem>
 
-<mediaitem title="Eric LaForest: Next Generation Stack Computing">
+<mediaitem title="Eric LaForest - Next Generation Stack Computing">
   <abstract>
     Eric LaForest delivers a crash-course on modern stack computing, the Forth 
     programming language, and some projects of his own. Stack systems have 
@@ -339,8 +339,10 @@
   <mediafile file="CSCtalkMar06.pdf" size="1M" type="slides [pdf]"/>
   <mediafile file="CSCtalkMar06.ppt" size="1M" type="slides [Power Point]" />
   <mediafile file="CSCtalkMar06.odp" size="1M" type="slides [Open Office]" />
-</mediaitem> 
-<mediaitem title="Larry Smith: Creating Killer Applications"> 
+</mediaitem>
+
+
+<mediaitem title="Larry Smith - Creating Killer Applications"> 
   <abstract>
     A discussion of how software creators can identify application 
     opportunities that offer the promise of great social and commercial 
@@ -353,12 +355,12 @@
   <mediafile file="larry-killer-applications.ogg" size="706M" type="OGG" />
 </mediaitem>
 
-<mediaitem title="Larry Smith: Computing's Next Great Empires">
+<mediaitem title="Larry Smith - Computing's Next Great Empires">
   <mediafile file="larry-smith-talk.ogg" type="OGG" />
   <mediafile file="larry-smith-talk.mp3" type="MP3" />
 </mediaitem>
 
-<mediaitem title="Rico Mariani: Eighteen Years in the Software Tools Business">
+<mediaitem title="Rico Mariani - Eighteen Years in the Software Tools Business">
   <abstract>
     Rico Mariani, (BMath CS/EEE 1988) now an (almost) 18 year Microsoft 
     veteran but then a CSC president comes to talk to us about the evolution