Updated naming to better match Ruby norms