Add name template attributes

Change-Id: I861451d137c2436ae8bb792570751d1ddb754906
Merge "Add name template attributes"