more rename (PropertyBag)
some clean up