FORGE-1600: Renamed for consistency