diff --git a/attest/activation.go b/attest/activation.go
index 8ef749f..b17f2c7 100644
--- a/attest/activation.go
+++ b/attest/activation.go
@@ -14,7 +14,7 @@ import (
 
 	// TODO(jsonp): Move activation generation code to internal package.
 	"github.com/google/go-tpm/tpm2/credactivation"
-	"github.com/google/go-tspi/verification"
+	"github.com/Comcast/gotspi/verification"
 )
 
 const (
diff --git a/attest/attest-tool/attest-tool.go b/attest/attest-tool/attest-tool.go
index f565b62..107549c 100644
--- a/attest/attest-tool/attest-tool.go
+++ b/attest/attest-tool/attest-tool.go
@@ -16,7 +16,7 @@ import (
 	"os"
 
 	"github.com/google/go-attestation/attest"
-	"github.com/google/go-attestation/attest/attest-tool/internal"
+	"github.com/google/go-attestation/attest/attest_tool/internal"
 	"github.com/google/certificate-transparency-go/x509"
 )
 
diff --git a/attest/attest-tool/internal/eventlog/secureboot_test.go b/attest/attest-tool/internal/eventlog/secureboot_test.go
index 258acb3..2124591 100644
--- a/attest/attest-tool/internal/eventlog/secureboot_test.go
+++ b/attest/attest-tool/internal/eventlog/secureboot_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/google/go-attestation/attest"
-	"github.com/google/go-attestation/attest/attest-tool/internal"
+	"github.com/google/go-attestation/attest/attest_tool/internal"
 )
 
 func parseEvents(t *testing.T, testdata string) []attest.Event {
diff --git a/attest/attest_simulated_tpm20_test.go b/attest/attest_simulated_tpm20_test.go
index 3e879d5..2ec2af2 100644
--- a/attest/attest_simulated_tpm20_test.go
+++ b/attest/attest_simulated_tpm20_test.go
@@ -24,7 +24,7 @@ import (
 	"crypto"
 	"testing"
 
-	"github.com/google/go-tpm-tools/simulator"
+	"github.com/google/go-tpm_tools/simulator"
 )
 
 func setupSimulatedTPM(t *testing.T) (*simulator.Simulator, *TPM) {
diff --git a/attest/key_linux.go b/attest/key_linux.go
index af252b6..74efb3d 100644
--- a/attest/key_linux.go
+++ b/attest/key_linux.go
@@ -19,7 +19,7 @@ package attest
 import (
 	"fmt"
 
-	"github.com/google/go-tspi/attestation"
+	"github.com/Comcast/gotspi/attestation"
 )
 
 // trousersKey12 represents a key bound to a TPM 1.2 device via tcsd.
diff --git a/attest/tpm12_linux.go b/attest/tpm12_linux.go
index ef4e2da..4ca6c22 100644
--- a/attest/tpm12_linux.go
+++ b/attest/tpm12_linux.go
@@ -23,9 +23,9 @@ import (
 	"io/ioutil"
 
 	"github.com/google/certificate-transparency-go/x509"
-	"github.com/google/go-tspi/attestation"
-	"github.com/google/go-tspi/tspi"
-	"github.com/google/go-tspi/tspiconst"
+	"github.com/Comcast/gotspi/attestation"
+	"github.com/Comcast/gotspi/tspi"
+	"github.com/Comcast/gotspi/tspiconst"
 )
 
 func init() {