Amended title changes.

It's mainly to improve on the changes that I've suggested a bit.