Fix BAD_ACCESS; rename images