fixing variable names