Ok, rockin. I'll create an issue for renaming, and I can figure out the deprecation and stuff later