remove conflicting image name needed for dist_xo

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
Fix more filename conflicts

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
Fix more filenames

Signed-off-by: Daniel Francis <francis@sugarlabs.org>