Merge pull request #6909 from rhatdan/podman

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

90 files changed, 201 insertions, 202 deletions

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 38881d3e4..e98a6e907 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go
index 5b339e7c2..ddbd40da8 100644
--- a/libpod/boltdb_state_internal.go
+++ b/libpod/boltdb_state_internal.go
@@ -6,8 +6,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/boltdb_state_linux.go b/libpod/boltdb_state_linux.go
index 4fe0a3eaa..e39b151f7 100644
--- a/libpod/boltdb_state_linux.go
+++ b/libpod/boltdb_state_linux.go
@@ -3,7 +3,7 @@
 package libpod
 
 import (
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/common_test.go b/libpod/common_test.go
index e15e3e7a7..4eeb5c317 100644
--- a/libpod/common_test.go
+++ b/libpod/common_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/lock"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/lock"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/stretchr/testify/assert"
diff --git a/libpod/container.go b/libpod/container.go
index 03358ebdc..9b4ccbd5f 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -13,10 +13,10 @@ import (
 	cnitypes "github.com/containernetworking/cni/pkg/types/current"
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/manifest"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/lock"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/lock"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/utils"
 	"github.com/containers/storage"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 487f75e67..c44e89042 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -10,9 +10,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/libpod/logs"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/logs"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/container_commit.go b/libpod/container_commit.go
index e35ae1148..3386a17bd 100644
--- a/libpod/container_commit.go
+++ b/libpod/container_commit.go
@@ -9,10 +9,10 @@ import (
 	"github.com/containers/buildah/util"
 	is "github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/libpod/image"
-	libpodutil "github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/image"
+	libpodutil "github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/container_config.go b/libpod/container_config.go
index 8a98d6341..301b867fc 100644
--- a/libpod/container_config.go
+++ b/libpod/container_config.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/manifest"
-	"github.com/containers/libpod/v2/pkg/namespaces"
+	"github.com/containers/podman/v2/pkg/namespaces"
 	"github.com/containers/storage"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index a16aea06d..08e95e6dd 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/capabilities"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/container_graph.go b/libpod/container_graph.go
index f38493b4e..39f6ed281 100644
--- a/libpod/container_graph.go
+++ b/libpod/container_graph.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go
index 579b6eead..518f3e74b 100644
--- a/libpod/container_graph_test.go
+++ b/libpod/container_graph_test.go
@@ -3,7 +3,7 @@ package libpod
 import (
 	"testing"
 
-	"github.com/containers/libpod/v2/libpod/lock"
+	"github.com/containers/podman/v2/libpod/lock"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index a0d223c8c..437729c2d 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/driver"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/driver"
+	"github.com/containers/podman/v2/pkg/util"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/runtime-tools/validate"
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 80b160919..a5208a0df 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -12,14 +12,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/ctime"
-	"github.com/containers/libpod/v2/pkg/hooks"
-	"github.com/containers/libpod/v2/pkg/hooks/exec"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/selinux"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/ctime"
+	"github.com/containers/podman/v2/pkg/hooks"
+	"github.com/containers/podman/v2/pkg/hooks/exec"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/selinux"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/containers/storage/pkg/idtools"
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 09bf33728..795611596 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -24,16 +24,16 @@ import (
 	"github.com/containers/buildah/pkg/secrets"
 	"github.com/containers/common/pkg/apparmor"
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/annotations"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/criu"
-	"github.com/containers/libpod/v2/pkg/lookup"
-	"github.com/containers/libpod/v2/pkg/resolvconf"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/annotations"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/criu"
+	"github.com/containers/podman/v2/pkg/lookup"
+	"github.com/containers/podman/v2/pkg/resolvconf"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
+	"github.com/containers/podman/v2/utils"
 	"github.com/containers/storage/pkg/archive"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	User "github.com/opencontainers/runc/libcontainer/user"
diff --git a/libpod/container_internal_unsupported.go b/libpod/container_internal_unsupported.go
index b58a5116b..c22e9a4a4 100644
--- a/libpod/container_internal_unsupported.go
+++ b/libpod/container_internal_unsupported.go
@@ -5,8 +5,8 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/lookup"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/lookup"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/libpod/container_log.go b/libpod/container_log.go
index 80f8e6e50..03cb09052 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/logs"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/logs"
 	"github.com/hpcloud/tail/watch"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
index 00b2039a9..73c2df76e 100644
--- a/libpod/container_log_linux.go
+++ b/libpod/container_log_linux.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/logs"
+	"github.com/containers/podman/v2/libpod/logs"
 	journal "github.com/coreos/go-systemd/v22/sdjournal"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go
index f3b36619e..4106b36e5 100644
--- a/libpod/container_log_unsupported.go
+++ b/libpod/container_log_unsupported.go
@@ -5,8 +5,8 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/logs"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/logs"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go
index 9a522e014..d6d4c6084 100644
--- a/libpod/container_top_linux.go
+++ b/libpod/container_top_linux.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/psgo"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/container_top_unsupported.go b/libpod/container_top_unsupported.go
index 9c0cf0c1c..f911837d2 100644
--- a/libpod/container_top_unsupported.go
+++ b/libpod/container_top_unsupported.go
@@ -2,7 +2,7 @@
 
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 // Top gathers statistics about the running processes in a container. It returns a
 // []string for output
diff --git a/libpod/container_validate.go b/libpod/container_validate.go
index 666ad0aca..d657e3549 100644
--- a/libpod/container_validate.go
+++ b/libpod/container_validate.go
@@ -1,8 +1,8 @@
 package libpod
 
 import (
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index a08cb3de6..8adf3c077 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/manifest"
-	"github.com/containers/libpod/v2/libpod/driver"
+	"github.com/containers/podman/v2/libpod/driver"
 )
 
 // InspectContainerConfig holds further data about how a container was initially
diff --git a/libpod/define/errors.go b/libpod/define/errors.go
index 1e9179353..23d10f527 100644
--- a/libpod/define/errors.go
+++ b/libpod/define/errors.go
@@ -3,8 +3,8 @@ package define
 import (
 	"errors"
 
-	"github.com/containers/libpod/v2/libpod/image"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/image"
+	"github.com/containers/podman/v2/utils"
 )
 
 var (
diff --git a/libpod/define/version.go b/libpod/define/version.go
index da8f88bc1..daa5cf7b2 100644
--- a/libpod/define/version.go
+++ b/libpod/define/version.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	podmanVersion "github.com/containers/libpod/v2/version"
+	podmanVersion "github.com/containers/podman/v2/version"
 )
 
 // Overwritten at build time
diff --git a/libpod/diff.go b/libpod/diff.go
index 25d29866b..5335d701c 100644
--- a/libpod/diff.go
+++ b/libpod/diff.go
@@ -3,7 +3,7 @@ package libpod
 import (
 	"io"
 
-	"github.com/containers/libpod/v2/libpod/layers"
+	"github.com/containers/podman/v2/libpod/layers"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
 )
diff --git a/libpod/events.go b/libpod/events.go
index 3cbde8c5e..b519fe324 100644
--- a/libpod/events.go
+++ b/libpod/events.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/containers/libpod/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/events"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/events/filters.go b/libpod/events/filters.go
index 99feab79c..c50474007 100644
--- a/libpod/events/filters.go
+++ b/libpod/events/filters.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/filters/containers.go b/libpod/filters/containers.go
index b13adb4f5..e38e024d2 100644
--- a/libpod/filters/containers.go
+++ b/libpod/filters/containers.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/timetype"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/timetype"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/filters/pods.go b/libpod/filters/pods.go
index 5fd67dc77..adce9784c 100644
--- a/libpod/filters/pods.go
+++ b/libpod/filters/pods.go
@@ -4,9 +4,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go
index 4818f8dc4..bd55b852e 100644
--- a/libpod/healthcheck.go
+++ b/libpod/healthcheck.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go
index a671414c2..08f37d412 100644
--- a/libpod/healthcheck_linux.go
+++ b/libpod/healthcheck_linux.go
@@ -6,8 +6,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/systemd"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/systemd"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/healthcheck_unsupported.go b/libpod/healthcheck_unsupported.go
index 28b1bc7da..67c952b40 100644
--- a/libpod/healthcheck_unsupported.go
+++ b/libpod/healthcheck_unsupported.go
@@ -2,7 +2,7 @@
 
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 // createTimer systemd timers for healthchecks of a container
 func (c *Container) createTimer() error {
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index a43a94896..c434f0259 100644
--- a/libpod/image/docker_registry_options.go
+++ b/libpod/image/docker_registry_options.go
@@ -6,7 +6,7 @@ import (
 	"github.com/containers/buildah/pkg/parse"
 	"github.com/containers/image/v5/docker/reference"
 	"github.com/containers/image/v5/types"
-	podmanVersion "github.com/containers/libpod/v2/version"
+	podmanVersion "github.com/containers/podman/v2/version"
 )
 
 // DockerRegistryOptions encapsulates settings that affect how we connect or
diff --git a/libpod/image/filters.go b/libpod/image/filters.go
index 11d081ec3..9738a7d5e 100644
--- a/libpod/image/filters.go
+++ b/libpod/image/filters.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/pkg/inspect"
+	"github.com/containers/podman/v2/pkg/inspect"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/image/image.go b/libpod/image/image.go
index e2bd1ad5d..14ffad4bf 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -27,11 +27,11 @@ import (
 	"github.com/containers/image/v5/transports"
 	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/driver"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/inspect"
-	"github.com/containers/libpod/v2/pkg/registries"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/driver"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/inspect"
+	"github.com/containers/podman/v2/pkg/registries"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	digest "github.com/opencontainers/go-digest"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go
index 645f8d3f3..2704b8baf 100644
--- a/libpod/image/image_test.go
+++ b/libpod/image/image_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/go-digest"
diff --git a/libpod/image/prune.go b/libpod/image/prune.go
index 5ad7a9a5e..8c9267650 100644
--- a/libpod/image/prune.go
+++ b/libpod/image/prune.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/timetype"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/timetype"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index f0cde2012..d31f0dbdc 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -18,8 +18,8 @@ import (
 	"github.com/containers/image/v5/transports"
 	"github.com/containers/image/v5/transports/alltransports"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/registries"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/registries"
 	"github.com/hashicorp/go-multierror"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
diff --git a/libpod/image/search.go b/libpod/image/search.go
index ee1ff0312..6bcc6d3f8 100644
--- a/libpod/image/search.go
+++ b/libpod/image/search.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/types"
-	sysreg "github.com/containers/libpod/v2/pkg/registries"
+	sysreg "github.com/containers/podman/v2/pkg/registries"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/semaphore"
diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go
index 794212bf0..2ac05e88d 100644
--- a/libpod/in_memory_state.go
+++ b/libpod/in_memory_state.go
@@ -3,8 +3,8 @@ package libpod
 import (
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/registrar"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/registrar"
 	"github.com/containers/storage/pkg/truncindex"
 	"github.com/pkg/errors"
 )
diff --git a/libpod/info.go b/libpod/info.go
index 68811b199..050d792bc 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -13,11 +13,11 @@ import (
 	"time"
 
 	"github.com/containers/buildah"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/linkmode"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	registries2 "github.com/containers/libpod/v2/pkg/registries"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/linkmode"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	registries2 "github.com/containers/podman/v2/pkg/registries"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/system"
 	"github.com/pkg/errors"
diff --git a/libpod/kube.go b/libpod/kube.go
index 641faf4da..0068427a5 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/lookup"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/lookup"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
diff --git a/libpod/lock/file_lock_manager.go b/libpod/lock/file_lock_manager.go
index adcc42d4e..68ec3986c 100644
--- a/libpod/lock/file_lock_manager.go
+++ b/libpod/lock/file_lock_manager.go
@@ -1,7 +1,7 @@
 package lock
 
 import (
-	"github.com/containers/libpod/v2/libpod/lock/file"
+	"github.com/containers/podman/v2/libpod/lock/file"
 )
 
 // FileLockManager manages shared memory locks.
diff --git a/libpod/lock/shm_lock_manager_linux.go b/libpod/lock/shm_lock_manager_linux.go
index 38972effd..9581607b6 100644
--- a/libpod/lock/shm_lock_manager_linux.go
+++ b/libpod/lock/shm_lock_manager_linux.go
@@ -5,7 +5,7 @@ package lock
 import (
 	"syscall"
 
-	"github.com/containers/libpod/v2/libpod/lock/shm"
+	"github.com/containers/podman/v2/libpod/lock/shm"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/logs/log.go b/libpod/logs/log.go
index 03acadb18..c2545e188 100644
--- a/libpod/logs/log.go
+++ b/libpod/logs/log.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/logs/reversereader"
+	"github.com/containers/podman/v2/libpod/logs/reversereader"
 	"github.com/hpcloud/tail"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index 35e58f916..844748970 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -18,11 +18,11 @@ import (
 
 	cnitypes "github.com/containernetworking/cni/pkg/types/current"
 	"github.com/containernetworking/plugins/pkg/ns"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/v2/pkg/netns"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/rootlessport"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v2/pkg/netns"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/rootlessport"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/networking_unsupported.go b/libpod/networking_unsupported.go
index 69f470ff7..dd72a3fd8 100644
--- a/libpod/networking_unsupported.go
+++ b/libpod/networking_unsupported.go
@@ -2,7 +2,7 @@
 
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 func (r *Runtime) setupRootlessNetNS(ctr *Container) error {
 	return define.ErrNotImplemented
diff --git a/libpod/oci.go b/libpod/oci.go
index c3bf74bba..89850affc 100644
--- a/libpod/oci.go
+++ b/libpod/oci.go
@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"net"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"k8s.io/client-go/tools/remotecommand"
 )
 
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go
index cfcb3f208..622c613d9 100644
--- a/libpod/oci_attach_linux.go
+++ b/libpod/oci_attach_linux.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/v2/pkg/kubeutils"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v2/pkg/kubeutils"
+	"github.com/containers/podman/v2/utils"
 	"github.com/docker/docker/pkg/term"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/oci_attach_unsupported.go b/libpod/oci_attach_unsupported.go
index 6d753296c..cd7c674b2 100644
--- a/libpod/oci_attach_unsupported.go
+++ b/libpod/oci_attach_unsupported.go
@@ -5,7 +5,7 @@ package libpod
 import (
 	"os"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"k8s.io/client-go/tools/remotecommand"
 )
 
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go
index 4196bdcaf..f8d87759a 100644
--- a/libpod/oci_conmon_exec_linux.go
+++ b/libpod/oci_conmon_exec_linux.go
@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/v2/pkg/util"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v2/pkg/util"
+	"github.com/containers/podman/v2/utils"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index bd6af5281..e677ece31 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -21,13 +21,13 @@ import (
 
 	"github.com/containers/common/pkg/config"
 	conmonConfig "github.com/containers/conmon/runner/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/v2/pkg/lookup"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/errorhandling"
+	"github.com/containers/podman/v2/pkg/lookup"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
+	"github.com/containers/podman/v2/utils"
 	pmount "github.com/containers/storage/pkg/mount"
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/coreos/go-systemd/v22/daemon"
diff --git a/libpod/oci_conmon_unsupported.go b/libpod/oci_conmon_unsupported.go
index cd6f0b92c..28d6ef12f 100644
--- a/libpod/oci_conmon_unsupported.go
+++ b/libpod/oci_conmon_unsupported.go
@@ -5,7 +5,7 @@ package libpod
 import (
 	"github.com/containers/common/pkg/config"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 )
 
 const (
diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go
index 1b71bb154..83a6aaf90 100644
--- a/libpod/oci_missing.go
+++ b/libpod/oci_missing.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/tools/remotecommand"
diff --git a/libpod/oci_util.go b/libpod/oci_util.go
index c9165d04b..2ba85c4b3 100644
--- a/libpod/oci_util.go
+++ b/libpod/oci_util.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/options.go b/libpod/options.go
index 41b0d7212..b98ef2221 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -10,11 +10,11 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/namespaces"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/namespaces"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/cri-o/ocicni/pkg/ocicni"
diff --git a/libpod/pod.go b/libpod/pod.go
index 00ba5d53c..76d50db4e 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -4,8 +4,8 @@ import (
 	"net"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/lock"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/lock"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
 )
diff --git a/libpod/pod_api.go b/libpod/pod_api.go
index f2ef81bec..4cb604683 100644
--- a/libpod/pod_api.go
+++ b/libpod/pod_api.go
@@ -3,10 +3,10 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go
index 417cdfd86..b039ce83f 100644
--- a/libpod/pod_internal.go
+++ b/libpod/pod_internal.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/pod_status.go b/libpod/pod_status.go
index d6bd5f211..f4ccf308a 100644
--- a/libpod/pod_status.go
+++ b/libpod/pod_status.go
@@ -1,6 +1,6 @@
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 // GetPodStatus determines the status of the pod based on the
 // statuses of the containers in the pod.
diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go
index f8f7ea015..15ba02389 100644
--- a/libpod/pod_top_linux.go
+++ b/libpod/pod_top_linux.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/psgo"
 )
 
diff --git a/libpod/pod_top_unsupported.go b/libpod/pod_top_unsupported.go
index fb24ae865..fbe6f7331 100644
--- a/libpod/pod_top_unsupported.go
+++ b/libpod/pod_top_unsupported.go
@@ -2,7 +2,7 @@
 
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 // GetPodPidInformation is exclusive to linux
 func (p *Pod) GetPodPidInformation(descriptors []string) ([]string, error) {
diff --git a/libpod/reset.go b/libpod/reset.go
index 2f18cebee..cae4d3a04 100644
--- a/libpod/reset.go
+++ b/libpod/reset.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 96243c808..3021ef3f4 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -12,13 +12,13 @@ import (
 	"github.com/containers/common/pkg/config"
 	is "github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/libpod/image"
-	"github.com/containers/libpod/v2/libpod/lock"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/image"
+	"github.com/containers/podman/v2/libpod/lock"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/docker/pkg/namesgenerator"
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go
index 99b0406fb..03eebeefc 100644
--- a/libpod/runtime_cstorage.go
+++ b/libpod/runtime_cstorage.go
@@ -3,7 +3,7 @@ package libpod
 import (
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index d4508bf37..fa91fe002 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/docker/go-units"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index 370c9d610..72cd26a4e 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -16,10 +16,9 @@ import (
 	ociarchive "github.com/containers/image/v5/oci/archive"
 	"github.com/containers/image/v5/oci/layout"
 	"github.com/containers/image/v5/types"
-
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/image"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/image"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/runtime_img_test.go b/libpod/runtime_img_test.go
index a8cc2c941..6ca4d900b 100644
--- a/libpod/runtime_img_test.go
+++ b/libpod/runtime_img_test.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	sysreg "github.com/containers/libpod/v2/pkg/registries"
+	sysreg "github.com/containers/podman/v2/pkg/registries"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go
index b70ca982d..3dc38f442 100644
--- a/libpod/runtime_migrate.go
+++ b/libpod/runtime_migrate.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go
index ace15a878..6f9135764 100644
--- a/libpod/runtime_pod.go
+++ b/libpod/runtime_pod.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/util"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 24802f89e..4d149a6eb 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -6,10 +6,10 @@ import (
 	"context"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/image"
-	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/v2/pkg/util"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/image"
+	"github.com/containers/podman/v2/pkg/rootless"
+	"github.com/containers/podman/v2/pkg/util"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index 4306140bb..25598ce4d 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/rootless"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/runtime_pod_unsupported.go b/libpod/runtime_pod_unsupported.go
index 6161dd4eb..6976d37c6 100644
--- a/libpod/runtime_pod_unsupported.go
+++ b/libpod/runtime_pod_unsupported.go
@@ -5,7 +5,7 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 )
 
 // NewPod makes a new, empty pod
diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go
index f63d35c22..4c121be12 100644
--- a/libpod/runtime_renumber.go
+++ b/libpod/runtime_renumber.go
@@ -1,7 +1,7 @@
 package libpod
 
 import (
-	"github.com/containers/libpod/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/events"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go
index 4c57da09b..e4e6d87e6 100644
--- a/libpod/runtime_volume.go
+++ b/libpod/runtime_volume.go
@@ -3,8 +3,8 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go
index 84649ef36..32fb1ef44 100644
--- a/libpod/runtime_volume_linux.go
+++ b/libpod/runtime_volume_linux.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/events"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/events"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/runtime_volume_unsupported.go b/libpod/runtime_volume_unsupported.go
index b339819e5..3cdb73aed 100644
--- a/libpod/runtime_volume_unsupported.go
+++ b/libpod/runtime_volume_unsupported.go
@@ -5,7 +5,7 @@ package libpod
 import (
 	"context"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 )
 
 func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool) error {
diff --git a/libpod/state_test.go b/libpod/state_test.go
index ef4f6f2be..373feb6e0 100644
--- a/libpod/state_test.go
+++ b/libpod/state_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/lock"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/lock"
 	"github.com/containers/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/libpod/stats.go b/libpod/stats.go
index b3dffbdb7..e34739626 100644
--- a/libpod/stats.go
+++ b/libpod/stats.go
@@ -7,8 +7,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/cgroups"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/stats_unsupported.go b/libpod/stats_unsupported.go
index 940be156c..749a8bf49 100644
--- a/libpod/stats_unsupported.go
+++ b/libpod/stats_unsupported.go
@@ -2,7 +2,7 @@
 
 package libpod
 
-import "github.com/containers/libpod/v2/libpod/define"
+import "github.com/containers/podman/v2/libpod/define"
 
 // GetContainerStats gets the running stats for a given container
 func (c *Container) GetContainerStats(previousStats *define.ContainerStats) (*define.ContainerStats, error) {
diff --git a/libpod/storage.go b/libpod/storage.go
index e497d0daf..d7862b322 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -6,7 +6,7 @@ import (
 
 	istorage "github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/idtools"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/libpod/util.go b/libpod/util.go
index a8d405b5f..c93ba7919 100644
--- a/libpod/util.go
+++ b/libpod/util.go
@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/utils"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/fsnotify/fsnotify"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/libpod/util_linux.go b/libpod/util_linux.go
index aac206f53..03c3ab061 100644
--- a/libpod/util_linux.go
+++ b/libpod/util_linux.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/cgroups"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/util_test.go b/libpod/util_test.go
index 313854f5a..5b1702592 100644
--- a/libpod/util_test.go
+++ b/libpod/util_test.go
@@ -3,7 +3,7 @@ package libpod
 import (
 	"testing"
 
-	"github.com/containers/libpod/v2/utils"
+	"github.com/containers/podman/v2/utils"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/libpod/util_unsupported.go b/libpod/util_unsupported.go
index 36b70c4c9..4c7a90940 100644
--- a/libpod/util_unsupported.go
+++ b/libpod/util_unsupported.go
@@ -3,7 +3,7 @@
 package libpod
 
 import (
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/volume.go b/libpod/volume.go
index 03299e9d3..0535bf4db 100644
--- a/libpod/volume.go
+++ b/libpod/volume.go
@@ -3,8 +3,8 @@ package libpod
 import (
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/libpod/lock"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/lock"
 )
 
 // Volume is a libpod named volume.
diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go
index 85848f84f..c8b20b8f1 100644
--- a/libpod/volume_inspect.go
+++ b/libpod/volume_inspect.go
@@ -3,7 +3,7 @@ package libpod
 import (
 	"time"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 )
 
 // InspectVolumeData is the output of Inspect() on a volume. It is matched to
diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go
index 1aa548521..95cb752e0 100644
--- a/libpod/volume_internal.go
+++ b/libpod/volume_internal.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go
index 75333d0b4..bbf47f124 100644
--- a/libpod/volume_internal_linux.go
+++ b/libpod/volume_internal_linux.go
@@ -6,8 +6,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/v2/pkg/rootless"
+	"github.com/containers/podman/v2/libpod/define"
+	"github.com/containers/podman/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
diff --git a/libpod/volume_internal_unsupported.go b/libpod/volume_internal_unsupported.go
index 40b199c75..ddbdbd8b6 100644
--- a/libpod/volume_internal_unsupported.go
+++ b/libpod/volume_internal_unsupported.go
@@ -3,7 +3,7 @@
 package libpod
 
 import (
-	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/podman/v2/libpod/define"
 )
 
 func (v *Volume) mount() error {