Change-Id: Ia1324fe4ee98b487b82d01ee0d9cffe284a64811
Per new naming convention (i.e. to be consistent with ve-graph). Change-Id: I3eae4ce011f0078b204d882a8068f844cd19daa3