Another rename + build script update