Use external name in auto-tracking