Change names again to match the build script