Ah, the joys of copy and paste.

@arnested probably have an opinion on how these files should be named. I also introduced some inconsistency when moving things about.