Convert name to displayName if no displayName available
Reworked datablock style