diff --git a/acceptance/openstack/blockstorage/v1/blockstorage_test.go.bak b/acceptance/openstack/blockStorage/v1/blockstorage_test.go.bak
similarity index 100%
rename from acceptance/openstack/blockstorage/v1/blockstorage_test.go.bak
rename to acceptance/openstack/blockStorage/v1/blockstorage_test.go.bak
diff --git a/acceptance/openstack/blockstorage/v1/snapshots_test.go b/acceptance/openstack/blockStorage/v1/snapshots_test.go
similarity index 95%
rename from acceptance/openstack/blockstorage/v1/snapshots_test.go
rename to acceptance/openstack/blockStorage/v1/snapshots_test.go
index 9d8f0d3..0d9d5c7 100644
--- a/acceptance/openstack/blockstorage/v1/snapshots_test.go
+++ b/acceptance/openstack/blockStorage/v1/snapshots_test.go
@@ -9,7 +9,7 @@
 	"time"
 
 	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack/blockstorage/v1/snapshots"
+	"github.com/rackspace/gophercloud/openstack/blockStorage/v1/snapshots"
 )
 
 func waitForSnapshot(client *gophercloud.ServiceClient, id string) error {
diff --git a/acceptance/openstack/blockstorage/v1/volumeTypes_test.go b/acceptance/openstack/blockStorage/v1/volumeTypes_test.go
similarity index 95%
rename from acceptance/openstack/blockstorage/v1/volumeTypes_test.go
rename to acceptance/openstack/blockStorage/v1/volumeTypes_test.go
index d49d2eb..ad6526a 100644
--- a/acceptance/openstack/blockstorage/v1/volumeTypes_test.go
+++ b/acceptance/openstack/blockStorage/v1/volumeTypes_test.go
@@ -7,7 +7,7 @@
 	"testing"
 	"time"
 
-	"github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumeTypes"
+	"github.com/rackspace/gophercloud/openstack/blockStorage/v1/volumeTypes"
 	"github.com/rackspace/gophercloud/pagination"
 )
 
diff --git a/acceptance/openstack/blockstorage/v1/volumes_test.go b/acceptance/openstack/blockStorage/v1/volumes_test.go
similarity index 96%
rename from acceptance/openstack/blockstorage/v1/volumes_test.go
rename to acceptance/openstack/blockStorage/v1/volumes_test.go
index a8fadb7..22d9653 100644
--- a/acceptance/openstack/blockstorage/v1/volumes_test.go
+++ b/acceptance/openstack/blockStorage/v1/volumes_test.go
@@ -11,7 +11,7 @@
 
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
-	"github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes"
+	"github.com/rackspace/gophercloud/openstack/blockStorage/v1/volumes"
 	"github.com/rackspace/gophercloud/openstack/utils"
 	"github.com/rackspace/gophercloud/pagination"
 )
diff --git a/openstack/blockstorage/v1/snapshots/requests.go b/openstack/blockStorage/v1/snapshots/requests.go
similarity index 100%
rename from openstack/blockstorage/v1/snapshots/requests.go
rename to openstack/blockStorage/v1/snapshots/requests.go
diff --git a/openstack/blockstorage/v1/snapshots/requests_test.go b/openstack/blockStorage/v1/snapshots/requests_test.go
similarity index 100%
rename from openstack/blockstorage/v1/snapshots/requests_test.go
rename to openstack/blockStorage/v1/snapshots/requests_test.go
diff --git a/openstack/blockstorage/v1/snapshots/results.go b/openstack/blockStorage/v1/snapshots/results.go
similarity index 100%
rename from openstack/blockstorage/v1/snapshots/results.go
rename to openstack/blockStorage/v1/snapshots/results.go
diff --git a/openstack/blockstorage/v1/snapshots/urls.go b/openstack/blockStorage/v1/snapshots/urls.go
similarity index 100%
rename from openstack/blockstorage/v1/snapshots/urls.go
rename to openstack/blockStorage/v1/snapshots/urls.go
diff --git a/openstack/blockstorage/v1/snapshots/urls_test.go b/openstack/blockStorage/v1/snapshots/urls_test.go
similarity index 100%
rename from openstack/blockstorage/v1/snapshots/urls_test.go
rename to openstack/blockStorage/v1/snapshots/urls_test.go
diff --git a/openstack/blockstorage/v1/volumeTypes/requests.go b/openstack/blockStorage/v1/volumeTypes/requests.go
similarity index 100%
rename from openstack/blockstorage/v1/volumeTypes/requests.go
rename to openstack/blockStorage/v1/volumeTypes/requests.go
diff --git a/openstack/blockstorage/v1/volumeTypes/requests_test.go b/openstack/blockStorage/v1/volumeTypes/requests_test.go
similarity index 100%
rename from openstack/blockstorage/v1/volumeTypes/requests_test.go
rename to openstack/blockStorage/v1/volumeTypes/requests_test.go
diff --git a/openstack/blockstorage/v1/volumeTypes/results.go b/openstack/blockStorage/v1/volumeTypes/results.go
similarity index 100%
rename from openstack/blockstorage/v1/volumeTypes/results.go
rename to openstack/blockStorage/v1/volumeTypes/results.go
diff --git a/openstack/blockstorage/v1/volumeTypes/urls.go b/openstack/blockStorage/v1/volumeTypes/urls.go
similarity index 100%
rename from openstack/blockstorage/v1/volumeTypes/urls.go
rename to openstack/blockStorage/v1/volumeTypes/urls.go
diff --git a/openstack/blockstorage/v1/volumeTypes/urls_test.go b/openstack/blockStorage/v1/volumeTypes/urls_test.go
similarity index 100%
rename from openstack/blockstorage/v1/volumeTypes/urls_test.go
rename to openstack/blockStorage/v1/volumeTypes/urls_test.go
diff --git a/openstack/blockstorage/v1/volumes/requests.go b/openstack/blockStorage/v1/volumes/requests.go
similarity index 100%
rename from openstack/blockstorage/v1/volumes/requests.go
rename to openstack/blockStorage/v1/volumes/requests.go
diff --git a/openstack/blockstorage/v1/volumes/requests_test.go b/openstack/blockStorage/v1/volumes/requests_test.go
similarity index 100%
rename from openstack/blockstorage/v1/volumes/requests_test.go
rename to openstack/blockStorage/v1/volumes/requests_test.go
diff --git a/openstack/blockstorage/v1/volumes/results.go b/openstack/blockStorage/v1/volumes/results.go
similarity index 100%
rename from openstack/blockstorage/v1/volumes/results.go
rename to openstack/blockStorage/v1/volumes/results.go
diff --git a/openstack/blockstorage/v1/volumes/urls.go b/openstack/blockStorage/v1/volumes/urls.go
similarity index 100%
rename from openstack/blockstorage/v1/volumes/urls.go
rename to openstack/blockStorage/v1/volumes/urls.go
diff --git a/openstack/blockstorage/v1/volumes/urls_test.go b/openstack/blockStorage/v1/volumes/urls_test.go
similarity index 100%
rename from openstack/blockstorage/v1/volumes/urls_test.go
rename to openstack/blockStorage/v1/volumes/urls_test.go