Merge "Fixed a typo in the name of the ParamertizedString class."