Fix build scripts as result of all the renaming work