Sync with libnpa: Rename functions for Chaos;Head API compatibility