rename and add some variables