renamed a function and its test and fixed compiler complaints