updated the names so that the URLs don't look quite so funky.  Still have more work to do on this though