Renaming + trying to resolve XP bug