more consistent labeling, RT#4583