diff --git a/internal/codegen/golang/enum.go b/internal/codegen/golang/enum.go
index bfe114bd83..c6a0d1ccbf 100644
--- a/internal/codegen/golang/enum.go
+++ b/internal/codegen/golang/enum.go
@@ -19,6 +19,13 @@ type Enum struct {
 	Constants []Constant
 }
 
+func EnumReplace(value string) string {
+	id := strings.Replace(value, "-", "_", -1)
+	id = strings.Replace(id, ":", "_", -1)
+	id = strings.Replace(id, "/", "_", -1)
+	return IdentPattern.ReplaceAllString(id, "")
+}
+
 func EnumValueName(value string) string {
 	name := ""
 	id := strings.Replace(value, "-", "_", -1)
diff --git a/internal/compiler/result.go b/internal/compiler/result.go
index 7428f7569f..7c79eba094 100644
--- a/internal/compiler/result.go
+++ b/internal/compiler/result.go
@@ -101,7 +101,7 @@ func (r *Result) Enums(settings config.CombinedSettings) []golang.Enum {
 			}
 			for _, v := range enum.Vals {
 				e.Constants = append(e.Constants, golang.Constant{
-					Name:  e.Name + golang.EnumValueName(v),
+					Name:  golang.StructName(enumName+"_"+golang.EnumReplace(v), settings),
 					Value: v,
 					Type:  e.Name,
 				})
diff --git a/internal/endtoend/testdata/rename/endtoend.json b/internal/endtoend/testdata/rename/endtoend.json
new file mode 100644
index 0000000000..e9665ca4a3
--- /dev/null
+++ b/internal/endtoend/testdata/rename/endtoend.json
@@ -0,0 +1,3 @@
+{
+  "experimental_parser_only": true
+}
diff --git a/internal/endtoend/testdata/rename/go/db.go b/internal/endtoend/testdata/rename/go/db.go
new file mode 100644
index 0000000000..6a99519302
--- /dev/null
+++ b/internal/endtoend/testdata/rename/go/db.go
@@ -0,0 +1,29 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/rename/go/models.go b/internal/endtoend/testdata/rename/go/models.go
new file mode 100644
index 0000000000..48864f384c
--- /dev/null
+++ b/internal/endtoend/testdata/rename/go/models.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"fmt"
+)
+
+type IPProtocol string
+
+const (
+	IPProtocolTCP  IPProtocol = "tcp"
+	IpProtocolIp   IPProtocol = "ip"
+	IpProtocolIcmp IPProtocol = "icmp"
+)
+
+func (e *IPProtocol) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = IPProtocol(s)
+	case string:
+		*e = IPProtocol(s)
+	default:
+		return fmt.Errorf("unsupported scan type for IPProtocol: %T", src)
+	}
+	return nil
+}
+
+type BarNew struct {
+	IDNew int32
+	IpOld IPProtocol
+}
diff --git a/internal/endtoend/testdata/rename/go/query.sql.go b/internal/endtoend/testdata/rename/go/query.sql.go
new file mode 100644
index 0000000000..d3bfd6fe79
--- /dev/null
+++ b/internal/endtoend/testdata/rename/go/query.sql.go
@@ -0,0 +1,74 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const listBar = `-- name: ListBar :many
+SELECT id_old, ip_old FROM bar_old
+`
+
+func (q *Queries) ListBar(ctx context.Context) ([]BarNew, error) {
+	rows, err := q.db.QueryContext(ctx, listBar)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []BarNew
+	for rows.Next() {
+		var i BarNew
+		if err := rows.Scan(&i.IDNew, &i.IpOld); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const listFoo = `-- name: ListFoo :many
+SELECT id_old as foo_old, id_old as baz_old
+FROM bar_old
+WHERE ip_old = $1 AND id_old = $2
+`
+
+type ListFooParams struct {
+	IpOld IPProtocol
+	IDNew int32
+}
+
+type ListFooRow struct {
+	FooNew int32
+	BazOld int32
+}
+
+func (q *Queries) ListFoo(ctx context.Context, arg ListFooParams) ([]ListFooRow, error) {
+	rows, err := q.db.QueryContext(ctx, listFoo, arg.IpOld, arg.IDNew)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []ListFooRow
+	for rows.Next() {
+		var i ListFooRow
+		if err := rows.Scan(&i.FooNew, &i.BazOld); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/rename/query.sql b/internal/endtoend/testdata/rename/query.sql
new file mode 100644
index 0000000000..e91722b3f3
--- /dev/null
+++ b/internal/endtoend/testdata/rename/query.sql
@@ -0,0 +1,12 @@
+CREATE TYPE ip_protocol AS enum('tcp', 'ip', 'icmp');
+
+CREATE TABLE bar_old (id_old serial not null, ip_old ip_protocol NOT NULL);
+
+-- name: ListFoo :many
+SELECT id_old as foo_old, id_old as baz_old
+FROM bar_old
+WHERE ip_old = $1 AND id_old = $2;
+
+-- name: ListBar :many
+SELECT * FROM bar_old;
+
diff --git a/internal/endtoend/testdata/rename/sqlc.json b/internal/endtoend/testdata/rename/sqlc.json
new file mode 100644
index 0000000000..a7cf0ce2a7
--- /dev/null
+++ b/internal/endtoend/testdata/rename/sqlc.json
@@ -0,0 +1,18 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ],
+  "rename": {
+    "id_old": "IDNew",
+    "bar_old": "BarNew",
+    "foo_old": "FooNew",
+    "ip_protocol": "IPProtocol",
+    "ip_protocol_tcp": "IPProtocolTCP"
+  }
+}