Support getting default name from property
Fix various things