MT#7141 upgrade package to 3.0 style