changed variable names to comply with rules