another round of reshuffling and renaming