Rebasing primary source to fot new domain spec