Honour autorefresh flag on scratch and rename as well