Renamed methods to more explicit names

Hey Matt, I've decided to do the hard work, by redoing the work, but sending the commits one by one, in a more or less ordered way. Please let me know asap if you agree. I'm starting slow so that I get used to the process, as it's new to me.