Name changes for latest Forge