renamed a few functions to make sense
renamed a few functions to make sense