Conform names to style guide