Fully qualify global variables

Change-Id: If20420ca7c6311dfd52bdaf9b1490c8bd9ef1f5f