Merge "SF: Use consistent names for display references"