fixed variable names