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