Renaming

Let's at least make it follow a convention before anyone decides they
want to use any of the public methods.