Improve consistency of method names and remove collections