Renamed a bunch of functions to new lower_case naming scheme