diff --git a/identity/v2/auth.go b/identity/v2/auth.go
index 174d7d7..36afeaa 100644
--- a/identity/v2/auth.go
+++ b/identity/v2/auth.go
@@ -128,7 +128,7 @@ func AuthTenantNameTokenId(url, tenantName, tokenId string) (Auth, error) {
 func auth(url, jsonStr *string) (Auth, error) {
 	var s []byte = []byte(*jsonStr)
 	path := fmt.Sprintf(`%s/tokens`, *url)
-	resp, err := session.Post(path, nil, nil, &s)
+	resp, err := openstack.Post(path, nil, nil, &s)
 	if err != nil {
 		return Auth{}, err
 	}
diff --git a/image/v1/image.go b/image/v1/image.go
index 893f5c2..4937bd8 100644
--- a/image/v1/image.go
+++ b/image/v1/image.go
@@ -152,7 +152,7 @@ func (imageService Service) queryImages(includeDetails bool, imagesResponseConta
 	var headers http.Header = http.Header{}
 	headers.Set("X-Auth-Token", imageService.TokenID)
 	headers.Set("Accept", "application/json")
-	resp, err := session.Get(reqURL.String(), nil, &headers)
+	resp, err := openstack.Get(reqURL.String(), nil, &headers)
 	if err != nil {
 		return err
 	}
diff --git a/objectstorage/v1/objectstorage.go b/objectstorage/v1/objectstorage.go
index 785ba00..2c4ae75 100644
--- a/objectstorage/v1/objectstorage.go
+++ b/objectstorage/v1/objectstorage.go
@@ -110,7 +110,7 @@ func ListObjects(limit int64,
 func PutObject(fContent *[]byte, url, token string, s ...string) (err error) {
 	var headers http.Header = http.Header{}
 	headers.Set("X-Auth-Token", token)
-	resp, err := session.Put(url, nil, &headers, fContent)
+	resp, err := openstack.Put(url, nil, &headers, fContent)
 	if err != nil {
 		return err
 	}
diff --git a/openstack/session.go b/openstack/session.go
index 171aae8..235cabb 100644
--- a/openstack/session.go
+++ b/openstack/session.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package session
+package openstack
 
 import (
 	"bytes"
diff --git a/openstack/session_test.go b/openstack/session_test.go
index dee74c6..7c172b8 100644
--- a/openstack/session_test.go
+++ b/openstack/session_test.go
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 
-package session_test
+package openstack_test
 
 import (
     "encoding/json"
@@ -41,7 +41,7 @@ func TestSessionGet(t *testing.T) {
     expected := TestStruct{ID: "id1", Name: "Chris"}
     actual := TestStruct{}
 
-    s, _ := session.NewSession(nil, "", nil)
+    s, _ := openstack.NewSession(nil, "", nil)
     var headers http.Header = http.Header{}
     headers.Set("X-Auth-Token", tokn)
     headers.Set("Accept", "application/json")