Renamed Models and corresponding views for app wizard