Fix some rename typos

9e4d806501c6491e9ec03eba8108a94845433075 introduced some inconsistencies; this
just synchronizes things.

Closes #283