Correct some filenames

Change-Id: I1fd151723bf74db989767fab895663d8243ea194