renamed functions, tests and variables to be more readable