corrected mistakes from pastes and renames