Changed some capitalization to be more consistent