Models: Update to match SQL

refs #7303
Models: Update MCP models to match SQL

refs #7303