Update to new variable replacement syntax