Fixed method that people didn't bother to change when they renamed a method
Merging with master