updated function/variable names