Fix names for labels and images

Change-Id: I395001c94a78d3c3825a58d930e6983fcd97c985