changed more naming conventions #127