[Upgrade]: preparing to fix renamed gadgets