(Bug 5184) Standardization of props

-sorted properties in standard order in TR
-renamed props per fu's suggestion in core2