Fix of some things that Will pointed out in code review. Conform to new naming conventions.