Improve method names