FIXUP rename core-counting sub