Replaced rollover strategy with renaming.