viewmodel name refactor