Fix remaining sniffer warnings and errors Change-Id: I2a2ab037793df771be2abc4a4433726469f60ab0
Per new naming convention (i.e. to be consistent with ve-graph). Change-Id: I3eae4ce011f0078b204d882a8068f844cd19daa3