Renamed images and ids to be more general (non Vis-specific)