Refactoring of lib names