Major update: libray name changed to KafNafParser and kaf/naf adaptations