Renaiming methods to better match their functions