Set canonical name correctly Upstream-commit: e46c7060cccb55320ceb2596743f4b57a8ca6a03 Component: engine