diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common
index 5ede8b5..7fea622 100644
--- a/molecules/forensicxfce.common
+++ b/molecules/forensicxfce.common
@@ -107,7 +107,7 @@ packages_to_add:
 	sys-apps/gnome-disk-utility,
 	sys-block/gparted,
 	sys-fs/extundelete,
-	www-client/chromium,
+	www-client/google-chrome,
 	x11-libs/xcb-util-image,
 	x11-libs/xcb-util-keysyms,
 	x11-libs/xcb-util-wm,
diff --git a/molecules/gnome.common b/molecules/gnome.common
index 88f284e..74d4091 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -134,8 +134,7 @@ packages_to_add:
 	sys-fs/ntfs3g,
 	sys-power/acpid,
 	sys-power/cpufrequtils,
-	www-client/chromium,
-	www-plugins/chrome-binary-plugins,
+	www-client/google-chrome,
 	x11-apps/xdm,
 	x11-libs/libva-intel-driver,
 	x11-libs/libva-vdpau-driver,
diff --git a/molecules/kde.common b/molecules/kde.common
index 0bea7e4..28ad943 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -289,8 +289,7 @@ packages_to_add:
 	sys-fs/ntfs3g,
 	sys-power/acpid,
 	sys-power/cpufrequtils,
-	www-client/chromium,
-	www-plugins/chrome-binary-plugins,
+	www-client/google-chrome,
 	x11-apps/xdm,
 	x11-libs/libva-intel-driver,
 	x11-libs/libva-vdpau-driver,
diff --git a/molecules/mate.common b/molecules/mate.common
index 15fde52..918685b 100644
--- a/molecules/mate.common
+++ b/molecules/mate.common
@@ -67,8 +67,7 @@ packages_to_add:
 	sys-block/parted,
 	sys-fs/ntfs3g,
 	sys-power/cpufrequtils,
-	www-client/chromium,
-	www-plugins/chrome-binary-plugins,
+	www-client/google-chrome,
 	x11-misc/magneto-gtk,
 	x11-misc/lightdm-base,
 	x11-misc/lightdm-gtk-greeter,
diff --git a/molecules/xfce.common b/molecules/xfce.common
index 2f0fd1b..c0254f6 100644
--- a/molecules/xfce.common
+++ b/molecules/xfce.common
@@ -99,8 +99,7 @@ packages_to_add:
 	sys-block/parted,
 	sys-fs/ntfs3g,
 	sys-power/cpufrequtils,
-	www-client/chromium,
-	www-plugins/chrome-binary-plugins,
+	www-client/google-chrome,
 	x11-libs/gksu,
 	x11-libs/libva-intel-driver,
 	x11-libs/libva-vdpau-driver,
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 3586487..3b0a38b 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -323,7 +323,6 @@ prepare_mate() {
 
 prepare_e17() {
 	setup_default_xsession "enlightenment"
-	# E17 spin has chromium installed
 	# Not using lxdm for now
 	# TODO: improve the lines below
 	# Make sure enlightenment is selected in lxdm