Fix some capitalization, rename some methods, etc