17539 - consistent labeling in public interface.