fitness function names fixup