diff --git a/.appveyor.yml b/.appveyor.yml
index c6b1cc2..6e8e251 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,7 +2,7 @@ version: "{build}"
 platform: x64
 image: Visual Studio 2017
 
-clone_folder: c:\gopath\src\gopkg.in\bblfsh\client-go.v3
+clone_folder: c:\gopath\src\github.com\bblfsh\go-client
 
 environment:
   GOPATH: c:\gopath
diff --git a/.travis.yml b/.travis.yml
index 12f26e9..59c97dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-go_import_path: gopkg.in/bblfsh/client-go.v3
+go_import_path: github.com/bblfsh/go-client
 
 env:
   - BBLFSHD_VERSION=v2.9.1 BBLFSH_PYTHON_VERSION=v2.3.0
diff --git a/Makefile b/Makefile
index 7822e2e..2128a71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Package configuration
-PROJECT = client-go
+PROJECT = go-client
 
 # Including ci Makefile
 CI_REPOSITORY ?= https://github.com/src-d/ci.git
diff --git a/README.md b/README.md
index b3548f9..a8a342f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# client-go [![GoDoc](https://godoc.org/gopkg.in/bblfsh/client-go.v3?status.svg)](https://godoc.org/gopkg.in/bblfsh/client-go.v3) [![Build Status](https://travis-ci.org/bblfsh/client-go.svg?branch=master)](https://travis-ci.org/bblfsh/client-go) [![Build status](https://ci.appveyor.com/api/projects/status/github/bblfsh/client-go?svg=true)](https://ci.appveyor.com/project/mcuadros/client-go) [![codecov](https://codecov.io/gh/bblfsh/client-go/branch/master/graph/badge.svg)](https://codecov.io/gh/bblfsh/client-go)
+# go-client [![GoDoc](https://godoc.org/github.com/bblfsh/go-client?status.svg)](https://godoc.org/github.com/bblfsh/go-client) [![Build Status](https://travis-ci.org/bblfsh/go-client.svg?branch=master)](https://travis-ci.org/bblfsh/go-client) [![Build status](https://ci.appveyor.com/api/projects/status/github/bblfsh/go-client?svg=true)](https://ci.appveyor.com/project/mcuadros/go-client) [![codecov](https://codecov.io/gh/bblfsh/go-client/branch/master/graph/badge.svg)](https://codecov.io/gh/bblfsh/go-client)
 
 [Babelfish](https://doc.bblf.sh) Go client library provides functionality to both
 connecting to the Babelfish server for parsing code
@@ -7,16 +7,16 @@ and for analysing UASTs with the functionality provided by [libuast](https://git
 
 ## Installation
 
-The recommended way to install *client-go* is:
+The recommended way to install *go-client* is:
 
 ```sh
-go get -u gopkg.in/bblfsh/client-go.v3/...
+go get -u github.com/bblfsh/go-client/...
 ```
 
 ## Example
 ### CLI
 
-Although *client-go* is a library, this codebase also includes an example of `bblfsh-cli` application at [`./cmd/bblfsh-cli`](/cmd/bblfsh-cli). When [installed](#Installation), it allows to parse a single file, query it with XPath and print the resulting UAST structure immediately.
+Although *go-client* is a library, this codebase also includes an example of `bblfsh-cli` application at [`./cmd/bblfsh-cli`](/cmd/bblfsh-cli). When [installed](#Installation), it allows to parse a single file, query it with XPath and print the resulting UAST structure immediately.
 See `$ bblfsh-cli -h` for list of all available CLI options.
 
 ### Code
@@ -32,8 +32,8 @@ package main
 import (
 	"fmt"
 
-	"gopkg.in/bblfsh/client-go.v3"
-	"gopkg.in/bblfsh/client-go.v3/tools"
+	"github.com/bblfsh/go-client"
+	"github.com/bblfsh/go-client/tools"
 
 	"gopkg.in/bblfsh/sdk.v2/uast/nodes"
 	"gopkg.in/bblfsh/sdk.v2/uast/yaml"
diff --git a/cmd/bblfsh-cli/main.go b/cmd/bblfsh-cli/main.go
index 478d86c..c80d6b4 100644
--- a/cmd/bblfsh-cli/main.go
+++ b/cmd/bblfsh-cli/main.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/jessevdk/go-flags"
 
-	"gopkg.in/bblfsh/client-go.v3"
-	"gopkg.in/bblfsh/client-go.v3/tools"
+	"github.com/bblfsh/go-client"
+	"github.com/bblfsh/go-client/tools"
 	"gopkg.in/bblfsh/sdk.v2/uast/nodes"
 	"gopkg.in/bblfsh/sdk.v2/uast/nodes/nodesproto"
 	"gopkg.in/bblfsh/sdk.v2/uast/yaml"
diff --git a/doc.go b/doc.go
index e13806d..c1a0eca 100644
--- a/doc.go
+++ b/doc.go
@@ -1,4 +1,4 @@
 // Babelfish (https://doc.bblf.sh) Go client library provides functionality to
 // both connect to the bblfsh daemon to parse code (obtaining an UAST as a
 // result) and to analyse UASTs with the functionality provided by libuast.
-package bblfsh // import "gopkg.in/bblfsh/client-go.v3"
+package bblfsh // import "github.com/bblfsh/go-client"