Update and rename SqrtX to Sqrt