Update name of vars for templating