Fix fn name and add missing c src files