Fix naming issues with limited memory build.