Added context and reuse of the name field.

Change-Id: I2fea532be8838a3e66845403e40b70bfd410d627