diff --git a/cli/hotswap/cmd/build.go b/cli/hotswap/cmd/build.go
index 64a1679..2722552 100644
--- a/cli/hotswap/cmd/build.go
+++ b/cli/hotswap/cmd/build.go
@@ -31,11 +31,8 @@ import (
 	"golang.org/x/tools/go/packages"
 )
 
-var (
-	hotswapBureauPackageNames = [...]string{
-		"hotbureau",
-		"hotswapbureau",
-	}
+const (
+	hotswapBureauPackageName = "hotswapbureau"
 )
 
 const (
@@ -451,11 +448,9 @@ func removeStaticFiles(args completePluginArgs) {
 	}
 
 	if args.cleanOnly {
-		for _, pkgName := range hotswapBureauPackageNames {
-			bureauDir := filepath.Join(args.pluginDir, pkgName)
-			if err := hutils.FindDirectory(bureauDir, ""); err == nil {
-				_ = os.RemoveAll(bureauDir)
-			}
+		bureauDir := filepath.Join(args.pluginDir, hotswapBureauPackageName)
+		if err := hutils.FindDirectory(bureauDir, ""); err == nil {
+			_ = os.RemoveAll(bureauDir)
 		}
 	}
 
@@ -908,14 +903,7 @@ func parseHotswapComment(group *ast.CommentGroup) string {
 }
 
 func genHotswapBureau(args completePluginArgs, generated *generatedFiles) {
-	for _, pkgName := range hotswapBureauPackageNames {
-		bureauDir := filepath.Join(args.pluginDir, pkgName)
-		if err := hutils.FindDirectory(bureauDir, ""); err == nil {
-			_ = os.RemoveAll(bureauDir)
-		}
-	}
-
-	dir := filepath.Join(args.tmpDir, hotswapBureauPackageNames[0])
+	dir := filepath.Join(args.tmpDir, hotswapBureauPackageName)
 	if err := os.MkdirAll(dir, 0744); err != nil {
 		panic(err)
 	}
@@ -957,7 +945,7 @@ func genHotswapMain(args completePluginArgs, livePackages map[string]*packages.P
 		LivePackages      []string
 	}{
 		PackageName:       pkgName,
-		BureauPackagePath: path.Join(args.tmpPkgPath, hotswapBureauPackageNames[0]),
+		BureauPackagePath: path.Join(args.tmpPkgPath, hotswapBureauPackageName),
 		LivePackages:      a,
 	}
 
@@ -987,7 +975,7 @@ func genHotswapLive(args completePluginArgs, dir string, pkg *packages.Package,
 		LiveTypes         []string
 	}{
 		PackageName:       pkg.Name,
-		BureauPackagePath: path.Join(args.tmpPkgPath, hotswapBureauPackageNames[0]),
+		BureauPackagePath: path.Join(args.tmpPkgPath, hotswapBureauPackageName),
 		LiveFuncs:         liveFuncs,
 		LiveTypes:         liveTypes,
 	}
diff --git a/demo/slink/plugin/dog/hotswap.main.go b/demo/slink/plugin/dog/hotswap.main.go
index 4581815..e835f26 100644
--- a/demo/slink/plugin/dog/hotswap.main.go
+++ b/demo/slink/plugin/dog/hotswap.main.go
@@ -3,7 +3,7 @@
 package dog
 
 import (
-	"github.com/edwingeng/hotswap/demo/slink/plugin/dog/hotbureau"
+	"github.com/edwingeng/hotswap/demo/slink/plugin/dog/hotswapbureau"
 
 	_ "github.com/edwingeng/hotswap/demo/slink/plugin/dog/woof"
 )
diff --git a/demo/slink/plugin/dog/hotbureau/hotswap.bureau.go b/demo/slink/plugin/dog/hotswapbureau/hotswap.bureau.go
similarity index 100%
rename from demo/slink/plugin/dog/hotbureau/hotswap.bureau.go
rename to demo/slink/plugin/dog/hotswapbureau/hotswap.bureau.go
diff --git a/demo/slink/plugin/dog/woof/hotswap.live.go b/demo/slink/plugin/dog/woof/hotswap.live.go
index b47b4c6..1d7ec6f 100644
--- a/demo/slink/plugin/dog/woof/hotswap.live.go
+++ b/demo/slink/plugin/dog/woof/hotswap.live.go
@@ -3,7 +3,7 @@
 package woof
 
 import (
-	"github.com/edwingeng/hotswap/demo/slink/plugin/dog/hotbureau"
+	"github.com/edwingeng/hotswap/demo/slink/plugin/dog/hotswapbureau"
 )
 
 func init() {