Fix filenames

Change-Id: Ia43c56b5f84616f5cff9bcdb78cf020c26564237