rename 'Addition' -> 'Add' and 'Subtraction' -> 'Subtract', being consistent