name cleanup

made the method variable names more descriptive