More cleanup

Shorter file names are shorter.