Fixed up some method names that were weird.