Updated for name field.(DHH-357)