Fix typos to make my stencil work; rv to prev. version in the process and update for new flow