Make views obvious from the filename
Rename internal objects to match View filename