diff --git a/lock.toml b/Gopkg.lock
similarity index 100%
rename from lock.toml
rename to Gopkg.lock
diff --git a/manifest.toml b/Gopkg.toml
similarity index 100%
rename from manifest.toml
rename to Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/README.md b/cmd/dep/testdata/harness_tests/README.md
index 9cd5cf3c2a..b7713d3aa8 100644
--- a/cmd/dep/testdata/harness_tests/README.md
+++ b/cmd/dep/testdata/harness_tests/README.md
@@ -14,11 +14,11 @@ The directory structure is as follows:
                         testcase.json
                         initial/
                             file1.go
-                            manifest.toml
+                            Gopkg.toml
                             ...
                         final/
-                            manifest.toml
-                            lock.toml
+                            Gopkg.toml
+                            Gopkg.lock
                     case2/
                     ...
 
diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/empty/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/empty/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/lock.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/empty/case2/final/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/empty/case2/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/override/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/override/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/override/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/override/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/lock.toml b/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case1/initial/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case1/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case2/final/lock.toml b/cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case2/final/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case2/final/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case2/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case2/initial/lock.toml b/cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case2/initial/lock.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/ensure/update/case2/initial/manifest.toml b/cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/ensure/update/case2/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/init/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/init/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/init/case2/final/lock.toml b/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case2/final/lock.toml
rename to cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/init/case2/final/manifest.toml b/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case2/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/init/case3/final/lock.toml b/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case3/final/lock.toml
rename to cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/init/case3/final/manifest.toml b/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/case3/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/init/skip-hidden/final/lock.toml b/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/skip-hidden/final/lock.toml
rename to cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/init/skip-hidden/final/manifest.toml b/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/init/skip-hidden/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/force/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/force/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/remove/force/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/force/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/force/case1/initial/manifest.toml b/cmd/dep/testdata/harness_tests/remove/force/case1/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/force/case1/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/force/case1/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case1/initial/manifest.toml b/cmd/dep/testdata/harness_tests/remove/specific/case1/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case1/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case1/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case2/final/lock.toml b/cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case2/final/lock.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case2/final/manifest.toml b/cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case2/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/specific/case2/initial/manifest.toml b/cmd/dep/testdata/harness_tests/remove/specific/case2/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/specific/case2/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/specific/case2/initial/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/unused/case1/final/lock.toml b/cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/unused/case1/final/lock.toml
rename to cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock
diff --git a/cmd/dep/testdata/harness_tests/remove/unused/case1/final/manifest.toml b/cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/unused/case1/final/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.toml
diff --git a/cmd/dep/testdata/harness_tests/remove/unused/case1/initial/manifest.toml b/cmd/dep/testdata/harness_tests/remove/unused/case1/initial/Gopkg.toml
similarity index 100%
rename from cmd/dep/testdata/harness_tests/remove/unused/case1/initial/manifest.toml
rename to cmd/dep/testdata/harness_tests/remove/unused/case1/initial/Gopkg.toml
diff --git a/context.go b/context.go
index 54e60811e9..6005381559 100644
--- a/context.go
+++ b/context.go
@@ -48,7 +48,7 @@ func (c *Ctx) SourceManager() (*gps.SourceMgr, error) {
 // a project root.  If an absolute path is given, the search begins in that
 // directory.  If a relative or empty path is given, the search start is computed
 // from the current working directory.  The search stops when a file with the
-// name ManifestName (manifest.toml, by default) is located.
+// name ManifestName (Gopkg.toml, by default) is located.
 //
 // The Project contains the parsed manifest as well as a parsed lock file, if
 // present.  The import path is calculated as the remaining path segment
diff --git a/hack/validate-vendor.bash b/hack/validate-vendor.bash
index 6f4d2c458e..5c605239b7 100755
--- a/hack/validate-vendor.bash
+++ b/hack/validate-vendor.bash
@@ -21,7 +21,7 @@ fi
 VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
 
 IFS=$'\n'
-files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'manifest.toml' 'lock.toml' 'vendor/' || true) )
+files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'Gopkg.toml' 'Gopkg.lock' 'vendor/' || true) )
 unset IFS
 
 if [ ${#files[@]} -gt 0 ]; then
@@ -29,7 +29,7 @@ if [ ${#files[@]} -gt 0 ]; then
 	go build
 	./dep ensure
 	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- vendor manifest.toml lock.toml 2>/dev/null)"
+	diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
 			echo 'The result of ensure differs'
diff --git a/lock.go b/lock.go
index ed5dce03ee..aaa561daab 100644
--- a/lock.go
+++ b/lock.go
@@ -15,7 +15,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const LockName = "lock.toml"
+const LockName = "Gopkg.lock"
 
 type Lock struct {
 	Memo []byte
diff --git a/manifest.go b/manifest.go
index 072f110fef..b6187c583c 100644
--- a/manifest.go
+++ b/manifest.go
@@ -14,7 +14,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const ManifestName = "manifest.toml"
+const ManifestName = "Gopkg.toml"
 
 type Manifest struct {
 	Dependencies gps.ProjectConstraints
diff --git a/test/test.go b/test/test.go
index ba3a780145..31da596b8b 100644
--- a/test/test.go
+++ b/test/test.go
@@ -30,8 +30,8 @@ var (
 )
 
 const (
-	manifestName string = "manifest.toml"
-	lockName     string = "lock.toml"
+	manifestName string = "Gopkg.toml"
+	lockName     string = "Gopkg.lock"
 )
 
 func init() {
diff --git a/testdata/analyzer/manifest.toml b/testdata/analyzer/Gopkg.toml
similarity index 100%
rename from testdata/analyzer/manifest.toml
rename to testdata/analyzer/Gopkg.toml
diff --git a/testdata/rootfind/manifest.toml b/testdata/rootfind/Gopkg.toml
similarity index 100%
rename from testdata/rootfind/manifest.toml
rename to testdata/rootfind/Gopkg.toml