diff --git a/net-im/element-desktop/Manifest b/net-im/element-desktop/Manifest
new file mode 100644
index 0000000..a13e5e1
--- /dev/null
+++ b/net-im/element-desktop/Manifest
@@ -0,0 +1,2 @@
+DIST element-desktop-1.7.2.tar.gz 1881622 BLAKE2B 3536035684953f3b16952febab9372116c71b84fc857a78ef83adaa1c11098a6363b1f8c1162b2bb5af98a50c9105df42c6f7791d5f02338286963f7c5621030 SHA512 bb22ef4c5876d9f290340d1b6212523e32cf6a8049d06aa5eae33b9e02547910a4e07f697fddc66be52a5ab4611e45596f0059c36393967b677a6f2c01605db8
+EBUILD element-desktop-1.7.2.ebuild 2413 BLAKE2B cd1f6c642f3502ca26cba811be8abf9d99c4b1db329f0d3f33c1e1aab97c3fda210e64d7d22e1cf9a1fe5ceff87bbd0ab22f9f49d895a7339ac2d50d35d9899a SHA512 7c39bc91b118588ab26354f149c2bb784c3cafcfda445aa2085591b6ec75801dea8a4b90492d3bd47c8e6a5d6de63a7b6bf48a6c1204f9dffa6ed86e53b06937
diff --git a/net-im/riot-desktop/riot-desktop-1.6.2.ebuild b/net-im/element-desktop/element-desktop-1.7.2.ebuild
similarity index 78%
rename from net-im/riot-desktop/riot-desktop-1.6.2.ebuild
rename to net-im/element-desktop/element-desktop-1.7.2.ebuild
index 5e03696..a2118f8 100644
--- a/net-im/riot-desktop/riot-desktop-1.6.2.ebuild
+++ b/net-im/element-desktop/element-desktop-1.7.2.ebuild
@@ -11,7 +11,7 @@
 #   FEATURES="${FEATURES} -network-sandbox"
 #
 # * /etc/portage/package.env/package.env:
-#   net-im/riot-desktop networkaccess
+#   net-im/element-desktop networkaccess
 #
 # this avoids disabling `network-sandbox` globally.
 
@@ -19,11 +19,12 @@
 EAPI=7
 
 DESCRIPTION="A glossy Matrix collaboration client for desktop"
-HOMEPAGE="https://riot.im"
+HOMEPAGE="https://element.io"
 
 MY_PV="${PV/_rc/-rc.}"
 MY_P="$PN-$MY_PV"
-S="${WORKDIR}/${MY_P}"
+TMP_P="riot-desktop-$MY_PV"
+S="${WORKDIR}/${TMP_P}"
 
 if [[ ${PV} == "9999" ]]; then
 	SCM="git-r3"
@@ -44,12 +45,12 @@ SLOT="0"
 IUSE="+native-extensions"
 REQUIRED_USE=""
 
-# get dependencies via readelf -a riot-desktop...
+# get dependencies via readelf -a element-desktop...
 RDEPEND="
 	x11-libs/cairo
 	x11-libs/pango
 	media-libs/fontconfig
-	=net-im/riot-web-${PV}
+	=net-im/element-web-${PV}
 "
 DEPEND="
 	${RDEPEND}
@@ -61,7 +62,7 @@ DEPEND="
 src_prepare() {
 	default
 
-	sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' ${S}/riot.im/release/config.json
+	sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' ${S}/element.io/release/config.json
 	yarn install || die "yarn module installation failed"
 }
 
@@ -83,23 +84,23 @@ src_install() {
 	pushd ${S}/dist/linux-unpacked
 	doins -r locales resources
 	doins *.{pak,bin,dat}
-	# `ldd riot-desktop` says only libffmpeg.so is needed
+	# `ldd element-desktop` says only libffmpeg.so is needed
 	doins libffmpeg.so
 	doexe ${PN}
 	popd
 
 	# symlink to the actual webapp
-	dosym ../../../usr/share/webapps/riot-web opt/${PN}/resources/webapp
+	dosym ../../../usr/share/webapps/element-web opt/${PN}/resources/webapp
 
 	# config symlink
-	dosym /etc/${PN}/config.json etc/webapps/riot-web/config.json
+	dosym /etc/${PN}/config.json etc/webapps/element-web/config.json
 	insinto etc/${PN}
-	doins ${S}/riot.im/release/config.json
+	doins ${S}/element.io/release/config.json
 
 	# symlink to main binary
 	dosym ../../opt/${PN}/${PN} usr/bin/${PN}
 
-	make_desktop_entry /usr/bin/${PN} Riot riot-im.svg
+	make_desktop_entry /usr/bin/${PN} Element element
 }
 
 pkg_postinst() {
diff --git a/net-im/element-web/Manifest b/net-im/element-web/Manifest
new file mode 100644
index 0000000..eaa5dea
--- /dev/null
+++ b/net-im/element-web/Manifest
@@ -0,0 +1,2 @@
+DIST element-web-1.7.2.tar.gz 1177081 BLAKE2B 5e63cee397498f191425c8462ac9584f945f9866e084dd0a144a13af7996d2e6cdb65a3e280e53b75e93e68f41ab5b02be80e17a46f0cca23cfd552bb6d9a797 SHA512 10efa93716d7e7d6db2cbb3ac753b975fcf2df7e36121c6546e67528a1b45e5403f3f7454dcaeb622424caa26914e89d4f1ae2296bd35b812362043ab78dab47
+EBUILD element-web-1.7.2.ebuild 2146 BLAKE2B e560d1f4039b630bc788cd344231223b842e5fe9f5f4bfeb856a1d017e9a841683f105dcc588e1804dbd5fccd67fdca4a4bb5c8a9c16db9a16dd22a571ad358a SHA512 ec9dec6367b04aacf33b6117d46b453380bd9e653260083bc5821b23f328aae8c0b663fb4ac053696f921c7499d8a202148a1596114ff05ec2868651d0b989f2
diff --git a/net-im/riot-web/riot-web-1.6.2.ebuild b/net-im/element-web/element-web-1.7.2.ebuild
similarity index 81%
rename from net-im/riot-web/riot-web-1.6.2.ebuild
rename to net-im/element-web/element-web-1.7.2.ebuild
index 747bcbc..f6731fb 100644
--- a/net-im/riot-web/riot-web-1.6.2.ebuild
+++ b/net-im/element-web/element-web-1.7.2.ebuild
@@ -11,7 +11,7 @@
 #   FEATURES="${FEATURES} -network-sandbox"
 #
 # * /etc/portage/package.env/package.env:
-#   net-im/riot-web networkaccess
+#   net-im/element-web networkaccess
 #
 # this avoids disabling `network-sandbox` globally.
 
@@ -19,11 +19,12 @@
 EAPI=7
 
 DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://riot.im"
+HOMEPAGE="https://element.io/"
 
 MY_PV="${PV/_rc/-rc.}"
 MY_P="$PN-$MY_PV"
-S="${WORKDIR}/${MY_P}"
+TMP_P="riot-web-$MY_PV"
+S="${WORKDIR}/${TMP_P}"
 
 if [[ ${PV} == "9999" ]]; then
 	SCM="git-r3"
@@ -45,7 +46,6 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE=""
 
-# get dependencies via readelf -a riot-web...
 RDEPEND="
 	x11-libs/cairo
 	x11-libs/pango
@@ -94,13 +94,13 @@ src_install() {
 
 	insinto etc/webapps/${PN}
 	doins config.sample.json
-	dosym etc/webapps/${PN}/config.json ../../../usr/share/webapps/${PN}/config.json
+	dosym /etc/webapps/${PN}/config.json usr/share/webapps/${PN}/config.json
 
-	newicon res/themes/riot/img/logos/riot-im-logo.svg riot-im.svg
+	newicon res/themes/element/img/logos/element-logo.svg element.svg
 }
 
 
 pkg_postinst() {
-	einfo "riot-web only contains a static webapp"
-	einfo "for the electron-executable, please install riot-desktop"
+	einfo "element-web only contains a static webapp"
+	einfo "for the electron-executable, please install element-desktop"
 }
diff --git a/net-im/riot-desktop/Manifest b/net-im/riot-desktop/Manifest
deleted file mode 100644
index 349c1dc..0000000
--- a/net-im/riot-desktop/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST riot-desktop-1.6.2.tar.gz 401236 BLAKE2B 0df29f11778d85988b4368de974c2e3ce62b3dfdda4b0c063def27d6bad9ed01814fb85c195aedfc0133b5da34fb49ddb5935fd0ef7149f274f76fcb75056791 SHA512 9709a4704aaef0e670c734c17d2499cd3299cd6cfc3160cda2a9f88954823a47874d619442e25c4f4a35182174db939f95017977af62037471daeae7b61ee666
-EBUILD riot-desktop-1.6.2.ebuild 2358 BLAKE2B 0da8789dd31cf5291d190a18e36f1504df0638e3b920c46331d1c0a5d4049c8fec64b8fde857ad1ed30be39600669e41770fe8f7f8ca124bba49c1828ee73d32 SHA512 0496b78fac5ce8d93379617af40aae48d6fe3a9867f9843a2d97f54dfbaf848518716d8de71cb28f2c3e71e7fefb144bcb923957c151dc92066e31a1f4ff245c
diff --git a/net-im/riot-web/Manifest b/net-im/riot-web/Manifest
deleted file mode 100644
index cd10936..0000000
--- a/net-im/riot-web/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST riot-web-1.6.2.tar.gz 1150424 BLAKE2B 47436ac75160338abe2c38991256fb4ee6587433d6635e36d761c2d01c35cbc8a9585756da1bd9681c9385828661e0b4d9eeb8fd49bf6b6d70329b1aa205b024 SHA512 0b6287f806f14b7408315d34935b7f7f5f36d23e3bf5870141747ec988c9f30acfc74281103369b7b2ee30709c4a89c998c7855a917fd0cedd455dd0156128ec
-EBUILD riot-web-1.6.2.ebuild 2159 BLAKE2B daac5ad125db9b6e100290de1bb9c047cb911aa0cb8c7b206c98974fe7d8458fd14fee93bd57181080da4eae1e686cd22331f521e91028bba1d9a8bf8d404823 SHA512 b48de6ed23f1be7e1dc3dddada2188adadc28680c03e93f189d88b3647944f74ac93b2ae7dd9b278d2647f9c2b9a09c75c55f8bebc0f07a10ba279c0d44377db