diff --git a/runtime/Go/antlr/ATN.go b/runtime/Go/antlr/ATN.go
index 3f092dadd..0f3f98067 100644
--- a/runtime/Go/antlr/ATN.go
+++ b/runtime/Go/antlr/ATN.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "fmt"
 
diff --git a/runtime/Go/antlr/ATNConfig.go b/runtime/Go/antlr/ATNConfig.go
index 41f1503d8..dceab1323 100644
--- a/runtime/Go/antlr/ATNConfig.go
+++ b/runtime/Go/antlr/ATNConfig.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/ATNConfigSet.go b/runtime/Go/antlr/ATNConfigSet.go
index 2fb345869..7ed8fa416 100644
--- a/runtime/Go/antlr/ATNConfigSet.go
+++ b/runtime/Go/antlr/ATNConfigSet.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/ATNDeserializationOptions.go b/runtime/Go/antlr/ATNDeserializationOptions.go
index 0d8f84f4f..71dad1b38 100644
--- a/runtime/Go/antlr/ATNDeserializationOptions.go
+++ b/runtime/Go/antlr/ATNDeserializationOptions.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type ATNDeserializationOptions struct {
 	readOnly                      bool
diff --git a/runtime/Go/antlr/ATNDeserializer.go b/runtime/Go/antlr/ATNDeserializer.go
index 1bac1d117..5c6b31607 100644
--- a/runtime/Go/antlr/ATNDeserializer.go
+++ b/runtime/Go/antlr/ATNDeserializer.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"encoding/hex"
diff --git a/runtime/Go/antlr/ATNSimulator.go b/runtime/Go/antlr/ATNSimulator.go
index 1c34ec6c2..c860b0bc7 100644
--- a/runtime/Go/antlr/ATNSimulator.go
+++ b/runtime/Go/antlr/ATNSimulator.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type BaseATNSimulator struct {
 	atn                *ATN
diff --git a/runtime/Go/antlr/ATNState.go b/runtime/Go/antlr/ATNState.go
index 29642c6c8..5af6f9136 100644
--- a/runtime/Go/antlr/ATNState.go
+++ b/runtime/Go/antlr/ATNState.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "strconv"
 
diff --git a/runtime/Go/antlr/ATNType.go b/runtime/Go/antlr/ATNType.go
index b5c990856..fc6ba9cab 100644
--- a/runtime/Go/antlr/ATNType.go
+++ b/runtime/Go/antlr/ATNType.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 // Represents the type of recognizer an ATN applies to.
 
diff --git a/runtime/Go/antlr/CharStream.go b/runtime/Go/antlr/CharStream.go
index 4f0e158d4..15e625986 100644
--- a/runtime/Go/antlr/CharStream.go
+++ b/runtime/Go/antlr/CharStream.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type CharStream interface {
 	IntStream
diff --git a/runtime/Go/antlr/CommonTokenFactory.go b/runtime/Go/antlr/CommonTokenFactory.go
index b715e45a0..3bc8c7e77 100644
--- a/runtime/Go/antlr/CommonTokenFactory.go
+++ b/runtime/Go/antlr/CommonTokenFactory.go
@@ -3,7 +3,7 @@
 // {@link CommonToken} objects.
 //
 
-package antlr4
+package antlr
 
 import "fmt"
 
diff --git a/runtime/Go/antlr/CommonTokenStream.go b/runtime/Go/antlr/CommonTokenStream.go
index 0a75431ee..71594bd52 100644
--- a/runtime/Go/antlr/CommonTokenStream.go
+++ b/runtime/Go/antlr/CommonTokenStream.go
@@ -9,7 +9,7 @@
 // {@link Token//HIDDEN_CHANNEL}, use a filtering token stream such a
 // {@link CommonTokenStream}.</p>
 
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/DFA.go b/runtime/Go/antlr/DFA.go
index 674d61654..54ec6ec73 100644
--- a/runtime/Go/antlr/DFA.go
+++ b/runtime/Go/antlr/DFA.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "sort"
 
diff --git a/runtime/Go/antlr/DFASerializer.go b/runtime/Go/antlr/DFASerializer.go
index f83908454..a7a26b02d 100644
--- a/runtime/Go/antlr/DFASerializer.go
+++ b/runtime/Go/antlr/DFASerializer.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/DFAState.go b/runtime/Go/antlr/DFAState.go
index c3f2639c5..c1d539f52 100644
--- a/runtime/Go/antlr/DFAState.go
+++ b/runtime/Go/antlr/DFAState.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/DiagnosticErrorListener.go b/runtime/Go/antlr/DiagnosticErrorListener.go
index 8326a4c85..46dfd7d0b 100644
--- a/runtime/Go/antlr/DiagnosticErrorListener.go
+++ b/runtime/Go/antlr/DiagnosticErrorListener.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"strconv"
diff --git a/runtime/Go/antlr/ErrorListener.go b/runtime/Go/antlr/ErrorListener.go
index 3520ac96f..12b1683e2 100644
--- a/runtime/Go/antlr/ErrorListener.go
+++ b/runtime/Go/antlr/ErrorListener.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/ErrorStrategy.go b/runtime/Go/antlr/ErrorStrategy.go
index aed0ef94b..df29be317 100644
--- a/runtime/Go/antlr/ErrorStrategy.go
+++ b/runtime/Go/antlr/ErrorStrategy.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/Errors.go b/runtime/Go/antlr/Errors.go
index c69a86f88..4eceb9727 100644
--- a/runtime/Go/antlr/Errors.go
+++ b/runtime/Go/antlr/Errors.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import ()
 
diff --git a/runtime/Go/antlr/FileStream.go b/runtime/Go/antlr/FileStream.go
index dd7a5350d..c0b9170ab 100644
--- a/runtime/Go/antlr/FileStream.go
+++ b/runtime/Go/antlr/FileStream.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"bytes"
diff --git a/runtime/Go/antlr/InputStream.go b/runtime/Go/antlr/InputStream.go
index 8c0ef87c1..e27c50f54 100644
--- a/runtime/Go/antlr/InputStream.go
+++ b/runtime/Go/antlr/InputStream.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "fmt"
 
diff --git a/runtime/Go/antlr/IntStream.go b/runtime/Go/antlr/IntStream.go
index e293442b7..283f4dbd6 100644
--- a/runtime/Go/antlr/IntStream.go
+++ b/runtime/Go/antlr/IntStream.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type IntStream interface {
 	Consume()
diff --git a/runtime/Go/antlr/IntervalSet.go b/runtime/Go/antlr/IntervalSet.go
index dbc5e0718..eb8b0fe1a 100644
--- a/runtime/Go/antlr/IntervalSet.go
+++ b/runtime/Go/antlr/IntervalSet.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/LL1Analyzer.go b/runtime/Go/antlr/LL1Analyzer.go
index e11e84ae0..4e0af4972 100644
--- a/runtime/Go/antlr/LL1Analyzer.go
+++ b/runtime/Go/antlr/LL1Analyzer.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/Lexer.go b/runtime/Go/antlr/Lexer.go
index f3531757a..d5687dce3 100644
--- a/runtime/Go/antlr/Lexer.go
+++ b/runtime/Go/antlr/Lexer.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/LexerATNSimulator.go b/runtime/Go/antlr/LexerATNSimulator.go
index 8a70ab9f0..22abddaa9 100644
--- a/runtime/Go/antlr/LexerATNSimulator.go
+++ b/runtime/Go/antlr/LexerATNSimulator.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/LexerAction.go b/runtime/Go/antlr/LexerAction.go
index 7473e7b2b..853fffb38 100644
--- a/runtime/Go/antlr/LexerAction.go
+++ b/runtime/Go/antlr/LexerAction.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "strconv"
 
diff --git a/runtime/Go/antlr/LexerActionExecutor.go b/runtime/Go/antlr/LexerActionExecutor.go
index 45530f3f5..b9bbdb311 100644
--- a/runtime/Go/antlr/LexerActionExecutor.go
+++ b/runtime/Go/antlr/LexerActionExecutor.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 // Represents an executor for a sequence of lexer actions which traversed during
 // the Matching operation of a lexer rule (token).
diff --git a/runtime/Go/antlr/Parser.go b/runtime/Go/antlr/Parser.go
index 15a99e015..2ab3916aa 100644
--- a/runtime/Go/antlr/Parser.go
+++ b/runtime/Go/antlr/Parser.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/ParserATNSimulator.go b/runtime/Go/antlr/ParserATNSimulator.go
index e47ec0cff..52211ab15 100644
--- a/runtime/Go/antlr/ParserATNSimulator.go
+++ b/runtime/Go/antlr/ParserATNSimulator.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/ParserRuleContext.go b/runtime/Go/antlr/ParserRuleContext.go
index 6c9cbe7e5..78f00d3ac 100644
--- a/runtime/Go/antlr/ParserRuleContext.go
+++ b/runtime/Go/antlr/ParserRuleContext.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"reflect"
diff --git a/runtime/Go/antlr/PredictionContext.go b/runtime/Go/antlr/PredictionContext.go
index 4d62448f2..5b72e1824 100644
--- a/runtime/Go/antlr/PredictionContext.go
+++ b/runtime/Go/antlr/PredictionContext.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/PredictionMode.go b/runtime/Go/antlr/PredictionMode.go
index a2db52609..f2cb180c4 100644
--- a/runtime/Go/antlr/PredictionMode.go
+++ b/runtime/Go/antlr/PredictionMode.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"strconv"
diff --git a/runtime/Go/antlr/Recognizer.go b/runtime/Go/antlr/Recognizer.go
index 4fe561b1e..6ada5affb 100644
--- a/runtime/Go/antlr/Recognizer.go
+++ b/runtime/Go/antlr/Recognizer.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/RuleContext.go b/runtime/Go/antlr/RuleContext.go
index f3aa2e748..87f5a4d1e 100644
--- a/runtime/Go/antlr/RuleContext.go
+++ b/runtime/Go/antlr/RuleContext.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 //  A rule context is a record of a single rule invocation. It knows
 //  which context invoked it, if any. If there is no parent context, then
diff --git a/runtime/Go/antlr/SemanticContext.go b/runtime/Go/antlr/SemanticContext.go
index 49e9d2738..5d7838db2 100644
--- a/runtime/Go/antlr/SemanticContext.go
+++ b/runtime/Go/antlr/SemanticContext.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/Token.go b/runtime/Go/antlr/Token.go
index f6b157780..7e30bb203 100644
--- a/runtime/Go/antlr/Token.go
+++ b/runtime/Go/antlr/Token.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"strconv"
diff --git a/runtime/Go/antlr/TokenSource.go b/runtime/Go/antlr/TokenSource.go
index a41b83134..a08280d57 100644
--- a/runtime/Go/antlr/TokenSource.go
+++ b/runtime/Go/antlr/TokenSource.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type TokenSource interface {
 	NextToken() Token
diff --git a/runtime/Go/antlr/TokenStream.go b/runtime/Go/antlr/TokenStream.go
index a426af48a..453433e74 100644
--- a/runtime/Go/antlr/TokenStream.go
+++ b/runtime/Go/antlr/TokenStream.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 type TokenStream interface {
 	IntStream
diff --git a/runtime/Go/antlr/TraceListener.go b/runtime/Go/antlr/TraceListener.go
index cab7ff243..a4f3eea1f 100644
--- a/runtime/Go/antlr/TraceListener.go
+++ b/runtime/Go/antlr/TraceListener.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "fmt"
 
diff --git a/runtime/Go/antlr/Transition.go b/runtime/Go/antlr/Transition.go
index 428e6763f..d0807b0f7 100644
--- a/runtime/Go/antlr/Transition.go
+++ b/runtime/Go/antlr/Transition.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"fmt"
diff --git a/runtime/Go/antlr/Tree.go b/runtime/Go/antlr/Tree.go
index 74bc92fa6..df392adb8 100644
--- a/runtime/Go/antlr/Tree.go
+++ b/runtime/Go/antlr/Tree.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 // The basic notion of a tree has a parent, a payload, and a list of children.
 //  It is the most abstract interface for all the trees used by ANTLR.
diff --git a/runtime/Go/antlr/Trees.go b/runtime/Go/antlr/Trees.go
index 1812f033a..2cfb27ffc 100644
--- a/runtime/Go/antlr/Trees.go
+++ b/runtime/Go/antlr/Trees.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import "fmt"
 
diff --git a/runtime/Go/antlr/Utils.go b/runtime/Go/antlr/Utils.go
index 8688325a0..74441952e 100644
--- a/runtime/Go/antlr/Utils.go
+++ b/runtime/Go/antlr/Utils.go
@@ -1,4 +1,4 @@
-package antlr4
+package antlr
 
 import (
 	"errors"