Fix name collision handling in restore Upstream-commit: 9ced849832dc7a5f15f7fda6d2f3bdb38bbf5483 Component: engine