Properly mangle file names

Change-Id: I49c0f82e8c06f056198eb64b8369d83403b74321
12 files changed