Avoid mixing dash and underscore.

Change-Id: I7f8b6c5397d789c3cb2fdbae50205610c5595af7
Signed-off-by: Yann Gautier <yann.gautier@st.com>