Safer removal of 'Mapper' suffix.