Update models to match gift fold models
Still matching up proper model names in views
Satisfy e2e
Update pageSpec