(Hopefully) finished naming plugin.
Oops. Buggered up my committing.