Didn't you just rename EnyoView to ModelView?