Fix rename

Whelp, that was basically the one thing I could have done/forgotten in that change that actually broke existing functionality, and I did.

This also includes latest commits from master.