Renamed and fixed surefile_store*.