fix: #3558621 Use canonical type names

Closes #3558621

Merge request reports

Loading