Name Change for trinity support
followup name changes