rename and reaarange columns