chaningn all names to match with chaospy.