Make some method names more consistent.