rename return props to last- as well