adapt to label name changes, fixes #507