Also renames the images for consistency. Bug: 16369104 Change-Id: I19f97ae22cb2ee4f7db210f083badc1a30520b44