Make it BeeGee

Change-Id: I236481d605f6cef5ee6c7264865c73ae08418d15