Changed Guide references to use upstream