Bring event packages in line with plugin packages