diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild b/app-emulation/cri-o/cri-o-1.17.1.ebuild
index f8d6d2c59f40d..d528603cf5242 100644
--- a/app-emulation/cri-o/cri-o-1.17.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.17.1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
+	!<app-emulation/podman-1.3.2-r1"
 
 src_prepare() {
 	default
diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild b/app-emulation/cri-o/cri-o-1.18.3.ebuild
index 96ab6f0d2857f..bed85815a8972 100644
--- a/app-emulation/cri-o/cri-o-1.18.3.ebuild
+++ b/app-emulation/cri-o/cri-o-1.18.3.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
+	!<app-emulation/podman-1.3.2-r1"
 
 src_prepare() {
 	default
diff --git a/app-emulation/cri-o/cri-o-1.19.0.ebuild b/app-emulation/cri-o/cri-o-1.19.0.ebuild
index 35566324ab434..d1678516f2e94 100644
--- a/app-emulation/cri-o/cri-o-1.19.0.ebuild
+++ b/app-emulation/cri-o/cri-o-1.19.0.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
+	!<app-emulation/podman-1.3.2-r1"
 
 src_prepare() {
 	default
diff --git a/app-emulation/libpod/Manifest b/app-emulation/podman/Manifest
similarity index 100%
rename from app-emulation/libpod/Manifest
rename to app-emulation/podman/Manifest
diff --git a/app-emulation/libpod/files/podman.initd b/app-emulation/podman/files/podman.initd
similarity index 100%
rename from app-emulation/libpod/files/podman.initd
rename to app-emulation/podman/files/podman.initd
diff --git a/app-emulation/libpod/files/podman.logrotated b/app-emulation/podman/files/podman.logrotated
similarity index 100%
rename from app-emulation/libpod/files/podman.logrotated
rename to app-emulation/podman/files/podman.logrotated
diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/podman/metadata.xml
similarity index 62%
rename from app-emulation/libpod/metadata.xml
rename to app-emulation/podman/metadata.xml
index 8b673ef7a51ac..64831477a7663 100644
--- a/app-emulation/libpod/metadata.xml
+++ b/app-emulation/podman/metadata.xml
@@ -6,10 +6,13 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<longdescription lang="en">
-		libpod provides a library for applications looking to use the
-		Container Pod concept popularized by Kubernetes. libpod also
-		contains a tool called podman for managing Pods, Containers,
-		and Container Images.
+		Podman (the POD MANager) is a tool for managing containers
+		and images, volumes mounted into those containers, and pods
+		made from groups of containers. Podman is based on libpod,
+		a library for container lifecycle management that is also
+		contained in this repository. The libpod library provides
+		APIs for managing containers, pods, container images,
+		and volumes.
 	</longdescription>
 	<use>
 		<flag name="apparmor">
@@ -28,6 +31,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">containers/libpod</remote-id>
+		<remote-id type="github">containers/podman</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/libpod/libpod-2.2.1.ebuild b/app-emulation/podman/podman-2.2.1.ebuild
similarity index 95%
rename from app-emulation/libpod/libpod-2.2.1.ebuild
rename to app-emulation/podman/podman-2.2.1.ebuild
index fc16a6b258ee1..bca75d6fddbdc 100644
--- a/app-emulation/libpod/libpod-2.2.1.ebuild
+++ b/app-emulation/podman/podman-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -131,9 +131,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
+	PODMAN_ROOTLESS_UPGRADE=false
 	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+		has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
 	fi
 }
 
@@ -148,7 +148,7 @@ pkg_postinst() {
 		elog "cp /etc/containers/policy.json{.example,}"
 		want_newline=true
 	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
 		${want_newline} && elog ""
 		elog "For rootless operation, you need to configure subuid/subgid"
 		elog "for user running podman. In case subuid/subgid has only been"
diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index 38b0edfd30fdb..0cd6d8950281a 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -1 +1,2 @@
 slotmove >=sys-auth/libfprint-1.90 0 2
+move app-emulation/libpod app-emulation/podman