Fixed naming conflict in Controller