Updated/renamed incentive inlcludes with correct formnums