added logic to update name field of dataproperties when needed.
version up for test version
merge in from dataproperties fix