Rename vars for $ pattern