Fixes accidental renames during Phoron project

I'm a daftie.

And a stubborn daftie at that. Throttle me all you like Zuhayr but I like my vars to say what they should mean >.>

Compiles, tested, confirmed for working.