Merged conflicts.
Made the name change.
Finished name change.
Merge branch 'hotfix/comap-to-cmt' into feature/sc-toolbox.
Change "apply" to evaluate for maps; now "apply" is a gridcurves method.