changed Beta1D and Beta2D to Moffat1D and Moffat2D per issue 3029

these changes are for issue #3029 
Maybe "Moffat" here instead, and in a couple places below.