More renames and make the code compile again.

Untested though.