Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 611 insertions, 611 deletions

diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 2abb8f452..f0f02bca1 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -402,8 +402,8 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
       // TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
       if ( protocol == "nov" )
         protocol = "groupwise";
-      addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
-                          TQString::fromLatin1( "All" ),
+      addr.insertCustom( TQString::tqfromLatin1("messaging/%1").arg( protocol ),
+                          TQString::tqfromLatin1( "All" ),
                           addresses.join( TQChar( 0xE000 ) ) );
     }
   }
@@ -573,7 +573,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
   std::vector<class ngwt__ImAddress*> *list = soap_new_std__vectorTemplateOfPointerTongwt__ImAddress( soap(), -1 );
 
   // for each custom
-  // if it contains IM addresses
+  // if it tqcontains IM addresses
   // extract each one and add it to imList
 
   const TQStringList customs = addr.customs();
@@ -583,7 +583,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) && name == TQString::tqfromLatin1( "All" ) ) {
       // get the protocol for this field
       TQString protocol = app.section( '/', 1, 1 );
       if ( !protocol.isEmpty() ) {
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 28c73b68d..ac62a3640 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -129,7 +129,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
   if (rc != 0 ) {
     kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
     TQString errorMessage;
-    errorMessage = TQString::fromLatin1( strerror( errno ) );
+    errorMessage = TQString::tqfromLatin1( strerror( errno ) );
     perror( 0 );
     soap->error = SOAP_TCP_ERROR;
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
@@ -141,13 +141,13 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
     kdError() << "gSoapOpen: connect failed " << rc << endl;
     TQString errorMessage;
     if ( rc == -1 ) {
-      errorMessage = TQString::fromLatin1( strerror( errno ) );
+      errorMessage = TQString::tqfromLatin1( strerror( errno ) );
       perror( 0 );
     }
 	//set the soap struct's error here!
     else {
       if ( rc == -3 )
-        errorMessage = TQString::fromLatin1( "Connection timed out.  Check host and port number" );
+        errorMessage = TQString::tqfromLatin1( "Connection timed out.  Check host and port number" );
     }
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
     soap->error =SOAP_TCP_ERROR;
@@ -208,7 +208,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
     ret = m_sock->writeBlock( s, n );
     if ( ret < 0 ) {
       kdError() << "Send failed: " << strerror( m_sock->systemError() )
-        << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+        << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
       soap->error = SOAP_TCP_ERROR;
       return SOAP_TCP_ERROR;
     }
@@ -217,7 +217,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
 
   if ( n !=0 ) {
     kdError() << "Send failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
     soap->error = SOAP_TCP_ERROR;
   }
 
@@ -246,7 +246,7 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
   long ret = m_sock->readBlock( s, n );
   if ( ret < 0 ) {
     kdError() << "Receive failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
   } else {
     if ( getenv("DEBUG_GW_RESOURCE") ) {
       qDebug("*************************");
@@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id )
   itemsRequest.container = soap_new_std__string( mSoap, -1 );
   *(itemsRequest.container) = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "recipients message recipientStatus" );
+  str->append( "recipients message recipienStatus" );
   itemsRequest.view = str;
 
   itemsRequest.filter = 0;
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index ba64cff9a..f51f16b77 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -111,7 +111,7 @@ std::string* GWConverter::qDateToString( const TQDate &date )
 TQDate GWConverter::stringToQDate( std::string* str )
 {
   //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
-  return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
+  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
 }
 
 TQDateTime GWConverter::charToQDateTime( const char *str )
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 43d5d58df..d093497cd 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -160,7 +160,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
 
         TQString remoteUid = converter.stringToQString( (*it)->id );
 
-        KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
+        KABC::Addressee oldAddressee = mResource->tqfindByUid( mResource->idMapper().localId( remoteUid ) );
         if ( oldAddressee.isEmpty() ) // new addressee
           mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
         else {
@@ -438,7 +438,7 @@ void ReadCalendarJob::run()
   // perform consistency checks
   kdDebug() << "Total count of items of all types in folders we read: " << totalItems << endl;
   kdDebug() << "Folders we read contained " << totals.appointments << " appointments, " << totals.notes << " notes, and " << totals.tasks << " tasks." << endl;
-  kdDebug() << "Local calendar now contains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
+  kdDebug() << "Local calendar now tqcontains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
   if ( totals.appointments == mCalendar->rawEvents().count() )
     kdDebug() << "All events accounted for." << endl;
   else
@@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
 
   itemsRequest.container = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientStatus recurrenceKey" );
+  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
   itemsRequest.view = str;
   itemsRequest.filter = 0;
   itemsRequest.items = 0;
@@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 );
   ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 );
   filterEntry->op = gte;
-  filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
-  filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+  filterEntry->field = TQString::tqfromLatin1( "startDate" ).utf8();
+  filterEntry->value = TQDateTime::tqcurrentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
 
   filter->element = filterEntry;
 
@@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   cursorRequest.container = id;
 #if 1
   cursorRequest.view = soap_new_std__string( mSoap, -1 );
-  cursorRequest.view->append( "default message recipients attachments recipientStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
+  cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
 
 #else
   cursorRequest.view = 0;
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 5e5e4c404..a6a171b87 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
   KCal::Attendee::List::ConstIterator it;
   for( it = attendees.begin(); it != attendees.end(); ++it ) {
     if ( !to.isEmpty() )
-      to += TQString::fromLatin1( ";  %1" ).arg( (*it)->name() );
+      to += TQString::tqfromLatin1( ";  %1" ).arg( (*it)->name() );
     kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
       << endl;
     TQString uuid;
@@ -489,7 +489,7 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
 {
   ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
 
-  recipient->recipientStatus = 0;
+  recipient->recipienStatus = 0;
   if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid );
   else recipient->uuid = 0;
   if ( !name.isEmpty() ) {
@@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
       // set our status
       if ( emailsMatch( stringToQString(recipient->email), mFromEmail ) )
         if ( item->status->accepted )
-          attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
+          attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
         else 
           kdDebug() << "---- found ourselves, but not accepted" << endl;
       else
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 653a55317..e1e48831f 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -82,12 +82,12 @@ KSSLSocket::~KSSLSocket()
 	delete d;
 }
 
-Q_LONG KSSLSocket::readBlock( char* data, Q_ULONG maxLen )
+TQ_LONG KSSLSocket::readBlock( char* data, TQ_ULONG maxLen )
 {
 	return d->kssl->read( data, maxLen );
 }
 
-Q_LONG KSSLSocket::writeBlock( const char* data, Q_ULONG len )
+TQ_LONG KSSLSocket::writeBlock( const char* data, TQ_ULONG len )
 {
 //  kdDebug() << "KSSLSocket::writeBlock() " << (void*)this  << endl;
 //  kdDebug() << "  d->kssl: " << (void*)d->kssl << endl;
@@ -109,7 +109,7 @@ void KSSLSocket::slotConnected()
 			d->kssl->reInitialize();
 		}
 		d->kssl->setPeerHost(host());
-//        kdDebug() << "SOCKET STATUS: " << socketStatus() << endl;
+//        kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl;
 		int rc = d->kssl->connect( sockfd );
                 if ( rc <= 0 ) {
                   kdError() << "Error connecting KSSL: " << rc << endl;
@@ -150,12 +150,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
 
 bool KSSLSocket::hasMetaData( const TQString &key )
 {
-	return d->metaData.contains(key);
+	return d->metaData.tqcontains(key);
 }
 
 TQString KSSLSocket::metaData( const TQString &key )
 {
-	if( d->metaData.contains(key) )
+	if( d->metaData.tqcontains(key) )
 		return d->metaData[key];
 	return TQString::null;
 }
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index d58b41918..854cf8f45 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -33,8 +33,8 @@ class KSSLSocket : public KExtendedSocket
 		KSSLSocket();
 		~KSSLSocket();
 
-		Q_LONG readBlock( char* data, Q_ULONG maxLen );
-		Q_LONG writeBlock( const char* data, Q_ULONG len );
+		TQ_LONG readBlock( char* data, TQ_ULONG maxLen );
+		TQ_LONG writeBlock( const char* data, TQ_ULONG len );
 
 	signals:
 		void sslFailure();
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index 4d140caef..f426729b5 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -672,8 +672,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__RecurrenceRule(soap, NULL, NULL, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return soap_in_ngwt__RecipientList(soap, NULL, NULL, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -838,8 +838,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__ContactFolder(soap, NULL, NULL, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return soap_in_ngwt__Contact(soap, NULL, NULL, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return soap_in_ngwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return soap_in_ngwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return soap_in_ngwt__CategoryRefList(soap, NULL, NULL, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -1290,8 +1290,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_in_PointerTongwt__DeltaSyncType(soap, NULL, NULL, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_in_PointerTongwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_in_PointerTongwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_in_PointerTongwt__FreeBusyBlockList(soap, NULL, NULL, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -1454,8 +1454,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_in_PointerTongwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_in_PointerTongwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_in_PointerTongwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_in_PointerTongwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -2664,9 +2664,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__RecurrenceDateType;
 			return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:RecipientStatus"))
-		{	*type = SOAP_TYPE_ngwt__RecipientStatus;
-			return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:RecipienStatus"))
+		{	*type = SOAP_TYPE_ngwt__RecipienStatus;
+			return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:RecipientList"))
 		{	*type = SOAP_TYPE_ngwt__RecipientList;
@@ -2996,9 +2996,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__Contact;
 			return soap_in_ngwt__Contact(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:CommentStatus"))
-		{	*type = SOAP_TYPE_ngwt__CommentStatus;
-			return soap_in_ngwt__CommentStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:CommenStatus"))
+		{	*type = SOAP_TYPE_ngwt__CommenStatus;
+			return soap_in_ngwt__CommenStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:CategoryRefList"))
 		{	*type = SOAP_TYPE_ngwt__CategoryRefList;
@@ -3726,8 +3726,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__RecurrenceRule *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return ((ngwt__RecurrenceDateType *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return ((ngwt__RecipientStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return ((ngwt__RecipienStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return ((ngwt__RecipientList *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -3892,8 +3892,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__ContactFolder *)ptr)->soap_out(soap, tag, id, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return ((ngwt__Contact *)ptr)->soap_out(soap, tag, id, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return ((ngwt__CommentStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return ((ngwt__CommenStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return ((ngwt__CategoryRefList *)ptr)->soap_out(soap, tag, id, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -4344,8 +4344,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__ItemStatus(soap, tag, id, (ngwt__ItemStatus *const*)ptr, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_out_PointerTongwt__DeltaSyncType(soap, tag, id, (enum ngwt__DeltaSyncType *const*)ptr, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_out_PointerTongwt__RecipientStatus(soap, tag, id, (ngwt__RecipientStatus *const*)ptr, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_out_PointerTongwt__RecipienStatus(soap, tag, id, (ngwt__RecipienStatus *const*)ptr, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_out_PointerTongwt__FreeBusyBlockList(soap, tag, id, (ngwt__FreeBusyBlockList *const*)ptr, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -4508,8 +4508,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, (ngwt__DelegateeStatus *const*)ptr, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, (ngwt__DelegatedStatus *const*)ptr, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_out_PointerTongwt__CommentStatus(soap, tag, id, (ngwt__CommentStatus *const*)ptr, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_out_PointerTongwt__CommenStatus(soap, tag, id, (ngwt__CommenStatus *const*)ptr, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, (ngwt__TransferFailedStatus *const*)ptr, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -5268,8 +5268,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		((ngwt__RecurrenceDateType *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		((ngwt__RecipientStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		((ngwt__RecipienStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__RecipientList:
 		((ngwt__RecipientList *)ptr)->soap_serialize(soap);
@@ -5517,8 +5517,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__Contact:
 		((ngwt__Contact *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
-		((ngwt__CommentStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		((ngwt__CommenStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		((ngwt__CategoryRefList *)ptr)->soap_serialize(soap);
@@ -6444,8 +6444,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		soap_serialize_PointerTongwt__RecipientStatus(soap, (ngwt__RecipientStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		soap_serialize_PointerTongwt__RecipienStatus(soap, (ngwt__RecipienStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		soap_serialize_PointerTongwt__FreeBusyBlockList(soap, (ngwt__FreeBusyBlockList *const*)ptr);
@@ -6690,8 +6690,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		soap_serialize_PointerTongwt__CommentStatus(soap, (ngwt__CommentStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr);
@@ -6986,8 +6986,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__QueryTarget(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecipientList:
 		return (void*)soap_instantiate_ngwt__RecipientList(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return (void*)soap_instantiate_ngwt__RecipientStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return (void*)soap_instantiate_ngwt__RecipienStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return (void*)soap_instantiate_ngwt__RecurrenceDateType(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceRule:
@@ -7400,8 +7400,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__Alarm(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Category:
 		return (void*)soap_instantiate_ngwt__Category(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return (void*)soap_instantiate_ngwt__CommentStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return (void*)soap_instantiate_ngwt__CommenStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerItem:
 		return (void*)soap_instantiate_ngwt__ContainerItem(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerRef:
@@ -8005,11 +8005,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__RecipientList*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
+	case SOAP_TYPE_ngwt__RecipienStatus:
 		if (p->size < 0)
-			delete (ngwt__RecipientStatus*)p->ptr;
+			delete (ngwt__RecipienStatus*)p->ptr;
 		else
-			delete[] (ngwt__RecipientStatus*)p->ptr;
+			delete[] (ngwt__RecipienStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		if (p->size < 0)
@@ -9247,11 +9247,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Category*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
+	case SOAP_TYPE_ngwt__CommenStatus:
 		if (p->size < 0)
-			delete (ngwt__CommentStatus*)p->ptr;
+			delete (ngwt__CommenStatus*)p->ptr;
 		else
-			delete[] (ngwt__CommentStatus*)p->ptr;
+			delete[] (ngwt__CommenStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__ContainerItem:
 		if (p->size < 0)
@@ -10751,7 +10751,7 @@ static const struct soap_code_map soap_codes_ngwe__Field[] =
 	{ (long)PhoneNumber_, "PhoneNumber" },
 	{ (long)Place_, "Place" },
 	{ (long)PostalAddress_, "PostalAddress" },
-	{ (long)RecipientStatus_, "RecipientStatus" },
+	{ (long)RecipienStatus_, "RecipienStatus" },
 	{ (long)Rights_, "Rights" },
 	{ (long)Security_, "Security" },
 	{ (long)SendPriority_, "SendPriority" },
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
 	{ (long)created, "created" },
 	{ (long)deleteVersion, "deleteVersion" },
 	{ (long)endAccess, "endAccess" },
-	{ (long)resetStatus, "resetStatus" },
+	{ (long)reseStatus, "reseStatus" },
 	{ (long)restore, "restore" },
 	{ (long)retrieve, "retrieve" },
 	{ (long)securityModified, "securityModified" },
@@ -12992,8 +12992,8 @@ static const struct soap_code_map soap_codes_ngwt__FilterOp[] =
 	{ (long)lt, "lt" },
 	{ (long)gte, "gte" },
 	{ (long)lte, "lte" },
-	{ (long)contains, "contains" },
-	{ (long)containsWord, "containsWord" },
+	{ (long)tqcontains, "tqcontains" },
+	{ (long)tqcontainsWord, "tqcontainsWord" },
 	{ (long)begins, "begins" },
 	{ (long)exists, "exists" },
 	{ (long)notExist, "notExist" },
@@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] =
 	{ (long)PhoneNumber, "PhoneNumber" },
 	{ (long)Place, "Place" },
 	{ (long)PostalAddress, "PostalAddress" },
-	{ (long)RecipientStatus, "RecipientStatus" },
+	{ (long)RecipienStatus, "RecipienStatus" },
 	{ (long)Rights, "Rights" },
 	{ (long)Security, "Security" },
 	{ (long)SendPriority, "SendPriority" },
@@ -14299,7 +14299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwe__FieldList(struct soap *soap, const char
 			case 262144: soap_send(soap, "PhoneNumber "); break;
 			case 524288: soap_send(soap, "Place "); break;
 			case 1048576: soap_send(soap, "PostalAddress "); break;
-			case 2097152: soap_send(soap, "RecipientStatus "); break;
+			case 2097152: soap_send(soap, "RecipienStatus "); break;
 			case 4194304: soap_send(soap, "Rights "); break;
 			case 8388608: soap_send(soap, "Security "); break;
 			case 16777216: soap_send(soap, "SendPriority "); break;
@@ -14376,8 +14376,8 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap
 				i |= (LONG64)Place;
 			else if (!strcmp(s, "PostalAddress"))
 				i |= (LONG64)PostalAddress;
-			else if (!strcmp(s, "RecipientStatus"))
-				i |= (LONG64)RecipientStatus;
+			else if (!strcmp(s, "RecipienStatus"))
+				i |= (LONG64)RecipienStatus;
 			else if (!strcmp(s, "Rights"))
 				i |= (LONG64)Rights;
 			else if (!strcmp(s, "Security"))
@@ -41405,51 +41405,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap,
 void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41457,29 +41457,29 @@ void ngwt__TransferFailedStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__TransferFailedStatus*)this)->FailureReason = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41501,29 +41501,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap,
 	if (((ngwt__TransferFailedStatus *)a)->FailureReason)
 		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedStatus *)a)->FailureReason->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedStatus), "ngwt:TransferFailedStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap,
 	*(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q;
 }
 
-void ngwt__RecipientStatus::soap_serialize(struct soap *soap) const
+void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__RecipientStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__RecipienStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__RecipientStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipientStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__RecipienStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipienStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__RecipientStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__RecipienStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__RecipientStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipienStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipientStatus), type);
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipienStatus), type);
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__RecipientStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__RecipienStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__RecipientStatus(soap, this, tag, type);
+	return soap_get_ngwt__RecipienStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__RecipientStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__RecipientStatus(soap, tag, this, type);
+void *ngwt__RecipienStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__RecipienStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__RecipientStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), soap->type, soap->arrayType);
+	a = (ngwt__RecipienStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__RecipientStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__RecipientStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__RecipienStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_delivered1 = 1, soap_flag_undeliverable1 = 1, soap_flag_transferred1 = 1, soap_flag_transferDelayed1 = 1, soap_flag_transferFailed1 = 1, soap_flag_downloaded1 = 1, soap_flag_downloadedByThirdParty1 = 1, soap_flag_retractRequested1 = 1, soap_flag_retracted1 = 1, soap_flag_opened1 = 1, soap_flag_deleted1 = 1, soap_flag_undeleted1 = 1, soap_flag_purged1 = 1, soap_flag_accepted1 = 1, soap_flag_declined1 = 1, soap_flag_replied1 = 1, soap_flag_forwarded1 = 1, soap_flag_shared1 = 1, soap_flag_started1 = 1, soap_flag_completed1 = 1, soap_flag_incomplete1 = 1, soap_flag_delegated1 = 1;
@@ -47647,117 +47647,117 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered1 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable1 = 0;
 					continue;
 				}
 			if (soap_flag_transferred1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred1 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed1 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed1 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded1 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty1 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested1 = 0;
 					continue;
 				}
 			if (soap_flag_retracted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted1 = 0;
 					continue;
 				}
 			if (soap_flag_purged1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged1 = 0;
 					continue;
 				}
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_declined1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_shared1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared1 = 0;
 					continue;
 				}
 			if (soap_flag_started1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47771,25 +47771,25 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, 0, sizeof(ngwt__RecipientStatus), 0, soap_copy_ngwt__RecipientStatus);
+	{	a = (ngwt__RecipienStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, 0, sizeof(ngwt__RecipienStatus), 0, soap_copy_ngwt__RecipienStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__RecipientStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__RecipienStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipientStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipienStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipienStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (type && !soap_match_tag(soap, type, "ngwt:DelegateeStatus"))
@@ -47829,26 +47829,26 @@ SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientSt
 		return (ngwt__TransferFailedStatus*)cp->ptr;
 	}
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__RecipientStatus;
+	{	cp->ptr = (void*)new ngwt__RecipienStatus;
 		if (size)
-			*size = sizeof(ngwt__RecipientStatus);
-		((ngwt__RecipientStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__RecipienStatus);
+		((ngwt__RecipienStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__RecipientStatus[n];
+	{	cp->ptr = (void*)new ngwt__RecipienStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__RecipientStatus);
+			*size = n * sizeof(ngwt__RecipienStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__RecipientStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__RecipienStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__RecipientStatus*)cp->ptr;
+	return (ngwt__RecipienStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipientStatus %p -> %p\n", q, p));
-	*(ngwt__RecipientStatus*)p = *(ngwt__RecipientStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipienStatus %p -> %p\n", q, p));
+	*(ngwt__RecipienStatus*)p = *(ngwt__RecipienStatus*)q;
 }
 
 void ngwt__RecipientList::soap_serialize(struct soap *soap) const
@@ -47986,8 +47986,8 @@ void ngwt__Recipient::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((ngwt__Recipient*)this)->distType, SOAP_TYPE_ngwt__DistributionType);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->recipType, SOAP_TYPE_ngwt__RecipientType);
-	soap_embedded(soap, &((ngwt__Recipient*)this)->recipientStatus, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	soap_serialize_PointerTongwt__RecipientStatus(soap, &((ngwt__Recipient*)this)->recipientStatus);
+	soap_embedded(soap, &((ngwt__Recipient*)this)->recipienStatus, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	soap_serialize_PointerTongwt__RecipienStatus(soap, &((ngwt__Recipient*)this)->recipienStatus);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->acceptLevel, SOAP_TYPE_PointerTongwt__AcceptLevel);
 	soap_serialize_PointerTongwt__AcceptLevel(soap, &((ngwt__Recipient*)this)->acceptLevel);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -48004,7 +48004,7 @@ void ngwt__Recipient::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__Recipient*)this)->distType = (enum ngwt__DistributionType)0;
 	((ngwt__Recipient*)this)->recipType = (enum ngwt__RecipientType)0;
-	((ngwt__Recipient*)this)->recipientStatus = NULL;
+	((ngwt__Recipient*)this)->recipienStatus = NULL;
 	((ngwt__Recipient*)this)->acceptLevel = NULL;
 	((ngwt__NameAndEmail*)this)->displayName = NULL;
 	((ngwt__NameAndEmail*)this)->email = NULL;
@@ -48034,7 +48034,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Recipient(struct soap *soap, const char
 	/* transient soap skipped */
 	soap_out_ngwt__DistributionType(soap, "ngwt:distType", -1, &(((ngwt__Recipient*)a)->distType), "");
 	soap_out_ngwt__RecipientType(soap, "ngwt:recipType", -1, &(((ngwt__Recipient*)a)->recipType), "");
-	soap_out_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", -1, &(((ngwt__Recipient*)a)->recipientStatus), "");
+	soap_out_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipienStatus), "");
 	soap_out_PointerTongwt__AcceptLevel(soap, "ngwt:acceptLevel", -1, &(((ngwt__Recipient*)a)->acceptLevel), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -48071,7 +48071,7 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 			return (ngwt__Recipient *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipientStatus1 = 1, soap_flag_acceptLevel1 = 1;
+	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipienStatus1 = 1, soap_flag_acceptLevel1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48102,9 +48102,9 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 				{	soap_flag_recipType1 = 0;
 					continue;
 				}
-			if (soap_flag_recipientStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", &(((ngwt__Recipient*)a)->recipientStatus), "ngwt:RecipientStatus"))
-				{	soap_flag_recipientStatus1 = 0;
+			if (soap_flag_recipienStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipienStatus), "ngwt:RecipienStatus"))
+				{	soap_flag_recipienStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_acceptLevel1 && soap->error == SOAP_TAG_MISMATCH)
@@ -61043,51 +61043,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st,
 void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61095,29 +61095,29 @@ void ngwt__DelegateeStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__DelegateeStatus*)this)->userid = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61139,29 +61139,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, cons
 	if (((ngwt__DelegateeStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegateeStatus *)a)->userid->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateeStatus), "ngwt:DelegateeStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -61390,8 +61390,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, in
 void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
@@ -61420,7 +61420,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, cons
 {
 	if (((ngwt__DelegatedStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str());
-	soap_out_PointerTongwt__CommentStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
+	soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
@@ -61469,7 +61469,7 @@ SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(stru
 		}
 		}
 	}
-	if (!soap_in_PointerTongwt__CommentStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
+	if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
 		return NULL;
 	return a;
 }
@@ -63703,76 +63703,76 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap *soap, int st, in
 	*(ngwt__Contact*)p = *(ngwt__Contact*)q;
 }
 
-void ngwt__CommentStatus::soap_serialize(struct soap *soap) const
+void ngwt__CommenStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__CommentStatus*)this)->__item, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__CommentStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__CommenStatus*)this)->__item, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__CommenStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
-void ngwt__CommentStatus::soap_default(struct soap *soap)
+void ngwt__CommenStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__CommentStatus*)this)->__item);
-	((ngwt__CommentStatus*)this)->comment = NULL;
+	soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item);
+	((ngwt__CommenStatus*)this)->comment = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__CommentStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__CommenStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommentStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommenStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__CommentStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__CommenStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__CommentStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__CommenStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap *soap, const char *tag, int id, const ngwt__CommenStatus *a, const char *type)
 {
-	if (((ngwt__CommentStatus *)a)->comment)
-		soap_set_attr(soap, "comment", ((ngwt__CommentStatus *)a)->comment->c_str());
-	soap_out_string(soap, tag, id, &(((ngwt__CommentStatus*)a)->__item), "");
+	if (((ngwt__CommenStatus *)a)->comment)
+		soap_set_attr(soap, "comment", ((ngwt__CommenStatus *)a)->comment->c_str());
+	soap_out_string(soap, tag, id, &(((ngwt__CommenStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__CommentStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__CommenStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__CommentStatus(soap, this, tag, type);
+	return soap_get_ngwt__CommenStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__CommentStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__CommentStatus(soap, tag, this, type);
+void *ngwt__CommenStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__CommenStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__CommentStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__CommenStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), soap->type, soap->arrayType)))
 	{	soap->error = SOAP_TAG_MISMATCH;
 		return NULL;
 	}
 	*soap->id = '\0';
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__CommentStatus)
-			return (ngwt__CommentStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__CommenStatus)
+			return (ngwt__CommenStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "comment", 0);
 		if (t)
-		{	if (!(((ngwt__CommentStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__CommenStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -63780,51 +63780,51 @@ SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct s
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__CommentStatus *)a)->comment = soap_new_std__string(soap, -1);
-			((ngwt__CommentStatus *)a)->comment->assign(s);
+		{	((ngwt__CommenStatus *)a)->comment = soap_new_std__string(soap, -1);
+			((ngwt__CommenStatus *)a)->comment->assign(s);
 		}
 		}
 	}
-	if (!soap_in_string(soap, tag, &(((ngwt__CommentStatus*)a)->__item), "ngwt:CommentStatus"))
+	if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__CommentStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__CommenStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommentStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommenStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommenStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__CommentStatus;
+	{	cp->ptr = (void*)new ngwt__CommenStatus;
 		if (size)
-			*size = sizeof(ngwt__CommentStatus);
-		((ngwt__CommentStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__CommenStatus);
+		((ngwt__CommenStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__CommentStatus[n];
+	{	cp->ptr = (void*)new ngwt__CommenStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__CommentStatus);
+			*size = n * sizeof(ngwt__CommenStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__CommentStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__CommenStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__CommentStatus*)cp->ptr;
+	return (ngwt__CommenStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommentStatus %p -> %p\n", q, p));
-	*(ngwt__CommentStatus*)p = *(ngwt__CommentStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommenStatus %p -> %p\n", q, p));
+	*(ngwt__CommenStatus*)p = *(ngwt__CommenStatus*)q;
 }
 
 void ngwt__CategoryRefList::soap_serialize(struct soap *soap) const
@@ -84797,53 +84797,53 @@ SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSy
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipientStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	if (soap_out_PointerTongwt__RecipientStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	if (soap_out_PointerTongwt__RecipienStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, int id, ngwt__RecipienStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipientStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipienStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus **a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__RecipientStatus **)soap_malloc(soap, sizeof(ngwt__RecipientStatus *))))
+		if (!(a = (ngwt__RecipienStatus **)soap_malloc(soap, sizeof(ngwt__RecipienStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__RecipientStatus *)soap_instantiate_ngwt__RecipientStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__RecipienStatus *)soap_instantiate_ngwt__RecipienStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), 0);
+	{	a = (ngwt__RecipienStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -89073,53 +89073,53 @@ SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedS
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommentStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommentStatus);
-	if (soap_out_PointerTongwt__CommentStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommenStatus);
+	if (soap_out_PointerTongwt__CommenStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, int id, ngwt__CommentStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, int id, ngwt__CommenStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommentStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommenStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus **a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__CommentStatus **)soap_malloc(soap, sizeof(ngwt__CommentStatus *))))
+		if (!(a = (ngwt__CommenStatus **)soap_malloc(soap, sizeof(ngwt__CommenStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__CommentStatus *)soap_instantiate_ngwt__CommentStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__CommenStatus *)soap_instantiate_ngwt__CommenStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__CommentStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), 0);
+	{	a = (ngwt__CommenStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h
index 41b9a0ff1..750554590 100644
--- a/kresources/groupwise/soap/soapH.h
+++ b/kresources/groupwise/soap/soapH.h
@@ -3302,17 +3302,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecurrenceDateType(struct soap*, ng
 SOAP_FMAC5 ngwt__RecurrenceDateType * SOAP_FMAC6 soap_instantiate_ngwt__RecurrenceDateType(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap*, const char*, int, const ngwt__RecipientStatus *, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus *, const char*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap*, const char*, int, const ngwt__RecipienStatus *, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus *, const char*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__RecipientList
 #define SOAP_TYPE_ngwt__RecipientList (122)
@@ -4298,17 +4298,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Contact(struct soap*, ngwt__Contact
 SOAP_FMAC5 ngwt__Contact * SOAP_FMAC6 soap_instantiate_ngwt__Contact(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap*, const char*, int, const ngwt__CommentStatus *, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus *, const char*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap*, const char*, int, const ngwt__CommenStatus *, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus *, const char*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__CategoryRefList
 #define SOAP_TYPE_ngwt__CategoryRefList (39)
@@ -7344,14 +7344,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DeltaSyncType(struct soap*, co
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_get_PointerTongwt__DeltaSyncType(struct soap*, enum ngwt__DeltaSyncType **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSyncType(struct soap*, const char*, enum ngwt__DeltaSyncType **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__RecipientStatus
-#define SOAP_TYPE_PointerTongwt__RecipientStatus (570)
+#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus
+#define SOAP_TYPE_PointerTongwt__RecipienStatus (570)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap*, const char *, int, ngwt__RecipientStatus *const*, const char *);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap*, const char *, int, ngwt__RecipienStatus *const*, const char *);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FreeBusyBlockList
 #define SOAP_TYPE_PointerTongwt__FreeBusyBlockList (569)
@@ -8082,14 +8082,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*,
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus **, const char*, const char*);
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__CommentStatus
-#define SOAP_TYPE_PointerTongwt__CommentStatus (472)
+#ifndef SOAP_TYPE_PointerTongwt__CommenStatus
+#define SOAP_TYPE_PointerTongwt__CommenStatus (472)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap*, const char *, int, ngwt__CommentStatus *const*, const char *);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap*, const char *, int, ngwt__CommenStatus *const*, const char *);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus
 #define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471)
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index d7f3d6bca..a5977c1c0 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -18,25 +18,25 @@
 
 #ifndef SOAP_TYPE_ngwt__ItemSourceList
 #define SOAP_TYPE_ngwt__ItemSourceList (336)
-/* Bitmask ngwt:ItemSourceList */
+/* Bitqmask ngwt:ItemSourceList */
 enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__MessageTypeList
 #define SOAP_TYPE_ngwt__MessageTypeList (337)
-/* Bitmask ngwt:MessageTypeList */
+/* Bitqmask ngwt:MessageTypeList */
 enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
-/* Bitmask ngwe:FieldList */
-enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
+/* Bitqmask ngwe:FieldList */
+enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipienStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemTypeList
 #define SOAP_TYPE_ngwe__ItemTypeList (340)
-/* Bitmask ngwe:ItemTypeList */
+/* Bitqmask ngwe:ItemTypeList */
 enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048};
 #endif
 
@@ -115,7 +115,7 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
 /* ngwt:FilterOp */
-enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, contains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
+enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, tqcontainsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderACLStatus
@@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened =
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
 /* ngwt:VersionEventType */
-enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
+enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__VersionStatus
@@ -265,7 +265,7 @@ enum ngwe__EventType {AddressBookAdd = 0, AddressBookDelete = 1, AddressBookModi
 #ifndef SOAP_TYPE_ngwe__Field
 #define SOAP_TYPE_ngwe__Field (389)
 /* ngwe:Field */
-enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipientStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
+enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipienStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemType
@@ -1764,10 +1764,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
-/* ngwt:RecipientStatus */
-class SOAP_CMAC ngwt__RecipientStatus
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
+/* ngwt:RecipienStatus */
+class SOAP_CMAC ngwt__RecipienStatus
 {
 public:
 	char *delivered;	/* optional element of type xsd:string */
@@ -1783,8 +1783,8 @@ public:
 	char *deleted;	/* optional element of type xsd:string */
 	char *undeleted;	/* optional element of type xsd:string */
 	char *purged;	/* optional element of type xsd:string */
-	class ngwt__CommentStatus *accepted;	/* optional element of type ngwt:CommentStatus */
-	ngwt__CommentStatus *declined;	/* optional element of type ngwt:CommentStatus */
+	class ngwt__CommenStatus *accepted;	/* optional element of type ngwt:CommenStatus */
+	ngwt__CommenStatus *declined;	/* optional element of type ngwt:CommenStatus */
 	char *replied;	/* optional element of type xsd:string */
 	char *forwarded;	/* optional element of type xsd:string */
 	char *shared;	/* optional element of type xsd:string */
@@ -1795,15 +1795,15 @@ public:
 	std::vector<class ngwt__DelegateeStatus * >delegateeStatus;	/* optional element of type ngwt:DelegateeStatus */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipientStatus */
+	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipienStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__RecipientStatus() { }
-	virtual ~ngwt__RecipientStatus() { }
+	         ngwt__RecipienStatus() { }
+	virtual ~ngwt__RecipienStatus() { }
 };
 #endif
 
@@ -6386,25 +6386,25 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
-/* Primitive ngwt:CommentStatus schema type: */
-class SOAP_CMAC ngwt__CommentStatus
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
+/* Primitive ngwt:CommenStatus schema type: */
+class SOAP_CMAC ngwt__CommenStatus
 {
 public:
 	char *__item;
 	std::string *comment;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommentStatus */
+	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommenStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__CommentStatus() { }
-	virtual ~ngwt__CommentStatus() { }
+	         ngwt__CommenStatus() { }
+	virtual ~ngwt__CommenStatus() { }
 };
 #endif
 
@@ -6460,7 +6460,7 @@ public:
 class SOAP_CMAC ngwt__DelegatedStatus
 {
 public:
-	ngwt__CommentStatus *__item;
+	ngwt__CommenStatus *__item;
 	std::string *userid;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
@@ -6479,7 +6479,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__DelegateeStatus
 #define SOAP_TYPE_ngwt__DelegateeStatus (53)
 /* ngwt:DelegateeStatus */
-class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *userid;	/* optional attribute */
@@ -6774,7 +6774,7 @@ class SOAP_CMAC ngwt__Recipient : public ngwt__NameAndEmail
 public:
 	enum ngwt__DistributionType distType;	/* optional element of type ngwt:DistributionType */
 	enum ngwt__RecipientType recipType;	/* optional element of type ngwt:RecipientType */
-	ngwt__RecipientStatus *recipientStatus;	/* optional element of type ngwt:RecipientStatus */
+	ngwt__RecipienStatus *recipienStatus;	/* optional element of type ngwt:RecipienStatus */
 	enum ngwt__AcceptLevel *acceptLevel;	/* optional element of type ngwt:AcceptLevel */
 public:
 	virtual int soap_type() const { return 121; } /* = unique id SOAP_TYPE_ngwt__Recipient */
@@ -6792,7 +6792,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__TransferFailedStatus
 #define SOAP_TYPE_ngwt__TransferFailedStatus (154)
 /* ngwt:TransferFailedStatus */
-class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *FailureReason;	/* optional attribute */
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 0a0f3c58e..175387686 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
     { short v;
       unsigned int k = soap->omode; /* make sure we only parse HTTP */
       size_t n = soap->count; /* save the content length */
-      soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
       soap->omode |= SOAP_IO_BUFFER;
       soap_begin_send(soap);
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
         return SOAP_INVALID_SOCKET;
       soap->omode = k;
       k = soap->imode;
-      soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
       v = soap->version; /* preserve */
       if (soap_begin_recv(soap))
         return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
 soap_string_out(struct soap *soap, const char *s, int flag)
 { register const char *t;
   register soap_wchar c;
-  register soap_wchar mask = 0xFFFFFF80UL;
+  register soap_wchar tqmask = 0xFFFFFF80UL;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
   { soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
   }
 #endif
   if (soap->mode & SOAP_C_UTFSTRING)
-    mask = 0;
+    tqmask = 0;
   t = s;
   while ((c = *t++))
   { switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
       }
 #endif
 #endif
-      if (c & mask)
+      if (c & tqmask)
       { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
           return soap->error;
         s = t;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index af603d801..fb801fb8f 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 typedef soap_int32 soap_mode;
 
-#define SOAP_IO			0x00000003	/* IO mask */
+#define SOAP_IO			0x00000003	/* IO tqmask */
 #define SOAP_IO_FLUSH		0x00000000	/* flush output immediately, no buffering */
 #define SOAP_IO_BUFFER		0x00000001	/* buffer output in packets of size SOAP_BUFLEN */
 #define SOAP_IO_STORE		0x00000002	/* store entire output to determine length for transport */
@@ -914,7 +914,7 @@ typedef soap_int32 soap_mode;
 #define SOAP_ENC_ZLIB		0x00000400
 #define SOAP_ENC_SSL		0x00000800
 
-#define SOAP_ENC		0x00000FFF	/* IO and ENC mask */
+#define SOAP_ENC		0x00000FFF	/* IO and ENC tqmask */
 
 #define SOAP_XML_STRICT		0x00001000	/* strict validation */
 #define SOAP_XML_CANONICAL	0x00002000	/* C14N canonical XML */
@@ -1350,8 +1350,8 @@ struct soap
   std::ostream *os;
   std::istream *is;
 #else
-  void *os;	/* preserve alignment */
-  void *is;	/* preserve alignment */
+  void *os;	/* preserve tqalignment */
+  void *is;	/* preserve tqalignment */
 #endif
 #ifndef UNDER_CE
   int sendfd;