note '-' and '_' separators

Change-Id: Ic2c0601854f0ea73c6003fe264fed06ce2a13ebe