Don't display file name with underscores

Change-Id: Iddc849bd16abbcb956d3d2bcdf17559b776e12a8
Merge "Don't display file name with underscores"