Change some files names

Change-Id: If3abbe81233748e8250c534d49f46587bd8cc44f