Rename methods (and some arguments) to make them more meaningful