Yeah, I'll change this.  I was a little confused with the name switch that was already there, and tried to do something similar.. but it just turned out poorly.  Will update before merging.