Work on naming of things. Begin move to underscore_names
for functions and look out for thing vs. thing_id. Good opportunity to visit lots of code.