Identification of identifiers

Change-Id: I2400975895fca5d61babe8703a237d5038f156dc