Fixing build script and package rename