Update to latest forge with mcp naming changes

Might as well keep up to date with forge changes in case an RB comes
out.