Renaming strategy for proper tracking