Renamed two more

This is getting ridiculous.