changed variable names to follow consistent naming conventions