Changed function/variable names