Merge "Consistent names for reference_mode functions."