Use getNamePropertyInstance everywhere