Rename main view controller
Simplify the objects being thrown around.