Fix naming inconsistencies in pages area, remove template view.