diff --git a/molecules/sabayon-amd64+x86-gnome.spec b/molecules/sabayon-amd64+x86-gnome.spec
index c2f4ea9..28ab968 100644
--- a/molecules/sabayon-amd64+x86-gnome.spec
+++ b/molecules/sabayon-amd64+x86-gnome.spec
@@ -33,7 +33,7 @@ iso_title: Sabayon GNOME
 extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform efi -eltorito-boot boot/grub/efi.img
 
 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example
-%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_G.iso
+%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_GNOME.iso
 
 # Post-ISO building script, called after ISO image generation.    
 %env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
@@ -70,7 +70,7 @@ execute_repositories_update: no
 release_desc: amd64+x86 GNOME
 
 # Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_G.iso
+%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_GNOME.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64+x86_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64+x86_GNOME.iso
diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec
index 3e98a1c..13f1e2d 100644
--- a/molecules/sabayon-amd64-gnome.spec
+++ b/molecules/sabayon-amd64-gnome.spec
@@ -11,4 +11,4 @@ release_desc: amd64 GNOME
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_GNOME.iso
diff --git a/molecules/sabayon-x86-gnome.spec b/molecules/sabayon-x86-gnome.spec
index 3b59a6f..a48b905 100644
--- a/molecules/sabayon-x86-gnome.spec
+++ b/molecules/sabayon-x86-gnome.spec
@@ -13,4 +13,4 @@ release_desc: x86 GNOME
 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
 
 # Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_G.iso
+%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_GNOME.iso
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 666a49c..6141916 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -99,8 +99,8 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then
 		"sabayon-x86-hardenedserver.spec"
 	)
 	REMASTER_SPECS_ISO+=(
-		"${DISTRO_NAME}_${ISO_TAG}_amd64_G.iso"
-		"${DISTRO_NAME}_${ISO_TAG}_x86_G.iso"
+		"${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso"
+		"${DISTRO_NAME}_${ISO_TAG}_x86_GNOME.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_amd64_K.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_x86_K.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_amd64_MATE.iso"
@@ -212,8 +212,8 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then
 		"sabayon-x86-hardenedserver.spec"
 	)
 	REMASTER_SPECS_ISO+=(
-		"${DISTRO_NAME}_${ISO_TAG}_amd64_G.iso"
-		"${DISTRO_NAME}_${ISO_TAG}_x86_G.iso"
+		"${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso"
+		"${DISTRO_NAME}_${ISO_TAG}_x86_GNOME.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_amd64_K.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_x86_K.iso"
 		"${DISTRO_NAME}_${ISO_TAG}_amd64_MATE.iso"