Adjust method naming to be more inline w/ proposed method naming