Reference clean up and view model names update.