Models: Update MCP models to match SQL

refs #7303