Rename methods to be more consistent
Comment update