Update lib and correct namespace