Improve ViewModel names.