Change some files names

Change-Id: I3c7afd6be826ca611ff368956a3e84ebf8b3d6d0