Fixed: the generators to match the new convention