Update to check for new controller file names, affixed with Controller