fixed upperCase to upper_case function names