Awesome, I started doing that everywhere, but realized it would make a huge diff. I'll do another PR with name rationalization once this is all set... :)