fixed variable and constant names