diff --git a/Default.sublime-commands b/Default.sublime-commands
index 93b893b..7bf77ea 100644
--- a/Default.sublime-commands
+++ b/Default.sublime-commands
@@ -1,18 +1,18 @@
 [
     {
-        "caption": "Golang Build: Get",
+        "caption": "Go: Get",
         "command": "golang_build_get"
     },
     {
-        "caption": "Golang Build: Cancel",
+        "caption": "Go: Cancel Build",
         "command": "golang_build_cancel"
     },
     {
-        "caption": "Golang Build: Reopen Output",
+        "caption": "Go: Reopen Build Output",
         "command": "golang_build_reopen"
     },
     {
-        "caption": "Golang Build: Terminal",
+        "caption": "Go: Open Terminal",
         "command": "golang_build_terminal"
     }
 ]
\ No newline at end of file
diff --git a/Golang Build.sublime-build b/Go.sublime-build
similarity index 100%
rename from Golang Build.sublime-build
rename to Go.sublime-build
diff --git a/docs/commands.md b/docs/commands.md
index 457567c..fc35a57 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -69,7 +69,7 @@
 ```json
 [
     {
-        "caption": "Golang Build: Test (Print Commands)",
+        "caption": "Go: Test (Print Commands)",
         "command": "golang_build",
         "args": {
             "task": "test",
diff --git a/docs/design.md b/docs/design.md
index 793b3a9..a012b88 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -3,7 +3,7 @@
 The Golang Build Sublime Text package is structured as follows:
 
  - The primary user interaction happens through the Sublime Text build system,
-   which parses the "Golang Build.sublime-build" file
+   which parses the "Go.sublime-build" file
  - The primary build task is "go build", but variants exists for "go test",
    "go install", "go clean" and cross-compile, which is "go build" with GOOS
    and GOARCH set. All of these tasks are executing by the Sublime Text command
diff --git a/docs/usage.md b/docs/usage.md
index 13afcb8..46db044 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -1,7 +1,7 @@
 # *Golang Build* Usage
 
-The primary functionality of the *Golang Build* package is the *Golang Build*
-build system. It includes a number of what Sublime Text refers to as "variants."
+The primary functionality of the *Golang Build* package is the *Go* build
+system. It includes a number of what Sublime Text refers to as "variants."
 It also includes a couple of regular Sublime Text commands for common, related
 tasks.
 
@@ -12,8 +12,8 @@
 
 ## Build System
 
-To use the *Golang Build* build system, open the *Tools > Build System* menu and
-select *Golang Build*.
+To use the *Go* build system, open the *Tools > Build System* menu and select
+*Go*.
 
 The variants included with the build system include:
 
@@ -24,16 +24,16 @@
    `GOARCH` set
  - **Clean**, which executes `go clean`
 
-Once the *Golang Build* build system is selected, the command palette can be
-used to run any of the variants.
+Once the *Go* build system is selected, the command palette can be used to run
+any of the variants.
 
 On Sublime Text 3, the command palette entries will be:
 
- - `Build with: Golang Build`
- - `Build with: Golang Build - Test`
- - `Build with: Golang Build - Install`
- - `Build with: Golang Build - Cross-Compile (Interactive)`
- - `Build with: Golang Build - Clean`
+ - `Build with: Go`
+ - `Build with: Go - Test`
+ - `Build with: Go - Install`
+ - `Build with: Go - Cross-Compile (Interactive)`
+ - `Build with: Go - Clean`
 
 On Sublime Text 2, the command palette entries will be:
 
@@ -46,12 +46,12 @@
 ### Cancelling a Build
 
 If a build is running and needs to be stopped, the command palette will contain
-an extra entry `Golang Build: Cancel`.
+an extra entry `Go: Cancel Build`.
 
 ### Reopening Build Results
 
 If the output panel for a build is closed, it can be re-opened by using the
-command palette to run `Golang Build: Reopen Output`. *Once a new build is
+command palette to run `Go: Reopen Build Output`. *Once a new build is
 started, the old build output is erased.*
 
 ## Other Commands
@@ -59,8 +59,8 @@
 In addition to the build system variants, two other command palette commands are
 available:
 
- - `Golang Build: Get`, which executes `go get` after prompting for a URL
- - `Golang Build: Terminal`, which opens a terminal and sets relevant Go
+ - `Go: Get`, which executes `go get` after prompting for a URL
+ - `Go: Open Terminal`, which opens a terminal and sets relevant Go
    environment variables
 
 ## Configuration