Replaced names, realized full MVC