Update file paths and names after c49721950cb3d897b35f08bf871239308680b18e

Change-Id: I2798800689809c8dfc3edede337f7667ff3248a1