finish CriticalError rename