Fix fn names