rename in the right order