Fix: from name hrader, add: [else] to rewrite variables