variable names fix