replace remaining var-name attributes by expr-name