Improving some method names