Tests need renaming too.