Clean-up of naming of the new Contact/Name columns

Change-Id: I52316b365c4299dddbfb2972459a37893413bd8b
1 file changed