Improvements in name and reference property handling