Changed some pesky method names

Why must things be named weird? Why?!