Mostly naming changes, and a few exception catching changes.