7.x filename conventions

Stuff missed last time around plus removal on an unreferenced image file.