Changed sendername Mapping because of a bug