Make current lib naming consistent.