Switch all references to github.com/containers/libpod -> podman

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

125 files changed, 151 insertions, 152 deletions

diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 4bb00398e..ed333d382 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -37,7 +37,7 @@ t GET libpod/containers/json?limit=1 200 \
   .[0].IsInfra=false
 
 # Make sure `last` works, which is an alias for `limit`.
-# See https://github.com/containers/libpod/issues/6413.
+# See https://github.com/containers/podman/issues/6413.
 t GET libpod/containers/json?last=1 200 \
   length=1 \
   .[0].Id~[0-9a-f]\\{64\\} \
diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index 827b7568d..7b18f71ac 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index c72d2243a..1046ffcea 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index e9d60f507..73ef8520b 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/containers/libpod/v2/pkg/criu"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/criu"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index b7bc2c7e8..568ee080d 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 4fc5b3da9..ed55484e3 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -13,11 +13,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/inspect"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/inspect"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/containers/storage/pkg/stringid"
diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go
index a10a634e7..e84fd9f2e 100644
--- a/test/e2e/container_inspect_test.go
+++ b/test/e2e/container_inspect_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/v2/pkg/annotations"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/annotations"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index aebbca855..1054f55f6 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 6fed6a0ac..df43c1b87 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go
index a6f4f830b..606c1b10d 100644
--- a/test/e2e/create_staticip_test.go
+++ b/test/e2e/create_staticip_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go
index 33675d607..adffdc1ca 100644
--- a/test/e2e/create_staticmac_test.go
+++ b/test/e2e/create_staticmac_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 09b4f5911..72a3a7717 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go
index f854c667e..6a71f4d70 100644
--- a/test/e2e/diff_test.go
+++ b/test/e2e/diff_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"sort"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go
index 9b527b88e..7bbbe2e03 100644
--- a/test/e2e/events_test.go
+++ b/test/e2e/events_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
index 0e60c4a7d..f5d15d3bd 100644
--- a/test/e2e/exec_test.go
+++ b/test/e2e/exec_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go
index f509bdff6..1076dfc61 100644
--- a/test/e2e/exists_test.go
+++ b/test/e2e/exists_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go
index dda1c5a62..4faacd626 100644
--- a/test/e2e/export_test.go
+++ b/test/e2e/export_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 7a3bfdf61..1ec8d51c1 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/ghodss/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 63c12d2e8..d114744c4 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index c92b908be..c020860ea 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go
index 3ecee5d49..fea3f4d43 100644
--- a/test/e2e/history_test.go
+++ b/test/e2e/history_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 6c2be1a4f..b22964dc1 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/docker/go-units"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go
index 92ee49b8b..feedb2a31 100644
--- a/test/e2e/import_test.go
+++ b/test/e2e/import_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index 8aa9712fd..6ca75848c 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go
index 1bf07dcc8..068da5f2a 100644
--- a/test/e2e/init_test.go
+++ b/test/e2e/init_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index eaecf2837..f7b953356 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/opencontainers/selinux/go-selinux"
diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go
index 449b6da24..3984c3414 100644
--- a/test/e2e/kill_test.go
+++ b/test/e2e/kill_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index 263139064..874789b5e 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/onsi/ginkgo"
 )
 
diff --git a/test/e2e/libpod_suite_varlink_test.go b/test/e2e/libpod_suite_varlink_test.go
index f040f4fea..750c8cd09 100644
--- a/test/e2e/libpod_suite_varlink_test.go
+++ b/test/e2e/libpod_suite_varlink_test.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/rootless"
 
 	"github.com/onsi/ginkgo"
 )
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 879291c36..6a7f15e1f 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go
index 66f764925..52357b00a 100644
--- a/test/e2e/login_logout_test.go
+++ b/test/e2e/login_logout_test.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/config"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index dd69e4ce8..381336b8b 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index 3bee15bd0..69b7b771b 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go
index 986c11c16..ec7a573cb 100644
--- a/test/e2e/mount_rootless_test.go
+++ b/test/e2e/mount_rootless_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index 0b1667fd3..0749a34f2 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go
index 5756a8fa2..916ceada0 100644
--- a/test/e2e/namespace_test.go
+++ b/test/e2e/namespace_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go
index 1deaf1f67..9c879fb8b 100644
--- a/test/e2e/negative_test.go
+++ b/test/e2e/negative_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go
index 24f711ae7..fcd324cd1 100644
--- a/test/e2e/network_create_test.go
+++ b/test/e2e/network_create_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	cniversion "github.com/containernetworking/cni/pkg/version"
-	"github.com/containers/libpod/v2/pkg/network"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/network"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index 85f3566b1..f427afa67 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/containers/storage/pkg/stringid"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go
index e3256b1e5..db9f92e0c 100644
--- a/test/e2e/pause_test.go
+++ b/test/e2e/pause_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 052db3842..053e27126 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index 016eaaa99..5c9b41c62 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
index a5fa21187..98f1b5174 100644
--- a/test/e2e/pod_infra_container_test.go
+++ b/test/e2e/pod_infra_container_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strconv"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go
index 16bf1c4c9..ccdf0a423 100644
--- a/test/e2e/pod_inspect_test.go
+++ b/test/e2e/pod_inspect_test.go
@@ -4,9 +4,8 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/containers/libpod/v2/libpod/define"
-
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go
index 8f39f969a..d7462e16d 100644
--- a/test/e2e/pod_kill_test.go
+++ b/test/e2e/pod_kill_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go
index 192738809..ec06b7df7 100644
--- a/test/e2e/pod_pause_test.go
+++ b/test/e2e/pod_pause_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_pod_namespaces.go b/test/e2e/pod_pod_namespaces.go
index 7a6223158..f72f98b5f 100644
--- a/test/e2e/pod_pod_namespaces.go
+++ b/test/e2e/pod_pod_namespaces.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go
index 21dfe2ebf..0346cfdc8 100644
--- a/test/e2e/pod_prune_test.go
+++ b/test/e2e/pod_prune_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go
index 83852f278..602d9d577 100644
--- a/test/e2e/pod_ps_test.go
+++ b/test/e2e/pod_ps_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"sort"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go
index 77a65a922..9fe6c1a85 100644
--- a/test/e2e/pod_restart_test.go
+++ b/test/e2e/pod_restart_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go
index 7395cada7..918d0eb32 100644
--- a/test/e2e/pod_rm_test.go
+++ b/test/e2e/pod_rm_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go
index 371339f51..2f0160e99 100644
--- a/test/e2e/pod_start_test.go
+++ b/test/e2e/pod_start_test.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go
index 04068de06..04475a799 100644
--- a/test/e2e/pod_stats_test.go
+++ b/test/e2e/pod_stats_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go
index dec59b3db..2363974cc 100644
--- a/test/e2e/pod_stop_test.go
+++ b/test/e2e/pod_stop_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go
index 40e8d77d8..2cb7a623e 100644
--- a/test/e2e/pod_top_test.go
+++ b/test/e2e/pod_top_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go
index b247fcaa3..fce092e2d 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go
index a51b9565c..1d592a42d 100644
--- a/test/e2e/prune_test.go
+++ b/test/e2e/prune_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 152c85704..281968fcd 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/docker/go-units"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 665cd1b55..6d1cb6cbc 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index a05291d06..1ff2095c0 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go
index e5cab500f..4348eae3b 100644
--- a/test/e2e/restart_test.go
+++ b/test/e2e/restart_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index 7ddfae0cb..764d25ba5 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go
index 73a54039a..4db6a1962 100644
--- a/test/e2e/rmi_test.go
+++ b/test/e2e/rmi_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go
index 344309b93..53cac9529 100644
--- a/test/e2e/run_apparmor_test.go
+++ b/test/e2e/run_apparmor_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/containers/common/pkg/apparmor"
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go
index ed3292139..992f3eda2 100644
--- a/test/e2e/run_cgroup_parent_test.go
+++ b/test/e2e/run_cgroup_parent_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go
index 596c224aa..f293e709a 100644
--- a/test/e2e/run_cleanup_test.go
+++ b/test/e2e/run_cleanup_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go
index b1fb0e628..401447579 100644
--- a/test/e2e/run_cpu_test.go
+++ b/test/e2e/run_cpu_test.go
@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go
index 8798b2dc1..43c258eac 100644
--- a/test/e2e/run_device_test.go
+++ b/test/e2e/run_device_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go
index a44fb7187..0ec2535aa 100644
--- a/test/e2e/run_dns_test.go
+++ b/test/e2e/run_dns_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index f6019b37a..c1061be85 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go
index 305e37c12..801a3d014 100644
--- a/test/e2e/run_env_test.go
+++ b/test/e2e/run_env_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go
index 2382fb279..0579e29fa 100644
--- a/test/e2e/run_exit_test.go
+++ b/test/e2e/run_exit_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go
index 379e74629..21ad00b43 100644
--- a/test/e2e/run_memory_test.go
+++ b/test/e2e/run_memory_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index a22f79180..bf96db197 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
index 181b453c1..2b6da2888 100644
--- a/test/e2e/run_ns_test.go
+++ b/test/e2e/run_ns_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
index 40385e3ad..a1414e313 100644
--- a/test/e2e/run_passwd_test.go
+++ b/test/e2e/run_passwd_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go
index 8efbe0690..ca8da981f 100644
--- a/test/e2e/run_privileged_test.go
+++ b/test/e2e/run_privileged_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go
index fa9cb2495..6150d63e5 100644
--- a/test/e2e/run_restart_test.go
+++ b/test/e2e/run_restart_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_seccomp.go b/test/e2e/run_seccomp.go
index ec688135b..7d04cc60a 100644
--- a/test/e2e/run_seccomp.go
+++ b/test/e2e/run_seccomp.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_security_labels.go b/test/e2e/run_security_labels.go
index 50209a989..e907607b5 100644
--- a/test/e2e/run_security_labels.go
+++ b/test/e2e/run_security_labels.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go
index c88441fbc..cef8a8d50 100644
--- a/test/e2e/run_selinux_test.go
+++ b/test/e2e/run_selinux_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/opencontainers/selinux/go-selinux"
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index d3b77ae73..2350fe1e5 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"golang.org/x/sys/unix"
diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go
index de7663cc2..f62c52099 100644
--- a/test/e2e/run_staticip_test.go
+++ b/test/e2e/run_staticip_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 4f4eb1028..1f9cc3cb0 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	. "github.com/containers/podman/v2/test/utils"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/mrunalp/fileutils"
 	. "github.com/onsi/ginkgo"
diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go
index b82fa7acb..198217433 100644
--- a/test/e2e/run_userns_test.go
+++ b/test/e2e/run_userns_test.go
@@ -7,7 +7,7 @@ import (
 	"os/user"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -52,7 +52,7 @@ var _ = Describe("Podman UserNS support", func() {
 
 	// It essentially repeats the test above but with the `-it` short option
 	// that broke execution at:
-	//     https://github.com/containers/libpod/pull/1066#issuecomment-403562116
+	//     https://github.com/containers/podman/pull/1066#issuecomment-403562116
 	// To avoid a potential future regression, use this as a test.
 	It("podman uidmapping and gidmapping with short-opts", func() {
 		session := podmanTest.Podman([]string{"run", "--uidmap=0:1:5000", "--gidmap=0:200:5000", "-it", "alpine", "echo", "hello"})
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 63aa116f8..c729423a3 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index aae193aa0..de79b2b98 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go
index 1e035c3e5..e1396f1b2 100644
--- a/test/e2e/save_test.go
+++ b/test/e2e/save_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/podman/v2/pkg/rootless"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 65e981bbd..1e7dff697 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"text/template"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index bf62a65f2..78410c9cf 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go
index 37a99076e..ff6ddce7e 100644
--- a/test/e2e/stats_test.go
+++ b/test/e2e/stats_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go
index 417bba321..22cd2e7ae 100644
--- a/test/e2e/stop_test.go
+++ b/test/e2e/stop_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go
index 4c750ee7f..a23d50f29 100644
--- a/test/e2e/system_connection_test.go
+++ b/test/e2e/system_connection_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/containers/common/pkg/config"
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go
index b179a29d4..c184e1d01 100644
--- a/test/e2e/system_df_test.go
+++ b/test/e2e/system_df_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
index 3e16e28d8..1c174e690 100644
--- a/test/e2e/system_reset_test.go
+++ b/test/e2e/system_reset_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index 268f62f5b..b5114e429 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go
index 39d0d24db..72d5cad77 100644
--- a/test/e2e/tag_test.go
+++ b/test/e2e/tag_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go
index f4d1ec857..c182b88e6 100644
--- a/test/e2e/top_test.go
+++ b/test/e2e/top_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go
index c4436962f..c6eb0a6eb 100644
--- a/test/e2e/tree_test.go
+++ b/test/e2e/tree_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go
index 62ebc903f..ecdf27a2e 100644
--- a/test/e2e/trust_test.go
+++ b/test/e2e/trust_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go
index ba8bf5963..a0c41b6f3 100644
--- a/test/e2e/unshare_test.go
+++ b/test/e2e/unshare_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go
index e0e8d060a..50da76f7c 100644
--- a/test/e2e/untag_test.go
+++ b/test/e2e/untag_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
index eb1d1b733..9ddbcc58f 100644
--- a/test/e2e/version_test.go
+++ b/test/e2e/version_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
-	"github.com/containers/libpod/v2/version"
+	. "github.com/containers/podman/v2/test/utils"
+	"github.com/containers/podman/v2/version"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go
index a734cdc1a..8c44e57e4 100644
--- a/test/e2e/volume_create_test.go
+++ b/test/e2e/volume_create_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go
index d7bdaaccc..7ff1d63b4 100644
--- a/test/e2e/volume_inspect_test.go
+++ b/test/e2e/volume_inspect_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go
index 647cb7a49..377b721d0 100644
--- a/test/e2e/volume_ls_test.go
+++ b/test/e2e/volume_ls_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go
index d98b02824..c8521ebe7 100644
--- a/test/e2e/volume_prune_test.go
+++ b/test/e2e/volume_prune_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go
index fd79be126..a072bc824 100644
--- a/test/e2e/volume_rm_test.go
+++ b/test/e2e/volume_rm_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go
index ea693c115..3758acab8 100644
--- a/test/e2e/wait_test.go
+++ b/test/e2e/wait_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/commit.go b/test/endpoint/commit.go
index ff671f572..97e10efb0 100644
--- a/test/endpoint/commit.go
+++ b/test/endpoint/commit.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go
index 3352f36f2..0593b05cd 100644
--- a/test/endpoint/endpoint.go
+++ b/test/endpoint/endpoint.go
@@ -13,8 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	iopodman "github.com/containers/libpod/v2/pkg/varlink"
+	"github.com/containers/podman/v2/pkg/rootless"
+	iopodman "github.com/containers/podman/v2/pkg/varlink"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/gomega/gexec"
 )
diff --git a/test/endpoint/exists_test.go b/test/endpoint/exists_test.go
index 4278f2bfd..f7fa8eb44 100644
--- a/test/endpoint/exists_test.go
+++ b/test/endpoint/exists_test.go
@@ -5,7 +5,7 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/pull_test.go b/test/endpoint/pull_test.go
index 06813125e..b3683b7db 100644
--- a/test/endpoint/pull_test.go
+++ b/test/endpoint/pull_test.go
@@ -5,7 +5,7 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/setup.go b/test/endpoint/setup.go
index f784e5696..56cab06b0 100644
--- a/test/endpoint/setup.go
+++ b/test/endpoint/setup.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	iopodman "github.com/containers/libpod/v2/pkg/varlink"
+	"github.com/containers/podman/v2/pkg/rootless"
+	iopodman "github.com/containers/podman/v2/pkg/varlink"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/endpoint/version_test.go b/test/endpoint/version_test.go
index 90f2c7043..b1c8ad867 100644
--- a/test/endpoint/version_test.go
+++ b/test/endpoint/version_test.go
@@ -5,8 +5,8 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
-	"github.com/containers/libpod/v2/version"
+	. "github.com/containers/podman/v2/test/utils"
+	"github.com/containers/podman/v2/version"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 13fec20ad..04d1e4eac 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -87,7 +87,7 @@ echo $rand        |   0 | $rand
 }
 
 # 'run --rm' goes through different code paths and may lose exit status.
-# See https://github.com/containers/libpod/issues/3795
+# See https://github.com/containers/podman/issues/3795
 @test "podman run --rm" {
 
     run_podman 0 run --rm $IMAGE /bin/true
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index 6a381a187..c8475c3e9 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -42,7 +42,7 @@ load helpers
 # so what we do is start the 'rm' beforehand and monitor the exit status
 # of the 'sleep' container.
 #
-# See https://github.com/containers/libpod/issues/3795
+# See https://github.com/containers/podman/issues/3795
 @test "podman rm -f" {
     rand=$(random_string 30)
     ( sleep 3; run_podman rm -f $rand ) &
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 793c2e5a0..84d3adec1 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -86,7 +86,7 @@ EOF
 
     cat >$tmpdir/Dockerfile <<EOF
 FROM $IMAGE
-ADD https://github.com/containers/libpod/blob/master/README.md /tmp/
+ADD https://github.com/containers/podman/blob/master/README.md /tmp/
 EOF
     run_podman build -t add_url $tmpdir
     run_podman run --rm add_url stat /tmp/README.md
diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats
index 7c2b9bed8..c16e64c58 100644
--- a/test/system/130-kill.bats
+++ b/test/system/130-kill.bats
@@ -11,7 +11,7 @@ load helpers
     # Workaround: run 'env --default-signal sh' instead of just 'sh' in
     # the container. Since env on our regular alpine image doesn't support
     # that flag, we need to pull fedora-minimal. See:
-    #    https://github.com/containers/libpod/issues/5004
+    #    https://github.com/containers/podman/issues/5004
     # FIXME: remove this kludge once we get rid of podman-remote
     local _image=$IMAGE
     local _sh_cmd="sh"
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index c9d1984d0..234bc1187 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -5,7 +5,7 @@
 
 load helpers
 
-# Copied from tsweeney's https://github.com/containers/libpod/issues/4827
+# Copied from tsweeney's https://github.com/containers/podman/issues/4827
 @test "podman networking: port on localhost" {
     skip_if_remote
     random_1=$(random_string 30)
diff --git a/test/system/TODO.md b/test/system/TODO.md
index f0d311626..e47292f26 100644
--- a/test/system/TODO.md
+++ b/test/system/TODO.md
@@ -15,7 +15,7 @@ CI configuration file.](../../.cirrus.yml)
 
 # Execution
 
-When working from a clone of [the libpod repository](https://github.com/containers/libpod),
+When working from a clone of [the libpod repository](https://github.com/containers/podman),
 the main entry-point for humans and automation is `make localsystem`.  When operating
 from a packaged version of the system-tests, the entry-point may vary as appropriate.
 Running the packaged system-tests assumes the version of Podman matches the test
diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go
index c08877204..26bb8b473 100644
--- a/test/utils/common_function_test.go
+++ b/test/utils/common_function_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strings"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go
index fa0b6ec50..d0e2f3d06 100644
--- a/test/utils/podmansession_test.go
+++ b/test/utils/podmansession_test.go
@@ -1,7 +1,7 @@
 package utils_test
 
 import (
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go
index f4d994c3d..538d55d8d 100644
--- a/test/utils/podmantest_test.go
+++ b/test/utils/podmantest_test.go
@@ -3,7 +3,7 @@ package utils_test
 import (
 	"os"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go
index a8a5c6e93..01549f06e 100644
--- a/test/utils/utils_suite_test.go
+++ b/test/utils/utils_suite_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/containers/libpod/v2/test/utils"
+	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"