diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c25acec..637c019 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@
 Some more helpful commands:
 
   * You can specify which database/ source tests to run:
-    `make test-short SOURCE='file go-bindata' DATABASE='postgres cassandra'`
+    `make test-short SOURCE='file go_bindata' DATABASE='postgres cassandra'`
   * After `make test`, run `make html-coverage` which opens a shiny test coverage overview.
   * `make build-cli` builds the CLI in directory `cli/build/`.
   * `make list-external-deps` lists all external dependencies for each package
diff --git a/README.md b/README.md
index eef0c5c..2e339c2 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,10 @@ Database drivers run migrations. [Add a new database?](database/driver.go)
 Source drivers read migrations from local or remote sources. [Add a new source?](source/driver.go)
 
   * [Filesystem](source/file) - read from fileystem
-  * [Go-Bindata](source/go-bindata) - read from embedded binary data ([jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata))
+  * [Go-Bindata](source/go_bindata) - read from embedded binary data ([jteeuwen/go-bindata](https://github.com/jteeuwen/go-bindata))
   * [Github](source/github) - read from remote Github repositories
-  * [AWS S3](source/aws-s3) - read from Amazon Web Services S3
-  * [Google Cloud Storage](source/google-cloud-storage) - read from Google Cloud Platform Storage
+  * [AWS S3](source/aws_s3) - read from Amazon Web Services S3
+  * [Google Cloud Storage](source/google_cloud_storage) - read from Google Cloud Platform Storage
 
 
 
diff --git a/cli/build_aws-s3.go b/cli/build_aws-s3.go
index a9671a6..eb53ac6 100644
--- a/cli/build_aws-s3.go
+++ b/cli/build_aws-s3.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/source/aws-s3"
+	_ "github.com/golang-migrate/migrate/source/aws_s3"
 )
diff --git a/cli/build_go-bindata.go b/cli/build_go-bindata.go
index 362e023..48c7474 100644
--- a/cli/build_go-bindata.go
+++ b/cli/build_go-bindata.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/source/go-bindata"
+	_ "github.com/golang-migrate/migrate/source/go_bindata"
 )
diff --git a/cli/build_google-cloud-storage.go b/cli/build_google-cloud-storage.go
index 8f62f59..2b300e3 100644
--- a/cli/build_google-cloud-storage.go
+++ b/cli/build_google-cloud-storage.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/source/google-cloud-storage"
+	_ "github.com/golang-migrate/migrate/source/google_cloud_storage"
 )
diff --git a/source/aws-s3/README.md b/source/aws_s3/README.md
similarity index 74%
rename from source/aws-s3/README.md
rename to source/aws_s3/README.md
index 3a59cfe..dd581ef 100644
--- a/source/aws-s3/README.md
+++ b/source/aws_s3/README.md
@@ -1,3 +1,3 @@
-# aws-s3
+# aws_s3
 
 `s3://<bucket>/<prefix>`
diff --git a/source/aws-s3/s3.go b/source/aws_s3/s3.go
similarity index 100%
rename from source/aws-s3/s3.go
rename to source/aws_s3/s3.go
diff --git a/source/aws-s3/s3_test.go b/source/aws_s3/s3_test.go
similarity index 100%
rename from source/aws-s3/s3_test.go
rename to source/aws_s3/s3_test.go
diff --git a/source/go-bindata/README.md b/source/go_bindata/README.md
similarity index 74%
rename from source/go-bindata/README.md
rename to source/go_bindata/README.md
index b222d99..bc1eede 100644
--- a/source/go-bindata/README.md
+++ b/source/go_bindata/README.md
@@ -1,4 +1,4 @@
-# go-bindata
+# go_bindata
 
 ## Usage
 
@@ -14,8 +14,8 @@ cd examples/migrations && go-bindata -pkg migrations .
 ```go
 import (
   "github.com/golang-migrate/migrate"
-  "github.com/golang-migrate/migrate/source/go-bindata"
-  "github.com/golang-migrate/migrate/source/go-bindata/examples/migrations"
+  "github.com/golang-migrate/migrate/source/go_bindata"
+  "github.com/golang-migrate/migrate/source/go_bindata/examples/migrations"
 )
 
 func main() {
@@ -33,11 +33,11 @@ func main() {
 
 ### Read bindata with URL (todo)
 
-This will restore the assets in a tmp directory and then 
+This will restore the assets in a tmp directory and then
 proxy to source/file. go-bindata must be in your `$PATH`.
 
 ```
-migrate -source go-bindata://examples/migrations/bindata.go 
+migrate -source go-bindata://examples/migrations/bindata.go
 ```
 
 
diff --git a/source/go-bindata/examples/migrations/bindata.go b/source/go_bindata/examples/migrations/bindata.go
similarity index 100%
rename from source/go-bindata/examples/migrations/bindata.go
rename to source/go_bindata/examples/migrations/bindata.go
diff --git a/source/go-bindata/go-bindata.go b/source/go_bindata/go-bindata.go
similarity index 100%
rename from source/go-bindata/go-bindata.go
rename to source/go_bindata/go-bindata.go
diff --git a/source/go-bindata/go-bindata_test.go b/source/go_bindata/go-bindata_test.go
similarity index 92%
rename from source/go-bindata/go-bindata_test.go
rename to source/go_bindata/go-bindata_test.go
index b2e861c..f9399b9 100644
--- a/source/go-bindata/go-bindata_test.go
+++ b/source/go_bindata/go-bindata_test.go
@@ -3,7 +3,7 @@ package bindata
 import (
 	"testing"
 
-	"github.com/golang-migrate/migrate/source/go-bindata/testdata"
+	"github.com/golang-migrate/migrate/source/go_bindata/testdata"
 	st "github.com/golang-migrate/migrate/source/testing"
 )
 
diff --git a/source/go-bindata/testdata/bindata.go b/source/go_bindata/testdata/bindata.go
similarity index 100%
rename from source/go-bindata/testdata/bindata.go
rename to source/go_bindata/testdata/bindata.go
diff --git a/source/google-cloud-storage/README.md b/source/google_cloud_storage/README.md
similarity index 54%
rename from source/google-cloud-storage/README.md
rename to source/google_cloud_storage/README.md
index e61cb23..284dc90 100644
--- a/source/google-cloud-storage/README.md
+++ b/source/google_cloud_storage/README.md
@@ -1,3 +1,3 @@
-# google-cloud-storage
+# google_cloud_storage
 
 `gcs://<bucket>/<prefix>`
diff --git a/source/google-cloud-storage/storage.go b/source/google_cloud_storage/storage.go
similarity index 100%
rename from source/google-cloud-storage/storage.go
rename to source/google_cloud_storage/storage.go
diff --git a/source/google-cloud-storage/storage_test.go b/source/google_cloud_storage/storage_test.go
similarity index 100%
rename from source/google-cloud-storage/storage_test.go
rename to source/google_cloud_storage/storage_test.go