Refactoring to ensure that newly added screens/viewmodels accurately follow naming patterns. (commit: 21c9d20)