Rename methods a bit