Chnaged some controller and view names.