Doing some name cleanup and some rewriting to make things more consistent with the rest of the project.