Optimize some wrong usage and spelling Upstream-commit: 2dcb77b24c80dd95b52358c92436f68f2a33eb01 Component: engine