Fix NaN kick, rename