Add description to identifiers

Change-Id: I1cd170c5c2786ce3b67db729e7b3991d1b493060