diff --git a/projects/certdehydrate-dane-rest-api/build b/projects/certdehydrate-dane-rest-api/build
index a31a92d..e32a830 100644
--- a/projects/certdehydrate-dane-rest-api/build
+++ b/projects/certdehydrate-dane-rest-api/build
@@ -13,7 +13,7 @@ mkdir -p $distdir
 # TODO: remove this once upstream q is fixed for current dns versions
 rm -rf $GOPATH/src/github.com/miekg/dns
 rm -rf $GOPATH/pkg/${GOOS}_${GOARCH}/github.com/miekg/dns.a
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/github.com,miekg,dns') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/godns') %]
 
 mkdir -p $GOPATH/src/github.com/namecoin
 tar -C $GOPATH/src/github.com/namecoin -xf [% project %]-[% c('version') %].tar.gz
diff --git a/projects/certdehydrate-dane-rest-api/config b/projects/certdehydrate-dane-rest-api/config
index f3d08c6..c2066b6 100644
--- a/projects/certdehydrate-dane-rest-api/config
+++ b/projects/certdehydrate-dane-rest-api/config
@@ -7,11 +7,11 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,crosssign
-    - github.com,namecoin,qlib
-    - github.com,namecoin,safetlsa
-    - gopkg.in,hlandau,easyconfig.v1
+    - godns
+    - gocrosssign
+    - goqlib
+    - gosafetlsa
+    - goeasyconfig
   cgo: 0
   build_go_lib_pre: |
     export CGO_ENABLED=[% c("var/cgo") %] 
@@ -20,13 +20,13 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,crosssign
-    project: github.com,namecoin,crosssign
-  - name: github.com,namecoin,qlib
-    project: github.com,namecoin,qlib
-  - name: github.com,namecoin,safetlsa
-    project: github.com,namecoin,safetlsa
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: godns
+    project: godns
+  - name: gocrosssign
+    project: gocrosssign
+  - name: goqlib
+    project: goqlib
+  - name: gosafetlsa
+    project: gosafetlsa
diff --git a/projects/dnssec-hsts-native/config b/projects/dnssec-hsts-native/config
index 39d2fa6..4cbe836 100644
--- a/projects/dnssec-hsts-native/config
+++ b/projects/dnssec-hsts-native/config
@@ -7,9 +7,9 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,qlib
-    - gopkg.in,hlandau,easyconfig.v1
+    - godns
+    - goqlib
+    - goeasyconfig
   cgo: 0
   build_go_lib_pre: |
     export CGO_ENABLED=[% c("var/cgo") %] 
@@ -18,9 +18,9 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,qlib
-    project: github.com,namecoin,qlib
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: godns
+    project: godns
+  - name: goqlib
+    project: goqlib
diff --git a/projects/github.com,shiena,ansicolor/config b/projects/goansicolor/config
similarity index 100%
rename from projects/github.com,shiena,ansicolor/config
rename to projects/goansicolor/config
diff --git a/projects/github.com,hlandauf,btcjson/config b/projects/gobtcjson/config
similarity index 100%
rename from projects/github.com,hlandauf,btcjson/config
rename to projects/gobtcjson/config
diff --git a/projects/github.com,hlandau,buildinfo/config b/projects/gobuildinfo/config
similarity index 89%
rename from projects/github.com,hlandau,buildinfo/config
rename to projects/gobuildinfo/config
index 7d0547c..3b3d1b1 100644
--- a/projects/github.com,hlandau,buildinfo/config
+++ b/projects/gobuildinfo/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/buildinfo
   go_lib_deps:
-    - gopkg.in,hlandau,easyconfig.v1
+    - goeasyconfig
   build_go_lib_pre: |
     [% IF c("var/linux") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -31,5 +31,5 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: goeasyconfig
+    project: goeasyconfig
diff --git a/projects/gopkg.in,hlandau,configurable.v1/config b/projects/goconfigurable/config
similarity index 100%
rename from projects/gopkg.in,hlandau,configurable.v1/config
rename to projects/goconfigurable/config
diff --git a/projects/github.com,namecoin,crosssign/config b/projects/gocrosssign/config
similarity index 100%
rename from projects/github.com,namecoin,crosssign/config
rename to projects/gocrosssign/config
diff --git a/projects/github.com,namecoin,crosssignnameconstraint/config b/projects/gocrosssignnameconstraint/config
similarity index 100%
rename from projects/github.com,namecoin,crosssignnameconstraint/config
rename to projects/gocrosssignnameconstraint/config
diff --git a/projects/github.com,hlandau,degoutils/config b/projects/godegoutils/config
similarity index 86%
rename from projects/github.com,hlandau,degoutils/config
rename to projects/godegoutils/config
index 2e84354..e406a42 100644
--- a/projects/github.com,hlandau,degoutils/config
+++ b/projects/godegoutils/config
@@ -12,11 +12,11 @@ var:
   go_lib_install:
     - github.com/hlandau/degoutils/net
   go_lib_deps:
-    - golang.org,x,net
+    - goxnet
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,net
-    project: golang.org,x,net
+  - name: goxnet
+    project: goxnet
diff --git a/projects/github.com,hlandau,dexlogconfig/config b/projects/godexlogconfig/config
similarity index 65%
rename from projects/github.com,hlandau,dexlogconfig/config
rename to projects/godexlogconfig/config
index af3e43d..c9de92e 100644
--- a/projects/github.com,hlandau,dexlogconfig/config
+++ b/projects/godexlogconfig/config
@@ -10,10 +10,10 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/dexlogconfig
   go_lib_deps:
-    - github.com,hlandau,xlog
-    - gopkg.in,hlandau,easyconfig.v1
-    - github.com,coreos,go-systemd
-    - github.com,hlandau,buildinfo
+    - gobuildinfo
+    - goeasyconfig
+    - gosystemd
+    - goxlog
   build_go_lib_pre: |
     [% IF c("var/linux") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -28,9 +28,9 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,hlandau,xlog
-        - gopkg.in,hlandau,easyconfig.v1
-        - github.com,hlandau,buildinfo
+        - gobuildinfo
+        - goeasyconfig
+        - goxlog
 
 input_files:
   - project: container-image
@@ -42,12 +42,12 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: github.com,coreos,go-systemd
-    project: github.com,coreos,go-systemd
+  - name: goxlog
+    project: goxlog
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: gosystemd
+    project: gosystemd
     enable: '[% ! c("var/windows") %]'
-  - name: github.com,hlandau,buildinfo
-    project: github.com,hlandau,buildinfo
+  - name: gobuildinfo
+    project: gobuildinfo
diff --git a/projects/github.com,miekg,dns/config b/projects/godns/config
similarity index 62%
rename from projects/github.com,miekg,dns/config
rename to projects/godns/config
index 858b482..6e6c09d 100644
--- a/projects/github.com,miekg,dns/config
+++ b/projects/godns/config
@@ -10,25 +10,25 @@ var:
     use_container: 1
   go_lib: github.com/miekg/dns
   go_lib_deps:
-    - golang.org,x,crypto,ed25519
-    - golang.org,x,net,ip
-    - golang.org,x,sys,unix
+    - goxcryptoed25519
+    - goxnetip
+    - goxsysunix
 
 targets:
   windows:
     var:
       go_lib_deps:
-        - golang.org,x,crypto,ed25519
+        - goxcryptoed25519
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,crypto,ed25519
-    project: golang.org,x,crypto,ed25519
-  - name: golang.org,x,net,ip
-    project: golang.org,x,net,ip
+  - name: goxcryptoed25519
+    project: goxcryptoed25519
+  - name: goxnetip
+    project: goxnetip
     enable: '[% ! c("var/windows") %]'
-  - name: golang.org,x,sys,unix
-    project: golang.org,x,sys,unix
+  - name: goxsysunix
+    project: goxsysunix
     enable: '[% ! c("var/windows") %]'
diff --git a/projects/goeasyconfig/config b/projects/goeasyconfig/config
new file mode 100644
index 0000000..40530cc
--- /dev/null
+++ b/projects/goeasyconfig/config
@@ -0,0 +1,35 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/hlandau/easyconfig.git
+git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/easyconfig.v1"} %]'
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+build: '[% c("projects/go/var/build_go_lib") %]'
+
+var:
+  container:
+    use_container: 1
+  go_lib: gopkg.in/hlandau/easyconfig.v1
+  go_lib_deps:
+    - goconfigurable
+    - gosvcutils
+    - gotoml
+    - gopflag
+    - gokingpin
+  go_lib_install:
+    - gopkg.in/hlandau/easyconfig.v1
+    - gopkg.in/hlandau/easyconfig.v1/cflag
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
+  - name: goconfigurable
+    project: goconfigurable
+  - name: gosvcutils
+    project: gosvcutils
+  - name: gotoml
+    project: gotoml
+  - name: gopflag
+    project: gopflag
+  - name: gokingpin
+    project: gokingpin
diff --git a/projects/github.com,golang,groupcache/config b/projects/gogroupcache/config
similarity index 100%
rename from projects/github.com,golang,groupcache/config
rename to projects/gogroupcache/config
diff --git a/projects/github.com,mattn,go-isatty/config b/projects/goisatty/config
similarity index 84%
rename from projects/github.com,mattn,go-isatty/config
rename to projects/goisatty/config
index 68fbbd1..a75d7cf 100644
--- a/projects/github.com,mattn,go-isatty/config
+++ b/projects/goisatty/config
@@ -14,12 +14,12 @@ targets:
   linux:
     var:
       go_lib_deps:
-        - golang.org,x,sys,unix
+        - goxsysunix
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: golang.org,x,sys,unix
-    project: golang.org,x,sys,unix
+  - name: goxsysunix
+    project: goxsysunix
     enable: '[% c("var/linux") %]'
diff --git a/projects/gopkg.in,alecthomas,kingpin.v2/config b/projects/gokingpin/config
similarity index 66%
rename from projects/gopkg.in,alecthomas,kingpin.v2/config
rename to projects/gokingpin/config
index 83164d7..cbf229d 100644
--- a/projects/gopkg.in,alecthomas,kingpin.v2/config
+++ b/projects/gokingpin/config
@@ -10,14 +10,14 @@ var:
     use_container: 1
   go_lib: gopkg.in/alecthomas/kingpin.v2
   go_lib_deps: 
-    - github.com,alecthomas,template
-    - github.com,alecthomas,units
+    - gotemplate
+    - gounits
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,alecthomas,template
-    project: github.com,alecthomas,template
-  - name: github.com,alecthomas,units
-    project: github.com,alecthomas,units
+  - name: gotemplate
+    project: gotemplate
+  - name: gounits
+    project: gounits
diff --git a/projects/gopkg.in,hlandau,madns.v1/config b/projects/gomadns/config
similarity index 77%
rename from projects/gopkg.in,hlandau,madns.v1/config
rename to projects/gomadns/config
index e6ea2aa..892c987 100644
--- a/projects/gopkg.in,hlandau,madns.v1/config
+++ b/projects/gomadns/config
@@ -10,9 +10,9 @@ var:
     use_container: 1
   go_lib: gopkg.in/hlandau/madns.v1
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,hlandau,buildinfo
-    - github.com,hlandau,xlog
+    - godns
+    - gobuildinfo
+    - goxlog
   go_lib_install:
     - gopkg.in/hlandau/madns.v1
     - gopkg.in/hlandau/madns.v1/merr
@@ -36,9 +36,9 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,hlandau,buildinfo
-    project: github.com,hlandau,buildinfo
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
+  - name: godns
+    project: godns
+  - name: gobuildinfo
+    project: gobuildinfo
+  - name: goxlog
+    project: goxlog
diff --git a/projects/github.com,hlandau,ncbtcjsontypes/config b/projects/goncbtcjsontypes/config
similarity index 80%
rename from projects/github.com,hlandau,ncbtcjsontypes/config
rename to projects/goncbtcjsontypes/config
index 1ac8366..3141660 100644
--- a/projects/github.com,hlandau,ncbtcjsontypes/config
+++ b/projects/goncbtcjsontypes/config
@@ -10,11 +10,11 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/ncbtcjsontypes
   go_lib_deps:
-    - github.com,hlandauf,btcjson
+    - gobtcjson
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,hlandauf,btcjson
-    project: github.com,hlandauf,btcjson
+  - name: gobtcjson
+    project: gobtcjson
diff --git a/projects/github.com,ogier,pflag/config b/projects/gopflag/config
similarity index 100%
rename from projects/github.com,ogier,pflag/config
rename to projects/gopflag/config
diff --git a/projects/github.com,miekg,pkcs11/config b/projects/gopkcs11/config
similarity index 100%
rename from projects/github.com,miekg,pkcs11/config
rename to projects/gopkcs11/config
diff --git a/projects/github.com,namecoin,pkcs11mod/config b/projects/gopkcs11mod/config
similarity index 94%
rename from projects/github.com,namecoin,pkcs11mod/config
rename to projects/gopkcs11mod/config
index f9334db..fe41551 100644
--- a/projects/github.com,namecoin,pkcs11mod/config
+++ b/projects/gopkcs11mod/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/pkcs11mod
   go_lib_deps:
-    - github.com,miekg,pkcs11
+    - gopkcs11
   cgo: 1
   build_go_lib_pre: |
     [% IF c("var/cgo") %]
@@ -52,5 +52,5 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,miekg,pkcs11
-    project: github.com,miekg,pkcs11
+  - name: gopkcs11
+    project: gopkcs11
diff --git a/projects/gopkg.in,hlandau,easyconfig.v1/config b/projects/gopkg.in,hlandau,easyconfig.v1/config
deleted file mode 100644
index 0d6145c..0000000
--- a/projects/gopkg.in,hlandau,easyconfig.v1/config
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '[% c("abbrev") %]'
-git_url:  https://github.com/hlandau/easyconfig.git
-git_hash: '[% config.var_p.id.${"gopkg.in/hlandau/easyconfig.v1"} %]'
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-build: '[% c("projects/go/var/build_go_lib") %]'
-
-var:
-  container:
-    use_container: 1
-  go_lib: gopkg.in/hlandau/easyconfig.v1
-  go_lib_deps:
-    - gopkg.in,hlandau,configurable.v1
-    - gopkg.in,hlandau,svcutils.v1
-    - github.com,BurntSushi,toml
-    - github.com,ogier,pflag
-    - gopkg.in,alecthomas,kingpin.v2
-  go_lib_install:
-    - gopkg.in/hlandau/easyconfig.v1
-    - gopkg.in/hlandau/easyconfig.v1/cflag
-
-input_files:
-  - project: container-image
-  - name: go
-    project: go
-  - name: gopkg.in,hlandau,configurable.v1
-    project: gopkg.in,hlandau,configurable.v1
-  - name: gopkg.in,hlandau,svcutils.v1
-    project: gopkg.in,hlandau,svcutils.v1
-  - name: github.com,BurntSushi,toml
-    project: github.com,BurntSushi,toml
-  - name: github.com,ogier,pflag
-    project: github.com,ogier,pflag
-  - name: gopkg.in,alecthomas,kingpin.v2
-    project: gopkg.in,alecthomas,kingpin.v2
diff --git a/projects/github.com,kr,pretty/config b/projects/gopretty/config
similarity index 83%
rename from projects/github.com,kr,pretty/config
rename to projects/gopretty/config
index 957b657..5d62923 100644
--- a/projects/github.com,kr,pretty/config
+++ b/projects/gopretty/config
@@ -10,11 +10,11 @@ var:
     use_container: 1
   go_lib: github.com/kr/pretty
   go_lib_deps:
-    - github.com,kr,text
+    - gotext
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,kr,text
-    project: github.com,kr,text
+  - name: gotext
+    project: gotext
diff --git a/projects/github.com,namecoin,qlib/config b/projects/goqlib/config
similarity index 83%
rename from projects/github.com,namecoin,qlib/config
rename to projects/goqlib/config
index 9387a8d..b2b4f2a 100644
--- a/projects/github.com,namecoin,qlib/config
+++ b/projects/goqlib/config
@@ -10,7 +10,7 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/qlib
   go_lib_deps:
-    - github.com,miekg,dns
+    - godns
   build_go_lib_pre: |
     export CGO_ENABLED=0
 
@@ -18,5 +18,5 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
+  - name: godns
+    project: godns
diff --git a/projects/github.com,namecoin,safetlsa/config b/projects/gosafetlsa/config
similarity index 74%
rename from projects/github.com,namecoin,safetlsa/config
rename to projects/gosafetlsa/config
index 429cd34..aa14581 100644
--- a/projects/github.com,namecoin,safetlsa/config
+++ b/projects/gosafetlsa/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/safetlsa
   go_lib_deps:
-    - github.com,miekg,dns
-    - github.com,namecoin,x509-signature-splice
+    - godns
+    - gox509signaturesplice
     - ncdns
   build_go_lib_pre: |
     export CGO_ENABLED=0
@@ -20,10 +20,10 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,x509-signature-splice
-    project: github.com,namecoin,x509-signature-splice
+  - name: godns
+    project: godns
+  - name: gox509signaturesplice
+    project: gox509signaturesplice
   - name: ncdns
     project: ncdns
     # Build ncdns as a library, not an executable.
diff --git a/projects/gopkg.in,hlandau,service.v2/config b/projects/goservice/config
similarity index 80%
rename from projects/gopkg.in,hlandau,service.v2/config
rename to projects/goservice/config
index 00477d7..5c50a94 100644
--- a/projects/gopkg.in,hlandau,service.v2/config
+++ b/projects/goservice/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: gopkg.in/hlandau/service.v2
   go_lib_deps:
-    - gopkg.in,hlandau,svcutils.v1
-    - gopkg.in,hlandau,easyconfig.v1
+    - gosvcutils
+    - goeasyconfig
   build_go_lib_pre: |
     [% IF c("var/cgo") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -50,9 +50,9 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,btcsuite,winsvc
-        - gopkg.in,hlandau,svcutils.v1
-        - gopkg.in,hlandau,easyconfig.v1
+        - gowinsvc
+        - gosvcutils
+        - goeasyconfig
       cgo: 0
 
 input_files:
@@ -65,10 +65,10 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,btcsuite,winsvc
-    project: github.com,btcsuite,winsvc
+  - name: gowinsvc
+    project: gowinsvc
     enable: '[% c("var/windows") %]'
-  - name: gopkg.in,hlandau,svcutils.v1
-    project: gopkg.in,hlandau,svcutils.v1
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: gosvcutils
+    project: gosvcutils
+  - name: goeasyconfig
+    project: goeasyconfig
diff --git a/projects/gopkg.in,hlandau,svcutils.v1/config b/projects/gosvcutils/config
similarity index 100%
rename from projects/gopkg.in,hlandau,svcutils.v1/config
rename to projects/gosvcutils/config
diff --git a/projects/github.com,coreos,go-systemd/config b/projects/gosystemd/config
similarity index 100%
rename from projects/github.com,coreos,go-systemd/config
rename to projects/gosystemd/config
diff --git a/projects/github.com,alecthomas,template/config b/projects/gotemplate/config
similarity index 100%
rename from projects/github.com,alecthomas,template/config
rename to projects/gotemplate/config
diff --git a/projects/github.com,kr,text/config b/projects/gotext/config
similarity index 100%
rename from projects/github.com,kr,text/config
rename to projects/gotext/config
diff --git a/projects/github.com,namecoin,tlsrestrictnss/config b/projects/gotlsrestrictnss/config
similarity index 56%
rename from projects/github.com,namecoin,tlsrestrictnss/config
rename to projects/gotlsrestrictnss/config
index c60873e..91e751a 100644
--- a/projects/github.com,namecoin,tlsrestrictnss/config
+++ b/projects/gotlsrestrictnss/config
@@ -10,8 +10,8 @@ var:
     use_container: 1
   go_lib: github.com/namecoin/tlsrestrictnss
   go_lib_deps:
-    - github.com,hlandau,xlog
-    - github.com,namecoin,crosssignnameconstraint
+    - goxlog
+    - gocrosssignnameconstraint
   go_lib_install:
     - github.com/namecoin/tlsrestrictnss
     - github.com/namecoin/tlsrestrictnss/tlsrestrictnsssync
@@ -22,22 +22,22 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,hlandau,xlog
-        - github.com,namecoin,crosssignnameconstraint
-        - gopkg.in,hlandau,easyconfig.v1
-        - golang.org,x,sys
+        - goxlog
+        - gocrosssignnameconstraint
+        - goeasyconfig
+        - goxsys
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: github.com,namecoin,crosssignnameconstraint
-    project: github.com,namecoin,crosssignnameconstraint
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
+  - name: goxlog
+    project: goxlog
+  - name: gocrosssignnameconstraint
+    project: gocrosssignnameconstraint
+  - name: goeasyconfig
+    project: goeasyconfig
     enable: '[% c("var/windows") %]'
-  - name: golang.org,x,sys
-    project: golang.org,x,sys
+  - name: goxsys
+    project: goxsys
     enable: '[% c("var/windows") %]'
diff --git a/projects/github.com,BurntSushi,toml/config b/projects/gotoml/config
similarity index 100%
rename from projects/github.com,BurntSushi,toml/config
rename to projects/gotoml/config
diff --git a/projects/github.com,alecthomas,units/config b/projects/gounits/config
similarity index 100%
rename from projects/github.com,alecthomas,units/config
rename to projects/gounits/config
diff --git a/projects/github.com,btcsuite,winsvc/config b/projects/gowinsvc/config
similarity index 100%
rename from projects/github.com,btcsuite,winsvc/config
rename to projects/gowinsvc/config
diff --git a/projects/github.com,namecoin,x509-signature-splice/config b/projects/gox509signaturesplice/config
similarity index 100%
rename from projects/github.com,namecoin,x509-signature-splice/config
rename to projects/gox509signaturesplice/config
diff --git a/projects/golang.org,x,crypto b/projects/goxcrypto
similarity index 100%
rename from projects/golang.org,x,crypto
rename to projects/goxcrypto
diff --git a/projects/golang.org,x,crypto,ed25519/config b/projects/goxcryptoed25519/config
similarity index 78%
rename from projects/golang.org,x,crypto,ed25519/config
rename to projects/goxcryptoed25519/config
index 81f221c..d065de1 100644
--- a/projects/golang.org,x,crypto,ed25519/config
+++ b/projects/goxcryptoed25519/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,crypto", "git_url") %]'
-git_hash: '[% pc("golang.org,x,crypto", "git_hash") %]'
+git_url: '[% pc("goxcrypto", "git_url") %]'
+git_hash: '[% pc("goxcrypto", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/github.com,hlandau,xlog/config b/projects/goxlog/config
similarity index 66%
rename from projects/github.com,hlandau,xlog/config
rename to projects/goxlog/config
index d33f570..8991f04 100644
--- a/projects/github.com,hlandau,xlog/config
+++ b/projects/goxlog/config
@@ -10,14 +10,14 @@ var:
     use_container: 1
   go_lib: github.com/hlandau/xlog
   go_lib_deps:
-    - github.com,mattn,go-isatty
-    - github.com,shiena,ansicolor
+    - goisatty
+    - goansicolor
 
 input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,mattn,go-isatty
-    project: github.com,mattn,go-isatty
-  - name: github.com,shiena,ansicolor
-    project: github.com,shiena,ansicolor
+  - name: goisatty
+    project: goisatty
+  - name: goansicolor
+    project: goansicolor
diff --git a/projects/golang.org,x,net b/projects/goxnet
similarity index 100%
rename from projects/golang.org,x,net
rename to projects/goxnet
diff --git a/projects/golang.org,x,net,ip/config b/projects/goxnetip/config
similarity index 80%
rename from projects/golang.org,x,net,ip/config
rename to projects/goxnetip/config
index 1eab197..67950f4 100644
--- a/projects/golang.org,x,net,ip/config
+++ b/projects/goxnetip/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,net", "git_url") %]'
-git_hash: '[% pc("golang.org,x,net", "git_hash") %]'
+git_url: '[% pc("goxnet", "git_url") %]'
+git_hash: '[% pc("goxnet", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/golang.org,x,sys b/projects/goxsys
similarity index 100%
rename from projects/golang.org,x,sys
rename to projects/goxsys
diff --git a/projects/golang.org,x,sys,unix/config b/projects/goxsysunix/config
similarity index 78%
rename from projects/golang.org,x,sys,unix/config
rename to projects/goxsysunix/config
index 1453a27..a2fe03c 100644
--- a/projects/golang.org,x,sys,unix/config
+++ b/projects/goxsysunix/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url: '[% pc("golang.org,x,sys", "git_url") %]'
-git_hash: '[% pc("golang.org,x,sys", "git_hash") %]'
+git_url: '[% pc("goxsys", "git_url") %]'
+git_hash: '[% pc("goxsys", "git_hash") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 build: '[% c("projects/go/var/build_go_lib") %]'
diff --git a/projects/ncdns/config b/projects/ncdns/config
index 9ab5baf..41d5185 100644
--- a/projects/ncdns/config
+++ b/projects/ncdns/config
@@ -10,19 +10,19 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,golang,groupcache
-    - github.com,hlandau,degoutils
-    - github.com,hlandau,dexlogconfig
-    - github.com,hlandau,ncbtcjsontypes
-    - github.com,hlandauf,btcjson
-    - github.com,kr,pretty
-    - github.com,miekg,dns
-    - github.com,namecoin,tlsrestrictnss
-    - github.com,namecoin,x509-signature-splice
-    - gopkg.in,hlandau,madns.v1
-    - gopkg.in,hlandau,easyconfig.v1
-    - gopkg.in,hlandau,service.v2
-    - golang.org,x,net
+    - gogroupcache
+    - godegoutils
+    - godexlogconfig
+    - goncbtcjsontypes
+    - gobtcjson
+    - gopretty
+    - godns
+    - gotlsrestrictnss
+    - gox509signaturesplice
+    - gomadns
+    - goeasyconfig
+    - goservice
+    - goxnet
   go_lib_no_output: 1
 
 targets:
@@ -43,20 +43,20 @@ targets:
   windows:
     var:
       go_lib_deps:
-        - github.com,golang,groupcache
-        - github.com,hlandau,degoutils
-        - github.com,hlandau,dexlogconfig
-        - github.com,hlandau,ncbtcjsontypes
-        - github.com,hlandauf,btcjson
-        - github.com,kr,pretty
-        - github.com,miekg,dns
-        - github.com,namecoin,tlsrestrictnss
-        - github.com,namecoin,x509-signature-splice
-        - gopkg.in,hlandau,madns.v1
-        - gopkg.in,hlandau,easyconfig.v1
-        - gopkg.in,hlandau,service.v2
-        - golang.org,x,net
-        - golang.org,x,sys
+        - gogroupcache
+        - godegoutils
+        - godexlogconfig
+        - goncbtcjsontypes
+        - gobtcjson
+        - gopretty
+        - godns
+        - gotlsrestrictnss
+        - gox509signaturesplice
+        - gomadns
+        - goeasyconfig
+        - goservice
+        - goxnet
+        - goxsys
       cgo: 0
 
 input_files:
@@ -69,34 +69,34 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,hlandau,xlog
-    project: github.com,hlandau,xlog
-  - name: github.com,hlandau,dexlogconfig
-    project: github.com,hlandau,dexlogconfig
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: gopkg.in,hlandau,service.v2
-    project: gopkg.in,hlandau,service.v2
-  - name: github.com,golang,groupcache
-    project: github.com,golang,groupcache
-  - name: github.com,hlandau,ncbtcjsontypes
-    project: github.com,hlandau,ncbtcjsontypes
-  - name: github.com,hlandauf,btcjson
-    project: github.com,hlandauf,btcjson
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: github.com,namecoin,tlsrestrictnss
-    project: github.com,namecoin,tlsrestrictnss
-  - name: github.com,namecoin,x509-signature-splice
-    project: github.com,namecoin,x509-signature-splice
-  - name: gopkg.in,hlandau,madns.v1
-    project: gopkg.in,hlandau,madns.v1
-  - name: github.com,kr,pretty
-    project: github.com,kr,pretty
-  - name: github.com,hlandau,degoutils
-    project: github.com,hlandau,degoutils
-  - name: golang.org,x,net
-    project: golang.org,x,net
-  - name: golang.org,x,sys
-    project: golang.org,x,sys
+  - name: goxlog
+    project: goxlog
+  - name: godexlogconfig
+    project: godexlogconfig
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: goservice
+    project: goservice
+  - name: gogroupcache
+    project: gogroupcache
+  - name: goncbtcjsontypes
+    project: goncbtcjsontypes
+  - name: gobtcjson
+    project: gobtcjson
+  - name: godns
+    project: godns
+  - name: gotlsrestrictnss
+    project: gotlsrestrictnss
+  - name: gox509signaturesplice
+    project: gox509signaturesplice
+  - name: gomadns
+    project: gomadns
+  - name: gopretty
+    project: gopretty
+  - name: godegoutils
+    project: godegoutils
+  - name: goxnet
+    project: goxnet
+  - name: goxsys
+    project: goxsys
     enable: '[% c("var/windows") %]'
diff --git a/projects/ncp11/config b/projects/ncp11/config
index dc95e67..b981fae 100644
--- a/projects/ncp11/config
+++ b/projects/ncp11/config
@@ -7,8 +7,8 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,pkcs11
-    - github.com,namecoin,pkcs11mod
+    - gopkcs11
+    - gopkcs11mod
   cgo: 1
 
 input_files:
@@ -21,7 +21,7 @@ input_files:
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") && c("var/cgo") %]'
-  - name: github.com,miekg,pkcs11
-    project: github.com,miekg,pkcs11
-  - name: github.com,namecoin,pkcs11mod
-    project: github.com,namecoin,pkcs11mod
+  - name: gopkcs11
+    project: gopkcs11
+  - name: gopkcs11mod
+    project: gopkcs11mod
diff --git a/projects/ncprop279/config b/projects/ncprop279/config
index 7ba95c1..37f5631 100644
--- a/projects/ncprop279/config
+++ b/projects/ncprop279/config
@@ -7,9 +7,9 @@ var:
   container:
     use_container: 1
   go_lib_deps:
-    - github.com,miekg,dns
-    - gopkg.in,hlandau,easyconfig.v1
-    - gopkg.in,hlandau,madns.v1
+    - godns
+    - goeasyconfig
+    - gomadns
     - ncdns
   cgo: 0
   build_go_lib_pre: |
@@ -19,12 +19,12 @@ input_files:
   - project: container-image
   - name: go
     project: go
-  - name: github.com,miekg,dns
-    project: github.com,miekg,dns
-  - name: gopkg.in,hlandau,easyconfig.v1
-    project: gopkg.in,hlandau,easyconfig.v1
-  - name: gopkg.in,hlandau,madns.v1
-    project: gopkg.in,hlandau,madns.v1
+  - name: godns
+    project: godns
+  - name: goeasyconfig
+    project: goeasyconfig
+  - name: gomadns
+    project: gomadns
   - name: ncdns
     project: ncdns
     # Build ncdns as a library, not an executable.