Missed a few evil-surround renamings