renamed several viewmodel files