rename and rearrange things