Code clean up on acceptance test projects
Fix build scripts as result of all the renaming work