Improve consistency of method naming convention