Awesome. In that case, it really is just those two functions that need renaming. Will update this evening before debugging @bucketh3ad's stuff.