improving a couple of method namings