Clean up some method names