diff --git a/README.md b/README.md
index 4d462aa..8a81eab 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ NOTE(dtroyer) Apr 2015: This repo is under heavy revision as it is being revived
 
 `openstack/golang-client` is an implementation of [OpenStack]
 (http://www.openstack.org/) API client in [Go language](http://golang.org).
-The code follows OpenStack licensing and uses the Stackforge infrastructure
+The code follows OpenStack licensing and uses its CI infrastructure
 for hosting.  It currently implements [Identity Service v2] 
 (http://docs.openstack.org/api/openstack-identity-service/2.0/content/) 
 and [Object Storage v1] 
@@ -67,7 +67,7 @@ Apache v2.
 
 Contributing
 ------------
-The code repository utilizes the OpenStack StackForge infrastructure.
+The code repository utilizes the OpenStack CI infrastructure.
 Please use the [recommended workflow]
 (http://docs.openstack.org/infra/manual/developers.html#development-workflow).  If you are not a member yet,
 please consider joining as an [OpenStack contributor]
diff --git a/examples/00-authentication.go b/examples/00-authentication.go
index 7d62347..60b295c 100644
--- a/examples/00-authentication.go
+++ b/examples/00-authentication.go
@@ -16,7 +16,7 @@ package main
 
 import (
 	"fmt"
-	// "git.openstack.org/stackforge/golang-client.git/identity/v2"
+	// "git.openstack.org/openstack/golang-client.git/identity/v2"
 	"time"
 
 	"git.openstack.org/openstack/golang-client.git/openstack"