Change pyramid specific stuff to vigor

Change-Id: Ibc5fe971faebd961395cd97fb64d7e77a4053f17