From kaflib-naf to naflib