Update syntax for GenerateId & Id

Change-Id: Ib9e4ce140f0e17f48335ce47683cd7246b4ff4da