Fixed missing renamings
Added support for Win XP