Even more renames

This one is minor, and is the result of previous renames Tom did.