Fix GenericNetMessage
Replace some old NetMessage declarations with the new style