Make it BeeGee

Change-Id: If818e822805e3a4efad13beb1b4fd90d2259ec88