try to rename everything correctly