diff --git a/appengine/cayley-appengine.go b/appengine/appengine.go
similarity index 100%
rename from appengine/cayley-appengine.go
rename to appengine/appengine.go
diff --git a/graph/all-iterator.go b/graph/all_iterator.go
similarity index 100%
rename from graph/all-iterator.go
rename to graph/all_iterator.go
diff --git a/graph/and-iterator.go b/graph/and_iterator.go
similarity index 100%
rename from graph/and-iterator.go
rename to graph/and_iterator.go
diff --git a/graph/and-iterator-optimize.go b/graph/and_iterator_optimize.go
similarity index 100%
rename from graph/and-iterator-optimize.go
rename to graph/and_iterator_optimize.go
diff --git a/graph/and-iterator-optimize_test.go b/graph/and_iterator_optimize_test.go
similarity index 100%
rename from graph/and-iterator-optimize_test.go
rename to graph/and_iterator_optimize_test.go
diff --git a/graph/and-iterator_test.go b/graph/and_iterator_test.go
similarity index 100%
rename from graph/and-iterator_test.go
rename to graph/and_iterator_test.go
diff --git a/graph/fixed-iterator.go b/graph/fixed_iterator.go
similarity index 100%
rename from graph/fixed-iterator.go
rename to graph/fixed_iterator.go
diff --git a/graph/hasa-iterator.go b/graph/hasa_iterator.go
similarity index 100%
rename from graph/hasa-iterator.go
rename to graph/hasa_iterator.go
diff --git a/graph/linksto-iterator.go b/graph/linksto_iterator.go
similarity index 100%
rename from graph/linksto-iterator.go
rename to graph/linksto_iterator.go
diff --git a/graph/linksto-iterator_test.go b/graph/linksto_iterator_test.go
similarity index 100%
rename from graph/linksto-iterator_test.go
rename to graph/linksto_iterator_test.go
diff --git a/graph/memstore/llrb-iterator.go b/graph/memstore/llrb_iterator.go
similarity index 100%
rename from graph/memstore/llrb-iterator.go
rename to graph/memstore/llrb_iterator.go
diff --git a/graph/memstore/memstore-all-iterator.go b/graph/memstore/memstore_all_iterator.go
similarity index 100%
rename from graph/memstore/memstore-all-iterator.go
rename to graph/memstore/memstore_all_iterator.go
diff --git a/graph/memstore/memtriplestore-iterator-optimize.go b/graph/memstore/memtriplestore_iterator_optimize.go
similarity index 100%
rename from graph/memstore/memtriplestore-iterator-optimize.go
rename to graph/memstore/memtriplestore_iterator_optimize.go
diff --git a/graph/mongo/mongo-iterator.go b/graph/mongo/mongo_iterator.go
similarity index 100%
rename from graph/mongo/mongo-iterator.go
rename to graph/mongo/mongo_iterator.go
diff --git a/graph/mongo/mongo-triplestore.go b/graph/mongo/mongo_triplestore.go
similarity index 100%
rename from graph/mongo/mongo-triplestore.go
rename to graph/mongo/mongo_triplestore.go
diff --git a/graph/mongo/mongo-triplestore-iterator-optimize.go b/graph/mongo/mongo_triplestore_iterator_optimize.go
similarity index 100%
rename from graph/mongo/mongo-triplestore-iterator-optimize.go
rename to graph/mongo/mongo_triplestore_iterator_optimize.go
diff --git a/graph/optional-iterator.go b/graph/optional_iterator.go
similarity index 100%
rename from graph/optional-iterator.go
rename to graph/optional_iterator.go
diff --git a/graph/or-iterator.go b/graph/or_iterator.go
similarity index 100%
rename from graph/or-iterator.go
rename to graph/or_iterator.go
diff --git a/graph/or-iterator_test.go b/graph/or_iterator_test.go
similarity index 100%
rename from graph/or-iterator_test.go
rename to graph/or_iterator_test.go
diff --git a/graph/query-shape.go b/graph/query_shape.go
similarity index 100%
rename from graph/query-shape.go
rename to graph/query_shape.go
diff --git a/graph/query-shape_test.go b/graph/query_shape_test.go
similarity index 100%
rename from graph/query-shape_test.go
rename to graph/query_shape_test.go
diff --git a/graph/result-tree-evaluator.go b/graph/result_tree_evaluator.go
similarity index 100%
rename from graph/result-tree-evaluator.go
rename to graph/result_tree_evaluator.go
diff --git a/graph/result-tree-evaluator_test.go b/graph/result_tree_evaluator_test.go
similarity index 100%
rename from graph/result-tree-evaluator_test.go
rename to graph/result_tree_evaluator_test.go
diff --git a/graph/sexp/sexp-session.go b/graph/sexp/sexp_session.go
similarity index 100%
rename from graph/sexp/sexp-session.go
rename to graph/sexp/sexp_session.go
diff --git a/graph/value-comparison-iterator.go b/graph/value_comparison_iterator.go
similarity index 100%
rename from graph/value-comparison-iterator.go
rename to graph/value_comparison_iterator.go
diff --git a/graph/value-comparison-iterator_test.go b/graph/value_comparison_iterator_test.go
similarity index 100%
rename from graph/value-comparison-iterator_test.go
rename to graph/value_comparison_iterator_test.go
diff --git a/gremlin/gremlin-build-iterator.go b/gremlin/gremlin_build_iterator.go
similarity index 100%
rename from gremlin/gremlin-build-iterator.go
rename to gremlin/gremlin_build_iterator.go
diff --git a/gremlin/gremlin-env.go b/gremlin/gremlin_env.go
similarity index 100%
rename from gremlin/gremlin-env.go
rename to gremlin/gremlin_env.go
diff --git a/gremlin/gremlin-finals.go b/gremlin/gremlin_finals.go
similarity index 100%
rename from gremlin/gremlin-finals.go
rename to gremlin/gremlin_finals.go
diff --git a/gremlin/gremlin-functional_test.go b/gremlin/gremlin_functional_test.go
similarity index 100%
rename from gremlin/gremlin-functional_test.go
rename to gremlin/gremlin_functional_test.go
diff --git a/gremlin/gremlin-session.go b/gremlin/gremlin_session.go
similarity index 100%
rename from gremlin/gremlin-session.go
rename to gremlin/gremlin_session.go
diff --git a/gremlin/gremlin-traversals.go b/gremlin/gremlin_traversals.go
similarity index 100%
rename from gremlin/gremlin-traversals.go
rename to gremlin/gremlin_traversals.go
diff --git a/http/cayley-http.go b/http/cayley_http.go
similarity index 100%
rename from http/cayley-http.go
rename to http/cayley_http.go
diff --git a/http/cayley-http-docs.go b/http/cayley_http_docs.go
similarity index 100%
rename from http/cayley-http-docs.go
rename to http/cayley_http_docs.go
diff --git a/http/cayley-http-query.go b/http/cayley_http_query.go
similarity index 100%
rename from http/cayley-http-query.go
rename to http/cayley_http_query.go
diff --git a/http/cayley-http_test.go b/http/cayley_http_test.go
similarity index 100%
rename from http/cayley-http_test.go
rename to http/cayley_http_test.go
diff --git a/http/cayley-http-write.go b/http/cayley_http_write.go
similarity index 100%
rename from http/cayley-http-write.go
rename to http/cayley_http_write.go
diff --git a/mql/mql-build-iterator.go b/mql/mql_build_iterator.go
similarity index 100%
rename from mql/mql-build-iterator.go
rename to mql/mql_build_iterator.go
diff --git a/mql/mql-fill.go b/mql/mql_fill.go
similarity index 100%
rename from mql/mql-fill.go
rename to mql/mql_fill.go
diff --git a/mql/mql-functional_test.go b/mql/mql_functional_test.go
similarity index 100%
rename from mql/mql-functional_test.go
rename to mql/mql_functional_test.go
diff --git a/mql/mql-query.go b/mql/mql_query.go
similarity index 100%
rename from mql/mql-query.go
rename to mql/mql_query.go
diff --git a/mql/mql-session.go b/mql/mql_session.go
similarity index 100%
rename from mql/mql-session.go
rename to mql/mql_session.go