Merge "Always use the canonical extension name when necessary"