rename a var, improve leon's attr