Regex on the name

Change-Id: If07c33862c81a000aafa3c41e5adfb01934878e3