Fix Orig lib name issue: step 1
Fix Orig lib name issue: step 2