Updated code to match naming convention

I was dissatisfied by the naming of the methods.  So I fixed it.