Merge "Remove references to old project name from common files" into integration