Reset to old file names ready for merge with 0.7.4