Changed controllers's names