removing some naming conflicts that hapen when trying to re-enable amalgamation builds.
make build script figure out how many jobs to run