Mention "or rename" again in error-message. Upstream-commit: ff401263897a8573374989db8e51d3525fa194cf Component: engine