So yeah, despite the fact that the naming is taken from the original code, I'd rather it get fixed before I merge this. As soon as that's done I'll merge 'er in.