Fixed things.

I broke lots of things when I change file names.  I think that's most
of them.