fixed method names for different pcap versions. Cleanup