Continue reforming error message support. In this phase, rename