diff --git a/cmd/curio/guidedsetup/guidedsetup.go b/cmd/curio/guidedsetup/guidedsetup.go
index af505966d..7c9ae9c7e 100644
--- a/cmd/curio/guidedsetup/guidedsetup.go
+++ b/cmd/curio/guidedsetup/guidedsetup.go
@@ -346,7 +346,7 @@ func oneLastThing(d *MigrationData) {
 				d.say(notice, "Error getting miner power: %s", err.Error())
 				os.Exit(1)
 			}
-			msgMap["version"] = build.BuildVersion
+			msgMap["version"] = build.MinerBuildVersion
 			msgMap["net"] = build.BuildType
 			msgMap["power"] = map[uploadType]uint64{
 				uploadTypeIndividual: power.MinerPower.QualityAdjPower.Uint64(),
diff --git a/cmd/curio/main.go b/cmd/curio/main.go
index 9a092dad0..b6a0d10b6 100644
--- a/cmd/curio/main.go
+++ b/cmd/curio/main.go
@@ -92,7 +92,7 @@ func main() {
 	app := &cli.App{
 		Name:                 "curio",
 		Usage:                "Filecoin decentralized storage network provider",
-		Version:              build.UserVersion(),
+		Version:              string(build.MinerUserVersion()),
 		EnableBashCompletion: true,
 		Before: func(c *cli.Context) error {
 			setupCloseHandler()
@@ -154,7 +154,7 @@ func main() {
 				}
 
 				// Generate report in CURIO_PATH and re-raise panic
-				build.GeneratePanicReport(c.String("panic-reports"), p, c.App.Name)
+				build.GenerateMinerPanicReport(c.String("panic-reports"), p, c.App.Name)
 				panic(r)
 			}
 			return nil
diff --git a/cmd/curio/run.go b/cmd/curio/run.go
index 3d772b14d..e80ef4d8f 100644
--- a/cmd/curio/run.go
+++ b/cmd/curio/run.go
@@ -95,7 +95,7 @@ var runCmd = &cli.Command{
 		}
 
 		ctx, _ := tag.New(lcli.DaemonContext(cctx),
-			tag.Insert(metrics.Version, build.BuildVersion),
+			tag.Insert(metrics.Version, build.MinerBuildVersion),
 			tag.Insert(metrics.Commit, build.CurrentCommit),
 			tag.Insert(metrics.NodeType, "curio"),
 		)
diff --git a/cmd/sptool/main.go b/cmd/sptool/main.go
index 7970b8db3..c70500484 100644
--- a/cmd/sptool/main.go
+++ b/cmd/sptool/main.go
@@ -29,7 +29,7 @@ func main() {
 	app := &cli.App{
 		Name:     "sptool",
 		Usage:    "Manage Filecoin Miner Actor",
-		Version:  build.UserVersion(),
+		Version:  string(build.MinerUserVersion()),
 		Commands: local,
 		Flags: []cli.Flag{
 			&cli.StringFlag{