Refactoring

View classes do have the MM-prefix now.