Added name and name sort

Change-Id: I781a1723ad83c1ddb1f68a718426580e0675c942