master: Changing terminoligy for Gavin