Rename files and update manifest.in.

Change-Id: Ie86ab9922f460d92b3dd8d18a4a36725c87656d9