Refactor lib naming