Added tag names checking

Change-Id: I5347ddaa400059c31e3c13c41cd89890c2b544e9