[Evgeny, Josiah] changed function names to be the same as method name