The big rename. Which was not so big after all ...