Issue #2248505 by leevingo, Berdir: Improve property definition labels.