Rename methods so that it makes more sense