Remove file base name collisions.

Change-Id: I1bf9002c159563d0e5238b26d1515ef305d416dc
31 files changed