diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5462d40..ac56cee 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,7 +1,7 @@
-project_name: rbheapleak
+project_name: rbheap
 builds:
   - main: main.go
-    binary: rbheapleak
+    binary: rbheap
     flags: -a
     env:
       - CGO_ENABLED=0
diff --git a/Makefile b/Makefile
index d4add73..37f4d79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DEV_DEPS = github.com/mailru/easyjson/...
 
-NAME = rbheapleak
+NAME = rbheap
 BINARY = bin/${NAME}
 VERSION ?= $(shell cat VERSION)
 
@@ -31,11 +31,11 @@ clean:
 
 .PHONY: test
 test:
-	go test
+	go test ./...
 
 .PHONY: generate
 generate: dev-deps
-	go generate
+	go generate ./...
 
 #
 # EasyJSON targets.
diff --git a/cmd/leak.go b/cmd/leak.go
index 46887ed..333641e 100644
--- a/cmd/leak.go
+++ b/cmd/leak.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/jimeh/rbheapleak/leak"
+	"github.com/jimeh/rbheap/leak"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
index faf3e37..b3c3c34 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -18,8 +18,8 @@ type BuildInfo struct {
 }
 
 var rootCmd = &cobra.Command{
-	Use:           "rbheapleak",
-	Short:         "rbheapleak analyzes ObjectSpace dumps from Ruby processes.",
+	Use:           "rbheap",
+	Short:         "rbheap analyzes ObjectSpace dumps from Ruby processes.",
 	SilenceUsage:  true,
 	SilenceErrors: true,
 }
diff --git a/leak/finder.go b/leak/finder.go
index 47f39a9..3fc1f6a 100644
--- a/leak/finder.go
+++ b/leak/finder.go
@@ -3,7 +3,7 @@ package leak
 import (
 	"fmt"
 
-	"github.com/jimeh/rbheapleak/obj"
+	"github.com/jimeh/rbheap/obj"
 )
 
 func NewFinder(file1, file2, file3 string) *Finder {
diff --git a/main.go b/main.go
index 33dea2f..aead197 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/jimeh/rbheapleak/cmd"
+	"github.com/jimeh/rbheap/cmd"
 )
 
 var (
diff --git a/obj/object_easyjson.go b/obj/object_easyjson.go
index c939380..02a218e 100644
--- a/obj/object_easyjson.go
+++ b/obj/object_easyjson.go
@@ -4,7 +4,6 @@ package obj
 
 import (
 	json "encoding/json"
-
 	easyjson "github.com/mailru/easyjson"
 	jlexer "github.com/mailru/easyjson/jlexer"
 	jwriter "github.com/mailru/easyjson/jwriter"
@@ -18,7 +17,7 @@ var (
 	_ easyjson.Marshaler
 )
 
-func easyjsonE44bcf2dDecodeGithubComJimehRbheapleak(in *jlexer.Lexer, out *Object) {
+func easyjsonE44bcf2dDecodeGithubComJimehRbheapObj(in *jlexer.Lexer, out *Object) {
 	isTopLevel := in.IsStart()
 	if in.IsNull() {
 		if isTopLevel {
@@ -51,7 +50,7 @@ func easyjsonE44bcf2dDecodeGithubComJimehRbheapleak(in *jlexer.Lexer, out *Objec
 		in.Consumed()
 	}
 }
-func easyjsonE44bcf2dEncodeGithubComJimehRbheapleak(out *jwriter.Writer, in Object) {
+func easyjsonE44bcf2dEncodeGithubComJimehRbheapObj(out *jwriter.Writer, in Object) {
 	out.RawByte('{')
 	first := true
 	_ = first
@@ -81,23 +80,23 @@ func easyjsonE44bcf2dEncodeGithubComJimehRbheapleak(out *jwriter.Writer, in Obje
 // MarshalJSON supports json.Marshaler interface
 func (v Object) MarshalJSON() ([]byte, error) {
 	w := jwriter.Writer{}
-	easyjsonE44bcf2dEncodeGithubComJimehRbheapleak(&w, v)
+	easyjsonE44bcf2dEncodeGithubComJimehRbheapObj(&w, v)
 	return w.Buffer.BuildBytes(), w.Error
 }
 
 // MarshalEasyJSON supports easyjson.Marshaler interface
 func (v Object) MarshalEasyJSON(w *jwriter.Writer) {
-	easyjsonE44bcf2dEncodeGithubComJimehRbheapleak(w, v)
+	easyjsonE44bcf2dEncodeGithubComJimehRbheapObj(w, v)
 }
 
 // UnmarshalJSON supports json.Unmarshaler interface
 func (v *Object) UnmarshalJSON(data []byte) error {
 	r := jlexer.Lexer{Data: data}
-	easyjsonE44bcf2dDecodeGithubComJimehRbheapleak(&r, v)
+	easyjsonE44bcf2dDecodeGithubComJimehRbheapObj(&r, v)
 	return r.Error()
 }
 
 // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
 func (v *Object) UnmarshalEasyJSON(l *jlexer.Lexer) {
-	easyjsonE44bcf2dDecodeGithubComJimehRbheapleak(l, v)
+	easyjsonE44bcf2dDecodeGithubComJimehRbheapObj(l, v)
 }