WildPackets → Savvius.

Change-Id: I2494c2b1dcc9e324535b3f659b51b44059c478bd
Reviewed-on: https://code.wireshark.org/review/8304
Reviewed-by: Gerald Combs <gerald@wireshark.org>

9 files changed, 24 insertions, 24 deletions

diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index b3a6fc6817..f4ec17f38d 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -94,7 +94,7 @@ Network Associates Windows-based B<Sniffer> captures
 Network General/Network Associates DOS-based B<Sniffer> (compressed or uncompressed) captures
 
 =item *
-AG Group/WildPackets B<EtherPeek>/B<TokenPeek>/B<AiroPeek>/B<EtherHelp>/B<PacketGrabber> captures
+AG Group/WildPackets/Savvius B<EtherPeek>/B<TokenPeek>/B<AiroPeek>/B<EtherHelp>/B<PacketGrabber> captures
 
 =item *
 B<RADCOM>'s WAN/LAN analyzer captures
diff --git a/docbook/wsug_src/WSUG_chapter_io.asciidoc b/docbook/wsug_src/WSUG_chapter_io.asciidoc
index adaf72a65c..b5058a8bae 100644
--- a/docbook/wsug_src/WSUG_chapter_io.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_io.asciidoc
@@ -153,7 +153,7 @@ The following file formats from other capture tools can be opened by Wireshark:
 
 * Network General/Network Associates DOS-based Sniffer (compressed or uncompressed) captures
 
-* AG Group/WildPackets EtherPeek/TokenPeek/AiroPeek/EtherHelp/PacketGrabber captures
+* AG Group/WildPackets/Savvius EtherPeek/TokenPeek/AiroPeek/EtherHelp/PacketGrabber captures
 
 * RADCOM's WAN/LAN Analyzer captures
 
@@ -925,4 +925,4 @@ image::wsug_graphics/ws-packet-format.png[]
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSUG Chapter IO -->
-++++++++++++++++++++++++++++++++++++++
\ No newline at end of file
+++++++++++++++++++++++++++++++++++++++
diff --git a/epan/dissectors/packet-ieee80211-airopeek.c b/epan/dissectors/packet-ieee80211-airopeek.c
index 729186d3c9..6a321b6776 100644
--- a/epan/dissectors/packet-ieee80211-airopeek.c
+++ b/epan/dissectors/packet-ieee80211-airopeek.c
@@ -1,5 +1,5 @@
 /* packet-ieee80211-airopeek.c
- * Routines for pre-V9 WildPackets AiroPeek header dissection
+ * Routines for pre-V9 Savvius (WildPackets) AiroPeek header dissection
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
diff --git a/help/faq.py b/help/faq.py
index 4434647299..692ee4b8d3 100755
--- a/help/faq.py
+++ b/help/faq.py
@@ -522,7 +522,7 @@ It can also read a variety of capture file formats, including:
 </p>
 <ul>
 
-<li> AG Group/WildPackets EtherPeek/TokenPeek/AiroPeek/EtherHelp/Packet Grabber captures
+<li> AG Group/WildPackets/Savvius EtherPeek/TokenPeek/AiroPeek/EtherHelp/Packet Grabber captures
 <li> AIX's iptrace captures
 <li> Accellent's 5Views LAN agent output
 <li> Cinco Networks NetXRay captures
diff --git a/help/overview.txt b/help/overview.txt
index 876ad2f7d9..03d4ea2a27 100644
--- a/help/overview.txt
+++ b/help/overview.txt
@@ -15,7 +15,7 @@ Wireshark's native capture file format is libpcap format, which is also the form
 -Cinco Networks NetXRay captures
 -Network Associates Windows-based Sniffer captures
 -Network General/Network Associates DOS-based Sniffer (compressed or uncompressed) captures
--AG Group/WildPackets EtherPeek/TokenPeek/AiroPeek/EtherHelp/PacketGrabber captures
+-AG Group/WildPackets/Savvius EtherPeek/TokenPeek/AiroPeek/EtherHelp/PacketGrabber captures
 -RADCOM's WAN/LAN analyzer captures
 -Network Instruments Observer version 9 captures
 -Lucent/Ascend router debug output
diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml
index 5056c3a594..01f1c78f99 100644
--- a/wireshark-mime-package.xml
+++ b/wireshark-mime-package.xml
@@ -86,7 +86,7 @@
   </mime-type>
 
   <mime-type type="application/x-etherpeek">
-    <comment>Packet Capture (Wildpackets/Etherpeek/Airopeek tagged/v9)</comment>
+    <comment>Packet Capture (Savvius/Etherpeek/Airopeek tagged/v9)</comment>
     <generic-icon name="application-wireshark-doc"/>
     <magic>
       <match type="string" offset="0" value="\177ver"/>
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 0dfba98041..ff23cb2eb3 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -143,7 +143,7 @@ static const struct file_extension_info file_type_extensions_base[] = {
 	{ "Colasoft Capsa", "cscpkt" },
 	{ "Novell LANalyzer", "tr1" },
 	{ "Tektronix K12xx 32-bit .rf5 format", "rf5" },
-	{ "WildPackets *Peek", "pkt;tpc;apc;wpz" },
+	{ "Savvius *Peek", "pkt;tpc;apc;wpz" },
 	{ "Catapult DCT2000 trace (.out format)", "out" },
 	{ "MPEG files", "mpg;mp3" },
 	{ "TamoSoft CommView", "ncf" },
@@ -340,7 +340,7 @@ static struct open_info open_info_base[] = {
 	{ "Visual Networks traffic capture",        OPEN_INFO_MAGIC,     visual_open,              NULL,       NULL, NULL },
 	{ "InfoVista 5View capture",                OPEN_INFO_MAGIC,     _5views_open,             NULL,       NULL, NULL },
 	{ "Network Instruments Observer",           OPEN_INFO_MAGIC,     network_instruments_open, NULL,       NULL, NULL },
-	{ "WildPackets tagged",                     OPEN_INFO_MAGIC,     peektagged_open,          NULL,       NULL, NULL },
+	{ "Savvius tagged",                         OPEN_INFO_MAGIC,     peektagged_open,          NULL,       NULL, NULL },
 	{ "Colasoft Capsa",                         OPEN_INFO_MAGIC,     capsa_open,               NULL,       NULL, NULL },
 	{ "DBS Etherwatch (VMS)",                   OPEN_INFO_MAGIC,     dbs_etherwatch_open,      NULL,       NULL, NULL },
 	{ "Tektronix K12xx 32-bit .rf5 format",     OPEN_INFO_MAGIC,     k12_open,                 NULL,       NULL, NULL },
@@ -381,7 +381,7 @@ static struct open_info open_info_base[] = {
 	{ "Endace ERF capture",                     OPEN_INFO_HEURISTIC, erf_open,                 "erf",      NULL, NULL },
 	{ "IPFIX File Format",                      OPEN_INFO_HEURISTIC, ipfix_open,               "pfx;ipfix",NULL, NULL },
 	{ "K12 text file",                          OPEN_INFO_HEURISTIC, k12text_open,             "txt",      NULL, NULL },
-	{ "WildPackets classic",                    OPEN_INFO_HEURISTIC, peekclassic_open,         "pkt;tpc;apc;wpz", NULL, NULL },
+	{ "Savvius classic",                        OPEN_INFO_HEURISTIC, peekclassic_open,         "pkt;tpc;apc;wpz", NULL, NULL },
 	{ "pppd log (pppdump format)",              OPEN_INFO_HEURISTIC, pppdump_open,             NULL,       NULL, NULL },
 	{ "IBM iSeries comm. trace",                OPEN_INFO_HEURISTIC, iseries_open,             "txt",      NULL, NULL },
 	{ "I4B ISDN trace",                         OPEN_INFO_HEURISTIC, i4btrace_open,            NULL,       NULL, NULL },
@@ -1423,17 +1423,17 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
 	  visual_dump_can_write_encap, visual_dump_open, NULL },
 
 	/* WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V56 */
-	{ "WildPackets classic (V5 and V6)", "peekclassic56", "pkt", "tpc;apc;wpz",
+	{ "Savvius classic (V5 and V6)", "peekclassic56", "pkt", "tpc;apc;wpz",
 	  FALSE, FALSE, 0,
 	  NULL, NULL, NULL },
 
 	/* WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V7 */
-	{ "WildPackets classic (V7)", "peekclassic7", "pkt", "tpc;apc;wpz",
+	{ "Savvius classic (V7)", "peekclassic7", "pkt", "tpc;apc;wpz",
 	  FALSE, FALSE, 0,
 	  NULL, NULL, NULL },
 
 	/* WTAP_FILE_TYPE_SUBTYPE_PEEKTAGGED */
-	{ "WildPackets tagged", "peektagged", "pkt", "tpc;apc;wpz",
+	{ "Savvius tagged", "peektagged", "pkt", "tpc;apc;wpz",
 	  FALSE, FALSE, 0,
 	  NULL, NULL, NULL },
 
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index 613018e2dd..44a960a896 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -1,9 +1,9 @@
 /* peekclassic.c
- * Routines for opening files in what WildPackets calls the classic file
- * format in the description of their "PeekRdr Sample Application" (C++
- * source code to read their capture files, downloading of which requires
- * a maintenance contract, so it's not free as in beer and probably not
- * as in speech, either).
+ * Routines for opening files in what Savvius (formerly WildPackets) calls
+ * the classic file format in the description of their "PeekRdr Sample
+ * Application" (C++ source code to read their capture files, downloading
+ * of which requires a maintenance contract, so it's not free as in beer
+ * and probably not as in speech, either).
  *
  * As that description says, it's used by AiroPeek and AiroPeek NX prior
  * to 2.0, EtherPeek prior to 6.0, and EtherPeek NX prior to 3.0.  It
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 51bd43af62..7b219603a0 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -1,15 +1,15 @@
 /* peektagged.c
- * Routines for opening files in what WildPackets calls the tagged file
- * format in the description of their "PeekRdr Sample Application" (C++
- * source code to read their capture files, downloading of which requires
- * a maintenance contract, so it's not free as in beer and probably not
- * as in speech, either).
+ * Routines for opening files in what Savvius (formerly WildPackets) calls
+ * the tagged file format in the description of their "PeekRdr Sample
+ * Application" (C++ source code to read their capture files, downloading
+ * of which requires a maintenance contract, so it's not free as in beer
+ * and probably not as in speech, either).
  *
  * As that description says, it's used by AiroPeek and AiroPeek NX 2.0
  * and later, EtherPeek 6.0 and later, EtherPeek NX 3.0 and later,
  * EtherPeek VX 1.0 and later, GigaPeek NX 1.0 and later, Omni3 1.0
  * and later (both OmniPeek and the Remote Engine), and WANPeek NX
- * 1.0 and later.  They also say it'll be used by future WildPackets
+ * 1.0 and later.  They also say it'll be used by future Savvius
  * products.
  *
  * Wiretap Library