Convert all params from CamelCase to under_score for consistency

Change-Id: If4f9d40fc266a33c4fd4ebee351b766fb5aef1f7