Update of goodness of fit naming and various refinements