diff --git a/pkg/cmd/logs/tail.go b/pkg/cmd/logs/tail.go
index e414ffec2..936027305 100644
--- a/pkg/cmd/logs/tail.go
+++ b/pkg/cmd/logs/tail.go
@@ -19,7 +19,6 @@ import (
 	"github.com/stripe/stripe-cli/pkg/ansi"
 	"github.com/stripe/stripe-cli/pkg/config"
 	"github.com/stripe/stripe-cli/pkg/logtailing"
-	logTailing "github.com/stripe/stripe-cli/pkg/logtailing"
 	"github.com/stripe/stripe-cli/pkg/stripe"
 	"github.com/stripe/stripe-cli/pkg/validators"
 	"github.com/stripe/stripe-cli/pkg/version"
@@ -34,7 +33,7 @@ type TailCmd struct {
 	cfg        *config.Config
 	Cmd        *cobra.Command
 	format     string
-	LogFilters *logTailing.LogFilters
+	LogFilters *logtailing.LogFilters
 	noWSS      bool
 }
 
@@ -42,7 +41,7 @@ type TailCmd struct {
 func NewTailCmd(config *config.Config) *TailCmd {
 	tailCmd := &TailCmd{
 		cfg:        config,
-		LogFilters: &logTailing.LogFilters{},
+		LogFilters: &logtailing.LogFilters{},
 	}
 
 	tailCmd.Cmd = &cobra.Command{
@@ -178,7 +177,7 @@ func (tailCmd *TailCmd) runTailCmd(cmd *cobra.Command, args []string) error {
 
 	logtailingOutCh := make(chan websocket.IElement)
 
-	tailer := logTailing.New(&logTailing.Config{
+	tailer := logtailing.New(&logtailing.Config{
 		Client: &stripe.Client{
 			APIKey:  key,
 			BaseURL: apiBase,
diff --git a/pkg/samples/samples.go b/pkg/samples/samples.go
index c32e61298..e908c1620 100644
--- a/pkg/samples/samples.go
+++ b/pkg/samples/samples.go
@@ -17,7 +17,6 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/stripe/stripe-cli/pkg/config"
-	g "github.com/stripe/stripe-cli/pkg/git"
 	gitpkg "github.com/stripe/stripe-cli/pkg/git"
 	"github.com/stripe/stripe-cli/pkg/stripe"
 	"github.com/stripe/stripe-cli/pkg/stripeauth"
@@ -112,7 +111,7 @@ type SampleManager struct {
 	// Filesystem operations
 	Fs afero.Fs
 	// Git operations.
-	Git g.Interface
+	Git gitpkg.Interface
 
 	Config *config.Config