Changed labels from x/z to primary/intermediate