diff --git a/openstack/identity/v2/common_test.go b/openstack/identity/v2/common_test.go
index 18c5340..0260424 100644
--- a/openstack/identity/v2/common_test.go
+++ b/openstack/identity/v2/common_test.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 // Taken from: http://docs.openstack.org/api/openstack-identity-service/2.0/content/POST_authenticate_v2.0_tokens_.html
 const authResultsOK = `{
@@ -160,20 +160,20 @@
 					}
 				],
 				"namespace": "http://docs.openstack.org/identity/api/ext/OS-SIMPLE-CERT/v1.0",
-				"alias": "OS-SIMPLE-CERT",															
-				"description": "OpenStack simple certificate retrieval extension"	
-			},																
+				"alias": "OS-SIMPLE-CERT",
+				"description": "OpenStack simple certificate retrieval extension"
+			},
 			{
-				"updated": "2013-07-07T12:00:0-00:00",	
+				"updated": "2013-07-07T12:00:0-00:00",
 				"name": "OpenStack EC2 API",
 				"links": [
 					{
-						"href": "https://github.com/openstack/identity-api",	
-						"type": "text/html",				
-						"rel": "describedby"				
-					}	
+						"href": "https://github.com/openstack/identity-api",
+						"type": "text/html",
+						"rel": "describedby"
+					}
 				],
-				"namespace": "http://docs.openstack.org/identity/api/ext/OS-EC2/v1.0",	
+				"namespace": "http://docs.openstack.org/identity/api/ext/OS-EC2/v1.0",
 				"alias": "OS-EC2",
 				"description": "OpenStack EC2 Credentials backend."
 			}
diff --git a/openstack/identity/v2/doc.go b/openstack/identity/v2/doc.go
index b4b27b1..e8ab21b 100644
--- a/openstack/identity/v2/doc.go
+++ b/openstack/identity/v2/doc.go
@@ -1,5 +1,5 @@
 /*
-Package identity provides convenient OpenStack Identity V2 API client access.
+Package v2 identity provides convenient OpenStack Identity V2 API client access.
 This package currently doesn't support the administrative access endpoints, but may appear in the future based on demand.
 
 Authentication
@@ -117,4 +117,4 @@
 		}
 	}
 */
-package identity
+package v2
diff --git a/openstack/identity/v2/errors.go b/openstack/identity/v2/errors.go
index efa7c85..0dd1172 100644
--- a/openstack/identity/v2/errors.go
+++ b/openstack/identity/v2/errors.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import "fmt"
 
diff --git a/openstack/identity/v2/extensions.go b/openstack/identity/v2/extensions.go
index 9cf9c78..df05a36 100644
--- a/openstack/identity/v2/extensions.go
+++ b/openstack/identity/v2/extensions.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"github.com/mitchellh/mapstructure"
diff --git a/openstack/identity/v2/extensions_test.go b/openstack/identity/v2/extensions_test.go
index 3000fc0..47f7e06 100644
--- a/openstack/identity/v2/extensions_test.go
+++ b/openstack/identity/v2/extensions_test.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"encoding/json"
diff --git a/openstack/identity/v2/requests.go b/openstack/identity/v2/requests.go
index 4edbfef..696ee4d 100644
--- a/openstack/identity/v2/requests.go
+++ b/openstack/identity/v2/requests.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"github.com/racker/perigee"
diff --git a/openstack/identity/v2/service_catalog.go b/openstack/identity/v2/service_catalog.go
index 4147723..22d0d7b 100644
--- a/openstack/identity/v2/service_catalog.go
+++ b/openstack/identity/v2/service_catalog.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import "github.com/mitchellh/mapstructure"
 
diff --git a/openstack/identity/v2/service_catalog_test.go b/openstack/identity/v2/service_catalog_test.go
index d089482..143b48f 100644
--- a/openstack/identity/v2/service_catalog_test.go
+++ b/openstack/identity/v2/service_catalog_test.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"encoding/json"
diff --git a/openstack/identity/v2/token.go b/openstack/identity/v2/token.go
index b2c526a..df67d76 100644
--- a/openstack/identity/v2/token.go
+++ b/openstack/identity/v2/token.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"github.com/mitchellh/mapstructure"
diff --git a/openstack/identity/v2/token_test.go b/openstack/identity/v2/token_test.go
index 872813f..9770ed5 100644
--- a/openstack/identity/v2/token_test.go
+++ b/openstack/identity/v2/token_test.go
@@ -1,4 +1,4 @@
-package identity
+package v2
 
 import (
 	"encoding/json"