Renamed figure files and updated code