Normalizing filenames

Change-Id: I1bf126a9511a2c66d0bcc0f93e1b950c6c71001f