Updated build scripts to improve file naming