Changed interval variable names to make sense with the new naming
scheme.  eg Xamdp --> Xice, apdps --> ice_curves, etc.