get properties refactor
fixed name changing