Minor changes to view models namespace