Merge "Rename method to clarify when it's called."