more fixes related to caps
removed firstname tag from intel template