Some work on InstrReplay and some file renaming.