Renamed various types to fit lower_case_with_underscores convention.