Improve consistency of naming