Update to forge 1126

Some renames