Rename again, and some proof-reading.