Remove hardcoded '-' as concatenation char between prefix and name

Change-Id: I47e2f9ae2f7556346bb0186689bd394b2fdd4e6a