[bug 1001128] Fix retitling issues in wiki

r?
Also, instead of `%s` we have been doing `'{thing}'.format(thing='thang')`