Update view controller instance name. Regroup classes.