Gigantic renaming and removal: all risk tests pass