Fix renaming of guards