More informative error message on name collisions Upstream-commit: 75dd1663e0be37fc7a29ae3eaf55a27f7f1b2d9d Component: engine