diff --git a/gnome-base/gnome-shell/gnome-shell-42.2.ebuild b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
index fff3a41b6682c..ecb0ba4d4f4d8 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
@@ -120,7 +120,7 @@ RDEPEND="${DEPEND}
 PDEPEND="
 	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
+	browser-extension? ( gnome-extra/gnome-browser-connector )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-shell/gnome-shell-42.3.1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.3.1.ebuild
index 3894328e8ea01..c58cbac885b3b 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.3.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.3.1.ebuild
@@ -125,7 +125,7 @@ RDEPEND="${DEPEND}
 PDEPEND="
 	>=gnome-base/gdm-3.5[introspection(+)]
 	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
+	browser-extension? ( gnome-extra/gnome-browser-connector )
 "
 BDEPEND="
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index d018015fff8ab..b841285bc3371 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -14,7 +14,7 @@
 </longdescription>
 <use>
 	<flag name="browser-extension">Ensure the presence of extensions.gnome.org
-		native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
+		native connector <pkg>gnome-extra/gnome-browser-connector</pkg></flag>
 	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
 		and suspend support.</flag>
 	<flag name="ibus">Enable support for enhanced input methods through
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/gnome-browser-connector/Manifest
similarity index 100%
rename from gnome-extra/chrome-gnome-shell/Manifest
rename to gnome-extra/gnome-browser-connector/Manifest
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild b/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
similarity index 90%
rename from gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
rename to gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
index 8198915b17bf0..950eda443d11c 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
+++ b/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+MY_PN="chrome-gnome-shell"
+MY_P="${MY_PN}-${PV}"
 
 inherit cmake python-single-r1
 
 DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/gnome-browser-connector/metadata.xml
similarity index 74%
rename from gnome-extra/chrome-gnome-shell/metadata.xml
rename to gnome-extra/gnome-browser-connector/metadata.xml
index 3358e47dd7f9a..69a4f4e1a20ca 100644
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ b/gnome-extra/gnome-browser-connector/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
-		<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
+		<bugs-to>https://gitlab.gnome.org/nE0sIghT/gnome-browser-connector/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 35e1e701f4659..b7b7e209b1da3 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -22,7 +22,7 @@ gnome-base/gdm
 >=gnome-base/gnome-light-3.36.5
 >=gnome-base/gnome-shell-3.38
 >=gnome-base/librsvg-2.41
-gnome-extra/chrome-gnome-shell
+gnome-extra/gnome-browser-connector
 gnome-extra/gnome-tweaks
 media-libs/libavif
 media-video/rav1e
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 3450a7c4f9ac0..d0aa696948573 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -8,3 +8,4 @@ move games-action/brutal-legend games-action/brutal-legend-hb
 move kde-apps/kdesdk-kioslaves dev-util/kio-perldoc
 move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf
 move net-misc/cni-plugins app-containers/cni-plugins
+move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector