Fix residual name changes.