VIVO-774 Show correct property name

Also, pre-populate the custom entry generator if the base property has one.