diff --git a/graph/leveldb/leveldb_all_iterator.go b/graph/leveldb/all_iterator.go
similarity index 100%
rename from graph/leveldb/leveldb_all_iterator.go
rename to graph/leveldb/all_iterator.go
diff --git a/graph/leveldb/leveldb_iterator.go b/graph/leveldb/iterator.go
similarity index 100%
rename from graph/leveldb/leveldb_iterator.go
rename to graph/leveldb/iterator.go
diff --git a/graph/leveldb/leveldb_triplestore.go b/graph/leveldb/triplestore.go
similarity index 100%
rename from graph/leveldb/leveldb_triplestore.go
rename to graph/leveldb/triplestore.go
diff --git a/graph/leveldb/leveldb_triplestore_iterator_optimize.go b/graph/leveldb/triplestore_iterator_optimize.go
similarity index 100%
rename from graph/leveldb/leveldb_triplestore_iterator_optimize.go
rename to graph/leveldb/triplestore_iterator_optimize.go
diff --git a/graph/memstore/memstore_all_iterator.go b/graph/memstore/all_iterator.go
similarity index 100%
rename from graph/memstore/memstore_all_iterator.go
rename to graph/memstore/all_iterator.go
diff --git a/graph/memstore/llrb_iterator.go b/graph/memstore/iterator.go
similarity index 100%
rename from graph/memstore/llrb_iterator.go
rename to graph/memstore/iterator.go
diff --git a/graph/memstore/memtriplestore.go b/graph/memstore/triplestore.go
similarity index 100%
rename from graph/memstore/memtriplestore.go
rename to graph/memstore/triplestore.go
diff --git a/graph/memstore/memtriplestore_iterator_optimize.go b/graph/memstore/triplestore_iterator_optimize.go
similarity index 100%
rename from graph/memstore/memtriplestore_iterator_optimize.go
rename to graph/memstore/triplestore_iterator_optimize.go
diff --git a/graph/memstore/memtriplestore_test.go b/graph/memstore/triplestore_test.go
similarity index 100%
rename from graph/memstore/memtriplestore_test.go
rename to graph/memstore/triplestore_test.go
diff --git a/graph/mongo/mongo_iterator.go b/graph/mongo/iterator.go
similarity index 100%
rename from graph/mongo/mongo_iterator.go
rename to graph/mongo/iterator.go
diff --git a/graph/mongo/mongo_triplestore.go b/graph/mongo/triplestore.go
similarity index 100%
rename from graph/mongo/mongo_triplestore.go
rename to graph/mongo/triplestore.go
diff --git a/graph/mongo/mongo_triplestore_iterator_optimize.go b/graph/mongo/triplestore_iterator_optimize.go
similarity index 100%
rename from graph/mongo/mongo_triplestore_iterator_optimize.go
rename to graph/mongo/triplestore_iterator_optimize.go
diff --git a/graph/sexp/sexp_session.go b/graph/sexp/session.go
similarity index 100%
rename from graph/sexp/sexp_session.go
rename to graph/sexp/session.go
diff --git a/http/cayley_http_docs.go b/http/docs.go
similarity index 100%
rename from http/cayley_http_docs.go
rename to http/docs.go
diff --git a/http/cayley_http.go b/http/http.go
similarity index 100%
rename from http/cayley_http.go
rename to http/http.go
diff --git a/http/cayley_http_test.go b/http/http_test.go
similarity index 100%
rename from http/cayley_http_test.go
rename to http/http_test.go
diff --git a/http/cayley_http_query.go b/http/query.go
similarity index 100%
rename from http/cayley_http_query.go
rename to http/query.go
diff --git a/http/cayley_http_write.go b/http/write.go
similarity index 100%
rename from http/cayley_http_write.go
rename to http/write.go
diff --git a/query/gremlin/gremlin_build_iterator.go b/query/gremlin/build_iterator.go
similarity index 100%
rename from query/gremlin/gremlin_build_iterator.go
rename to query/gremlin/build_iterator.go
diff --git a/query/gremlin/gremlin_env.go b/query/gremlin/environ.go
similarity index 100%
rename from query/gremlin/gremlin_env.go
rename to query/gremlin/environ.go
diff --git a/query/gremlin/gremlin_finals.go b/query/gremlin/finals.go
similarity index 100%
rename from query/gremlin/gremlin_finals.go
rename to query/gremlin/finals.go
diff --git a/query/gremlin/gremlin_functional_test.go b/query/gremlin/functional_test.go
similarity index 100%
rename from query/gremlin/gremlin_functional_test.go
rename to query/gremlin/functional_test.go
diff --git a/query/gremlin/gremlin_session.go b/query/gremlin/session.go
similarity index 100%
rename from query/gremlin/gremlin_session.go
rename to query/gremlin/session.go
diff --git a/query/gremlin/gremlin_traversals.go b/query/gremlin/traversals.go
similarity index 100%
rename from query/gremlin/gremlin_traversals.go
rename to query/gremlin/traversals.go
diff --git a/query/mql/mql_build_iterator.go b/query/mql/build_iterator.go
similarity index 100%
rename from query/mql/mql_build_iterator.go
rename to query/mql/build_iterator.go
diff --git a/query/mql/mql_fill.go b/query/mql/fill.go
similarity index 100%
rename from query/mql/mql_fill.go
rename to query/mql/fill.go
diff --git a/query/mql/mql_functional_test.go b/query/mql/functional_test.go
similarity index 100%
rename from query/mql/mql_functional_test.go
rename to query/mql/functional_test.go
diff --git a/query/mql/mql_query.go b/query/mql/query.go
similarity index 100%
rename from query/mql/mql_query.go
rename to query/mql/query.go
diff --git a/query/mql/mql_session.go b/query/mql/session.go
similarity index 100%
rename from query/mql/mql_session.go
rename to query/mql/session.go