Image classes renamed