diff --git a/set/internal/gen/main.go b/set/internal/gen/main.go
index c568d89..bdb4471 100644
--- a/set/internal/gen/main.go
+++ b/set/internal/gen/main.go
@@ -111,6 +111,8 @@ THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 	src = strings.Replace(src, "Five  TypeName = 5", "Five  TypeName = "+typ.testVals[4], 1)
 	// Replace the type name
 	src = strings.Replace(src, genericTypeName, typ.name, -1)
+	// Replace package name
+	src = strings.Replace(src, "package impl", "package set"+typ.name, 1)
 	return doNotEditBanner + src
 }
 
diff --git a/set/setint/set.go b/set/setint/set.go
index 3cae6db..30c183c 100755
--- a/set/setint/set.go
+++ b/set/setint/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint
 
 import (
 	"fmt"
diff --git a/set/setint/set_test.go b/set/setint/set_test.go
index 1101341..5742fcb 100755
--- a/set/setint/set_test.go
+++ b/set/setint/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setint16/set.go b/set/setint16/set.go
index 65d61c8..edc442d 100755
--- a/set/setint16/set.go
+++ b/set/setint16/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint16
 
 import (
 	"fmt"
diff --git a/set/setint16/set_test.go b/set/setint16/set_test.go
index dd7bfb8..7c062ea 100755
--- a/set/setint16/set_test.go
+++ b/set/setint16/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint16
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setint32/set.go b/set/setint32/set.go
index 71ba75e..929ab4e 100755
--- a/set/setint32/set.go
+++ b/set/setint32/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint32
 
 import (
 	"fmt"
diff --git a/set/setint32/set_test.go b/set/setint32/set_test.go
index 47326b1..38ecded 100755
--- a/set/setint32/set_test.go
+++ b/set/setint32/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint32
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setint64/set.go b/set/setint64/set.go
index f931201..dc53354 100755
--- a/set/setint64/set.go
+++ b/set/setint64/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint64
 
 import (
 	"fmt"
diff --git a/set/setint64/set_test.go b/set/setint64/set_test.go
index f7875c9..cc1baa6 100755
--- a/set/setint64/set_test.go
+++ b/set/setint64/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint64
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setint8/set.go b/set/setint8/set.go
index 2f7c215..d625215 100755
--- a/set/setint8/set.go
+++ b/set/setint8/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint8
 
 import (
 	"fmt"
diff --git a/set/setint8/set_test.go b/set/setint8/set_test.go
index e76af97..cc2411e 100755
--- a/set/setint8/set_test.go
+++ b/set/setint8/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setint8
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setstring/set.go b/set/setstring/set.go
index eb43b90..0e519c9 100755
--- a/set/setstring/set.go
+++ b/set/setstring/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setstring
 
 import (
 	"fmt"
diff --git a/set/setstring/set_test.go b/set/setstring/set_test.go
index ee93e67..8bc5690 100755
--- a/set/setstring/set_test.go
+++ b/set/setstring/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setstring
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setuint/set.go b/set/setuint/set.go
index 66cbca6..655d51a 100755
--- a/set/setuint/set.go
+++ b/set/setuint/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint
 
 import (
 	"fmt"
diff --git a/set/setuint/set_test.go b/set/setuint/set_test.go
index 210cb69..8952c5d 100755
--- a/set/setuint/set_test.go
+++ b/set/setuint/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setuint16/set.go b/set/setuint16/set.go
index f89c4b9..fb560e9 100755
--- a/set/setuint16/set.go
+++ b/set/setuint16/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint16
 
 import (
 	"fmt"
diff --git a/set/setuint16/set_test.go b/set/setuint16/set_test.go
index 30f874f..171448b 100755
--- a/set/setuint16/set_test.go
+++ b/set/setuint16/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint16
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setuint32/set.go b/set/setuint32/set.go
index 9ea6c1a..8754003 100755
--- a/set/setuint32/set.go
+++ b/set/setuint32/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint32
 
 import (
 	"fmt"
diff --git a/set/setuint32/set_test.go b/set/setuint32/set_test.go
index 20be056..15ee030 100755
--- a/set/setuint32/set_test.go
+++ b/set/setuint32/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint32
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setuint64/set.go b/set/setuint64/set.go
index 2bb46c4..7610573 100755
--- a/set/setuint64/set.go
+++ b/set/setuint64/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint64
 
 import (
 	"fmt"
diff --git a/set/setuint64/set_test.go b/set/setuint64/set_test.go
index 19f1e8c..bc1f517 100755
--- a/set/setuint64/set_test.go
+++ b/set/setuint64/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint64
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (
diff --git a/set/setuint8/set.go b/set/setuint8/set.go
index b4d7770..5b3d691 100755
--- a/set/setuint8/set.go
+++ b/set/setuint8/set.go
@@ -1,7 +1,7 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint8
 
 import (
 	"fmt"
diff --git a/set/setuint8/set_test.go b/set/setuint8/set_test.go
index 856dbf5..5268f2c 100755
--- a/set/setuint8/set_test.go
+++ b/set/setuint8/set_test.go
@@ -1,14 +1,13 @@
 /*******************************************************************************
 THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT!
 *******************************************************************************/
-package impl
+package setuint8
 
 import (
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 const (