Style fixes, mostly naming related.