Finish fixing guard controller naming