Weaver: update package names