Fix an error.
Rename UniversalPacket to GenericPacket.
Fix some errors.