update names and paths

Change-Id: Ib114f92cbfbf204b49930e8d984c9be9e18563fb