Merge "Bitmap naming clean-up." into gingerbread