update names and paths

Change-Id: I3cc8f9d5b465ee8feb5b1826af77d455475875cf