Made capitalization a little more consistent