fix Q3/Z5 naming