diff --git a/profiles/desc/nanox.desc b/profiles/desc/nanox.desc
new file mode 100644
index 0000000000..d83e3d277c
--- /dev/null
+++ b/profiles/desc/nanox.desc
@@ -0,0 +1,9 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of NANOX USE_EXPAND flags.
+
+debug - Enable generation of debug version
+instrumentation - Enable generation of instrumentation version
+instrumentation-debug - Enable generation of instrumentation-debug version
+performance - Enable generation of performance version
diff --git a/sys-cluster/nanox/metadata.xml b/sys-cluster/nanox/metadata.xml
index d1592a53aa..d895502d85 100644
--- a/sys-cluster/nanox/metadata.xml
+++ b/sys-cluster/nanox/metadata.xml
@@ -25,10 +25,6 @@ The main purpose of Nanos++ RTL is to be used in research of parallel programmin
 		<flag name="hwloc">Enable <pkg>sys-apps/hwloc</pkg> support</flag>
 		<flag name="memkind">Enables <pkg>dev-libs/memkind</pkg> support</flag>
 		<flag name="memtracker">Enables Memtracker module</flag>
-		<flag name="nanox-debug">Enable generation of debug version</flag>
-		<flag name="nanox-instrumentation">Enable generation of instrumentation version</flag>
-		<flag name="nanox-instrumentation-debug">Enable generation of instrumentation-debug version</flag>
-		<flag name="nanox-performance">Enable generation of performance version</flag>
 		<flag name="opencl">Enables openCL support</flag>
 		<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
 		<flag name="resiliency">Enables task-level resiliency</flag>
diff --git a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
index ec0e42602b..9d5a990697 100644
--- a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
+++ b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,10 +22,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE_NANOX="
-	nanox-debug
-	+nanox-instrumentation
-	nanox-instrumentation-debug
-	+nanox-performance
+	nanox_debug
+	+nanox_instrumentation
+	nanox_instrumentation-debug
+	+nanox_performance
 "
 IUSE="${IUSE_NANOX} allocator ayudame dlb +extrae gasnet hwloc memkind memtracker mpi opencl papi sqlite resiliency task-callback +threads"
 
@@ -52,8 +52,8 @@ DEPEND="
 PATCHES=( "${FILESDIR}/${PN}-no-Werror.patch" )
 REQUIRED_USE="
 	|| ( ${IUSE_NANOX//+/} )
-	nanox-instrumentation? ( extrae )
-	nanox-instrumentation-debug? ( extrae )
+	nanox_instrumentation? ( extrae )
+	nanox_instrumentation-debug? ( extrae )
 "
 
 src_prepare() {
@@ -79,10 +79,10 @@ src_configure() {
 
 		$(use_enable allocator)
 		$(use_enable memtracker)
-		$(use_enable nanox-debug debug)
-		$(use_enable nanox-instrumentation instrumentation)
-		$(use_enable nanox-instrumentation-debug instrumentation-debug)
-		$(use_enable nanox-performance performance)
+		$(use_enable nanox_debug debug)
+		$(use_enable nanox_instrumentation instrumentation)
+		$(use_enable nanox_instrumentation-debug instrumentation-debug)
+		$(use_enable nanox_performance performance)
 		$(use_enable resiliency)
 		$(use_enable task-callback)
 		$(use_enable threads ult)