disco.processMetadataRegisterResponseMsg(soap_answer) and disco.svcMDID + renamed Idwsf2 to IdWsf2 to make it work with new classes

23 files changed, 312 insertions, 235 deletions

diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index e1cf58f3..87a35a98 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -40,7 +40,7 @@
 #include <lasso/id-wsf-2.0/discovery.h>
 #include <lasso/id-wsf-2.0/wsf2_profile_private.h>
 
-struct _LassoIdwsf2DiscoveryPrivate
+struct _LassoIdWsf2DiscoveryPrivate
 {
 	gboolean dispose_has_run;
 	GList *new_entry_ids;
@@ -60,7 +60,7 @@ struct _LassoIdwsf2DiscoveryPrivate
  * lasso_discovery_new_from_dump().
  **/
 void
-lasso_idwsf2_discovery_destroy(LassoIdwsf2Discovery *discovery)
+lasso_idwsf2_discovery_destroy(LassoIdWsf2Discovery *discovery)
 {
 	g_object_unref(G_OBJECT(discovery));
 }
@@ -74,9 +74,9 @@ lasso_idwsf2_discovery_destroy(LassoIdwsf2Discovery *discovery)
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_idwsf2_discovery_init_query(LassoIdwsf2Discovery *discovery, const gchar *security_mech_id)
+lasso_idwsf2_discovery_init_query(LassoIdWsf2Discovery *discovery, const gchar *security_mech_id)
 {
-	LassoIdwsf2DiscoQuery *query;
+	LassoIdWsf2DiscoQuery *query;
 
 	query = lasso_idwsf2_disco_query_new();
 	lasso_wsf2_profile_init_soap_request(LASSO_WSF2_PROFILE(discovery), LASSO_NODE(query));
@@ -86,10 +86,10 @@ lasso_idwsf2_discovery_init_query(LassoIdwsf2Discovery *discovery, const gchar *
 
 
 gint
-lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery,
+lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
 	gchar *service_type, gchar *abstract, gchar *disco_provider_id)
 {
-	LassoIdwsf2DiscoSvcMDRegister *metadata_register;
+	LassoIdWsf2DiscoSvcMDRegister *metadata_register;
 
 	/* Get the providerId of this SP */
 	LassoProvider *provider = LASSO_PROVIDER(LASSO_WSF2_PROFILE(discovery)->server);
@@ -111,10 +111,10 @@ lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery,
 }
 
 gint
-lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdwsf2Discovery *discovery,
+lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdWsf2Discovery *discovery,
 	const gchar *message)
 {
-	LassoIdwsf2DiscoSvcMDRegister *request;
+	LassoIdWsf2DiscoSvcMDRegister *request;
 	LassoIdWsf2DiscoSvcMDRegisterResponse *response;
 	LassoSoapEnvelope *envelope;
 	int res = 0;
@@ -156,6 +156,32 @@ lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdwsf2Discovery *disco
 	return res;
 }
 
+gint
+lasso_idwsf2_discovery_process_metadata_register_response_msg(LassoIdWsf2Discovery *discovery,
+	const gchar *message)
+{
+	LassoIdWsf2DiscoSvcMDRegisterResponse *response;
+	LassoSoapEnvelope *envelope;
+	int res = 0;
+
+	g_return_val_if_fail(LASSO_IS_IDWSF2_DISCOVERY(discovery),
+		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+	g_return_val_if_fail(message != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
+
+	/* Process request */
+	res = lasso_wsf2_profile_process_soap_response_msg(LASSO_WSF2_PROFILE(discovery), message);
+
+	if (res == 0) {
+		response = LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE(
+			LASSO_WSF2_PROFILE(discovery)->response);
+		/* FIXME : foreach on the list instead */
+		if (response->SvcMDID != NULL) {
+			discovery->svcMDID = response->SvcMDID->data;
+		}
+	}
+
+	return res;
+}
 
 /*****************************************************************************/
 /* private methods                                                           */
@@ -193,7 +219,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 static void
 dispose(GObject *object)
 {
-	LassoIdwsf2Discovery *discovery = LASSO_IDWSF2_DISCOVERY(object);
+	LassoIdWsf2Discovery *discovery = LASSO_IDWSF2_DISCOVERY(object);
 
 	if (discovery->private_data->dispose_has_run == TRUE)
 		return;
@@ -205,7 +231,7 @@ dispose(GObject *object)
 static void
 finalize(GObject *object)
 { 
-	LassoIdwsf2Discovery *discovery = LASSO_IDWSF2_DISCOVERY(object);
+	LassoIdWsf2Discovery *discovery = LASSO_IDWSF2_DISCOVERY(object);
 	g_free(discovery->private_data);
 	discovery->private_data = NULL;
 	G_OBJECT_CLASS(parent_class)->finalize(object);
@@ -216,14 +242,16 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2Discovery *discovery)
+instance_init(LassoIdWsf2Discovery *discovery)
 {
-	discovery->private_data = g_new0(LassoIdwsf2DiscoveryPrivate, 1);
+	discovery->metadata = NULL;
+	discovery->svcMDID = NULL;
+	discovery->private_data = g_new0(LassoIdWsf2DiscoveryPrivate, 1);
 	discovery->private_data->dispose_has_run = FALSE;
 }
 
 static void
-class_init(LassoIdwsf2DiscoveryClass *klass)
+class_init(LassoIdWsf2DiscoveryClass *klass)
 {
 	parent_class = g_type_class_peek_parent(klass);
 
@@ -241,19 +269,19 @@ lasso_idwsf2_discovery_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof(LassoIdwsf2DiscoveryClass),
+			sizeof(LassoIdWsf2DiscoveryClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2Discovery),
+			sizeof(LassoIdWsf2Discovery),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF2_PROFILE,
-						   "LassoIdwsf2Discovery", &this_info, 0);
+						   "LassoIdWsf2Discovery", &this_info, 0);
 	}
 	return this_type;
 }
@@ -262,15 +290,15 @@ lasso_idwsf2_discovery_get_type()
  * lasso_idwsf2_discovery_new:
  * @server: the #LassoServer
  *
- * Creates a new #LassoIdwsf2Discovery.
+ * Creates a new #LassoIdWsf2Discovery.
  *
- * Return value: a newly created #LassoIdwsf2Discovery object; or NULL if an error
+ * Return value: a newly created #LassoIdWsf2Discovery object; or NULL if an error
  *      occured.
  **/
-LassoIdwsf2Discovery*
+LassoIdWsf2Discovery*
 lasso_idwsf2_discovery_new(LassoServer *server)
 {
-	LassoIdwsf2Discovery *discovery = NULL;
+	LassoIdWsf2Discovery *discovery = NULL;
 
 	g_return_val_if_fail(LASSO_IS_SERVER(server), NULL);
 
diff --git a/lasso/id-wsf-2.0/discovery.h b/lasso/id-wsf-2.0/discovery.h
index 70d68592..4577b508 100644
--- a/lasso/id-wsf-2.0/discovery.h
+++ b/lasso/id-wsf-2.0/discovery.h
@@ -39,46 +39,50 @@ extern "C" {
 
 #define LASSO_TYPE_IDWSF2_DISCOVERY (lasso_idwsf2_discovery_get_type())
 #define LASSO_IDWSF2_DISCOVERY(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdwsf2Discovery))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdWsf2Discovery))
 #define LASSO_IDWSF2_DISCOVERY_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdwsf2DiscoveryClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdWsf2DiscoveryClass))
 #define LASSO_IS_IDWSF2_DISCOVERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCOVERY))
 #define LASSO_IS_IDWSF2_DISCOVERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCOVERY))
 #define LASSO_IDWSF2_DISCOVERY_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdwsf2DiscoveryClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdWsf2DiscoveryClass)) 
 
-typedef struct _LassoIdwsf2Discovery LassoIdwsf2Discovery;
-typedef struct _LassoIdwsf2DiscoveryClass LassoIdwsf2DiscoveryClass;
-typedef struct _LassoIdwsf2DiscoveryPrivate LassoIdwsf2DiscoveryPrivate;
+typedef struct _LassoIdWsf2Discovery LassoIdWsf2Discovery;
+typedef struct _LassoIdWsf2DiscoveryClass LassoIdWsf2DiscoveryClass;
+typedef struct _LassoIdWsf2DiscoveryPrivate LassoIdWsf2DiscoveryPrivate;
 
 
-struct _LassoIdwsf2Discovery {
+struct _LassoIdWsf2Discovery {
 	LassoWsf2Profile parent;
 
-	/* FIXME : Should be a list */
-	LassoIdwsf2DiscoSvcMetadata *metadata;
+	/* FIXME : Both should be lists */
+	LassoIdWsf2DiscoSvcMetadata *metadata;
+	gchar *svcMDID;
 
 	/*< private >*/
-	LassoIdwsf2DiscoveryPrivate *private_data;
+	LassoIdWsf2DiscoveryPrivate *private_data;
 };
 
-struct _LassoIdwsf2DiscoveryClass {
+struct _LassoIdWsf2DiscoveryClass {
 	LassoWsf2ProfileClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_discovery_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2Discovery* lasso_idwsf2_discovery_new(LassoServer *server);
+LASSO_EXPORT LassoIdWsf2Discovery* lasso_idwsf2_discovery_new(LassoServer *server);
 
-LASSO_EXPORT void lasso_idwsf2_discovery_destroy(LassoIdwsf2Discovery *discovery);
+LASSO_EXPORT void lasso_idwsf2_discovery_destroy(LassoIdWsf2Discovery *discovery);
 
-LASSO_EXPORT gint lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery,
+LASSO_EXPORT gint lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
 	gchar *service_type, gchar *abstract, gchar *disco_provider_id);
 
 LASSO_EXPORT gint lasso_idwsf2_discovery_process_metadata_register_msg(
-	LassoIdwsf2Discovery *discovery, const gchar *message);
+	LassoIdWsf2Discovery *discovery, const gchar *message);
 
-LASSO_EXPORT gint lasso_idwsf2_discovery_init_query(LassoIdwsf2Discovery *discovery,
+LASSO_EXPORT gint lasso_idwsf2_discovery_process_metadata_register_response_msg(
+	LassoIdWsf2Discovery *discovery, const gchar *message);
+
+LASSO_EXPORT gint lasso_idwsf2_discovery_init_query(LassoIdWsf2Discovery *discovery,
 	const gchar *security_mech_id);
 
 
diff --git a/lasso/id-wsf-2.0/wsf2_profile.c b/lasso/id-wsf-2.0/wsf2_profile.c
index e1467ebd..74454f0d 100644
--- a/lasso/id-wsf-2.0/wsf2_profile.c
+++ b/lasso/id-wsf-2.0/wsf2_profile.c
@@ -153,6 +153,33 @@ lasso_wsf2_profile_build_soap_response_msg(LassoWsf2Profile *profile)
 	return 0;
 }
 
+gint
+lasso_wsf2_profile_process_soap_response_msg(LassoWsf2Profile *profile, const gchar *message)
+{
+	LassoSoapEnvelope *envelope = NULL;
+	int res = 0;
+
+	g_return_val_if_fail(LASSO_IS_WSF2_PROFILE(profile),
+		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+	g_return_val_if_fail(message != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
+
+	/* Get soap response */
+	envelope = lasso_soap_envelope_new_from_message(message);
+
+	profile->soap_envelope_response = envelope;
+
+	if (envelope != NULL && envelope->Body != NULL && envelope->Body->any != NULL) {
+		profile->response = LASSO_NODE(envelope->Body->any->data);
+	} else {
+		res = LASSO_SOAP_ERROR_MISSING_BODY;
+	}
+
+	if (profile->response == NULL) {
+		res = LASSO_PROFILE_ERROR_MISSING_RESPONSE;
+	}
+
+	return res;
+}
 
 /*****************************************************************************/
 /* overrided parent class methods */
diff --git a/lasso/id-wsf-2.0/wsf2_profile.h b/lasso/id-wsf-2.0/wsf2_profile.h
index df0a65db..47759990 100644
--- a/lasso/id-wsf-2.0/wsf2_profile.h
+++ b/lasso/id-wsf-2.0/wsf2_profile.h
@@ -88,6 +88,9 @@ LASSO_EXPORT gint lasso_wsf2_profile_process_soap_request_msg(LassoWsf2Profile *
 
 LASSO_EXPORT gint lasso_wsf2_profile_build_soap_response_msg(LassoWsf2Profile *profile);
 
+LASSO_EXPORT gint lasso_wsf2_profile_process_soap_response_msg(LassoWsf2Profile *profile,
+	const gchar *message);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
index 9c133289..578b3785 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -50,13 +50,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Address", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Address) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address) },
 	{ "Framework", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Framework) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework) },
 	{ "SecurityMechID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, SecurityMechID) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID) },
 	{ "Action", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Action) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Action) },
 	{ NULL, 0, 0}
 };
 
@@ -65,7 +65,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoEndpointContext *node)
+instance_init(LassoIdWsf2DiscoEndpointContext *node)
 {
 	node->Address = NULL;
 	node->Framework = NULL;
@@ -74,7 +74,7 @@ instance_init(LassoIdwsf2DiscoEndpointContext *node)
 }
 
 static void
-class_init(LassoIdwsf2DiscoEndpointContextClass *klass)
+class_init(LassoIdWsf2DiscoEndpointContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -91,27 +91,27 @@ lasso_idwsf2_disco_endpoint_context_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoEndpointContextClass),
+			sizeof (LassoIdWsf2DiscoEndpointContextClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoEndpointContext),
+			sizeof(LassoIdWsf2DiscoEndpointContext),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoEndpointContext", &this_info, 0);
+				"LassoIdWsf2DiscoEndpointContext", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoEndpointContext*
+LassoIdWsf2DiscoEndpointContext*
 lasso_idwsf2_disco_endpoint_context_new(gchar *address)
 {
-	LassoIdwsf2DiscoEndpointContext *context;
+	LassoIdWsf2DiscoEndpointContext *context;
 
 	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, NULL);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
index 37639492..657ee4d3 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
@@ -35,22 +35,22 @@ extern "C" {
 #define LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT (lasso_idwsf2_disco_endpoint_context_get_type())
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				    LassoIdwsf2DiscoEndpointContext))
+				    LassoIdWsf2DiscoEndpointContext))
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				 LassoIdwsf2DiscoEndpointContextClass))
+				 LassoIdWsf2DiscoEndpointContextClass))
 #define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
 #define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				    LassoIdwsf2DiscoEndpointContextClass)) 
+				    LassoIdWsf2DiscoEndpointContextClass)) 
 
-typedef struct _LassoIdwsf2DiscoEndpointContext LassoIdwsf2DiscoEndpointContext;
-typedef struct _LassoIdwsf2DiscoEndpointContextClass LassoIdwsf2DiscoEndpointContextClass;
+typedef struct _LassoIdWsf2DiscoEndpointContext LassoIdWsf2DiscoEndpointContext;
+typedef struct _LassoIdWsf2DiscoEndpointContextClass LassoIdWsf2DiscoEndpointContextClass;
 
-struct _LassoIdwsf2DiscoEndpointContext {
+struct _LassoIdWsf2DiscoEndpointContext {
 	LassoNode parent;
 
 	/* elements */
@@ -60,13 +60,13 @@ struct _LassoIdwsf2DiscoEndpointContext {
 	gchar *Action;
 };
 
-struct _LassoIdwsf2DiscoEndpointContextClass {
+struct _LassoIdWsf2DiscoEndpointContextClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_endpoint_context_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new(
+LASSO_EXPORT LassoIdWsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new(
 	gchar *address);
 
 #ifdef __cplusplus
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index 75aefc52..813d6aa5 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -42,7 +42,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Option", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdwsf2DiscoOptions, Option) },
+	{ "Option", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoOptions, Option) },
 	{ NULL, 0, 0}
 };
 
@@ -51,13 +51,13 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoOptions *node)
+instance_init(LassoIdWsf2DiscoOptions *node)
 {
 	node->Option = NULL;
 }
 
 static void
-class_init(LassoIdwsf2DiscoOptionsClass *klass)
+class_init(LassoIdWsf2DiscoOptionsClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -74,24 +74,24 @@ lasso_idwsf2_disco_options_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoOptionsClass),
+			sizeof (LassoIdWsf2DiscoOptionsClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoOptions),
+			sizeof(LassoIdWsf2DiscoOptions),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-						   "LassoIdwsf2DiscoOptions", &this_info, 0);
+						   "LassoIdWsf2DiscoOptions", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoOptions*
+LassoIdWsf2DiscoOptions*
 lasso_idwsf2_disco_options_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_OPTIONS, NULL);
diff --git a/lasso/xml/id-wsf-2.0/disco_options.h b/lasso/xml/id-wsf-2.0/disco_options.h
index 889d254f..5793d8d8 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.h
+++ b/lasso/xml/id-wsf-2.0/disco_options.h
@@ -33,32 +33,32 @@ extern "C" {
 
 #define LASSO_TYPE_IDWSF2_DISCO_OPTIONS (lasso_idwsf2_disco_options_get_type())
 #define LASSO_IDWSF2_DISCO_OPTIONS(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdwsf2DiscoOptions))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptions))
 #define LASSO_IDWSF2_DISCO_OPTIONS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdwsf2DiscoOptionsClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptionsClass))
 #define LASSO_IS_IDWSF2_DISCO_OPTIONS(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
 #define LASSO_IS_IDWSF2_DISCO_OPTIONS_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
 #define LASSO_IDWSF2_DISCO_OPTIONS_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdwsf2DiscoOptionsClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptionsClass)) 
 
-typedef struct _LassoIdwsf2DiscoOptions LassoIdwsf2DiscoOptions;
-typedef struct _LassoIdwsf2DiscoOptionsClass LassoIdwsf2DiscoOptionsClass;
+typedef struct _LassoIdWsf2DiscoOptions LassoIdWsf2DiscoOptions;
+typedef struct _LassoIdWsf2DiscoOptionsClass LassoIdWsf2DiscoOptionsClass;
 
-struct _LassoIdwsf2DiscoOptions {
+struct _LassoIdWsf2DiscoOptions {
 	LassoNode parent;
 
 	GList *Option;
 };
 
-struct _LassoIdwsf2DiscoOptionsClass {
+struct _LassoIdWsf2DiscoOptionsClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_options_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoOptions* lasso_idwsf2_disco_options_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoOptions* lasso_idwsf2_disco_options_new(void);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index 9da0448b..bf5c8955 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -45,12 +45,12 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-//	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdwsf2DiscoQuery, ResourceID) },
+//	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, ResourceID) },
 //	{ "EncryptedResourceID",
-//	  SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdwsf2DiscoQuery, EncryptedResourceID) },
+//	  SNIPPET_NODE, G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, EncryptedResourceID) },
 //	{ "RequestedServiceType", SNIPPET_LIST_NODES,
-//	  G_STRUCT_OFFSET(LassoIdwsf2DiscoQuery, RequestedServiceType) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIdwsf2DiscoQuery, id) },
+//	  G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, RequestedServiceType) },
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, id) },
 	{ NULL, 0, 0}
 };
 
@@ -59,7 +59,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoQuery *node)
+instance_init(LassoIdWsf2DiscoQuery *node)
 {
 //	node->ResourceID = NULL;
 //	node->EncryptedResourceID = NULL;
@@ -68,7 +68,7 @@ instance_init(LassoIdwsf2DiscoQuery *node)
 }
 
 static void
-class_init(LassoIdwsf2DiscoQueryClass *klass)
+class_init(LassoIdWsf2DiscoQueryClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -85,37 +85,37 @@ lasso_idwsf2_disco_query_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoQueryClass),
+			sizeof (LassoIdWsf2DiscoQueryClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoQuery),
+			sizeof(LassoIdWsf2DiscoQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoQuery", &this_info, 0);
+				"LassoIdWsf2DiscoQuery", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoQuery*
+LassoIdWsf2DiscoQuery*
 lasso_idwsf2_disco_query_new()
 {
-	LassoIdwsf2DiscoQuery *node;
+	LassoIdWsf2DiscoQuery *node;
 
 	node = g_object_new(LASSO_TYPE_IDWSF2_DISCO_QUERY, NULL);
 
 	return node;
 }
 
-LassoIdwsf2DiscoQuery*
+LassoIdWsf2DiscoQuery*
 lasso_idwsf2_disco_query_new_from_message(const gchar *message)
 {
-	LassoIdwsf2DiscoQuery *node;
+	LassoIdWsf2DiscoQuery *node;
 
 	g_return_val_if_fail(message != NULL, NULL);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_query.h b/lasso/xml/id-wsf-2.0/disco_query.h
index 5fbc29b5..df6a6ac5 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.h
+++ b/lasso/xml/id-wsf-2.0/disco_query.h
@@ -36,34 +36,34 @@ extern "C" {
 
 #define LASSO_TYPE_IDWSF2_DISCO_QUERY (lasso_idwsf2_disco_query_get_type())
 #define LASSO_IDWSF2_DISCO_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-			LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdwsf2DiscoQuery))
+			LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdWsf2DiscoQuery))
 #define LASSO_IDWSF2_DISCO_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-			LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdwsf2DiscoQueryClass))
+			LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdWsf2DiscoQueryClass))
 #define LASSO_IS_IDWSF2_DISCO_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_QUERY))
 #define LASSO_IS_IDWSF2_DISCO_QUERY_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass),LASSO_TYPE_IDWSF2_DISCO_QUERY))
 #define LASSO_IDWSF2_DISCO_QUERY_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdwsf2DiscoQueryClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_QUERY, LassoIdWsf2DiscoQueryClass)) 
 
-typedef struct _LassoIdwsf2DiscoQuery LassoIdwsf2DiscoQuery;
-typedef struct _LassoIdwsf2DiscoQueryClass LassoIdwsf2DiscoQueryClass;
+typedef struct _LassoIdWsf2DiscoQuery LassoIdWsf2DiscoQuery;
+typedef struct _LassoIdWsf2DiscoQueryClass LassoIdWsf2DiscoQueryClass;
 
-struct _LassoIdwsf2DiscoQuery {
+struct _LassoIdWsf2DiscoQuery {
 	LassoNode parent;
 
 //	GList *RequestedService;
 	gchar *id;
 };
 
-struct _LassoIdwsf2DiscoQueryClass {
+struct _LassoIdWsf2DiscoQueryClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_query_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoQuery* lasso_idwsf2_disco_query_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoQuery* lasso_idwsf2_disco_query_new(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoQuery* lasso_idwsf2_disco_query_new_from_message(const gchar *message);
+LASSO_EXPORT LassoIdWsf2DiscoQuery* lasso_idwsf2_disco_query_new_from_message(const gchar *message);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c
index 44aa5690..7bda0c3e 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -46,13 +46,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 //	{ "Status", SNIPPET_NODE,
-//	  G_STRUCT_OFFSET(LassoIdwsf2DiscoQueryResponse, Status) },
+//	  G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, Status) },
 //	{ "ResourceOffering", SNIPPET_LIST_NODES,
-//	  G_STRUCT_OFFSET(LassoIdwsf2DiscoQueryResponse, ResourceOffering) },
+//	  G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, ResourceOffering) },
 //	{ "Credentials", SNIPPET_NODE,
-//	  G_STRUCT_OFFSET(LassoIdwsf2DiscoQueryResponse, Credentials) },
+//	  G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, Credentials) },
 	{ "id", SNIPPET_ATTRIBUTE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoQueryResponse, id) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, id) },
 	{ NULL, 0, 0}
 };
 
@@ -89,7 +89,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoQueryResponse *node)
+instance_init(LassoIdWsf2DiscoQueryResponse *node)
 {
 	node->Status = NULL;
 //	node->ResourceOffering = NULL;
@@ -99,7 +99,7 @@ instance_init(LassoIdwsf2DiscoQueryResponse *node)
 }
 
 static void
-class_init(LassoIdwsf2DiscoQueryResponseClass *class)
+class_init(LassoIdWsf2DiscoQueryResponseClass *class)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(class);
 
@@ -118,27 +118,27 @@ lasso_idwsf2_disco_query_response_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoQueryResponseClass),
+			sizeof (LassoIdWsf2DiscoQueryResponseClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoQueryResponse),
+			sizeof(LassoIdWsf2DiscoQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoQueryResponse", &this_info, 0);
+				"LassoIdWsf2DiscoQueryResponse", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoQueryResponse*
+LassoIdWsf2DiscoQueryResponse*
 lasso_idwsf2_disco_query_response_new(LassoUtilityStatus *status)
 {
-	LassoIdwsf2DiscoQueryResponse *node;
+	LassoIdWsf2DiscoQueryResponse *node;
 
 	g_return_val_if_fail(LASSO_IS_UTILITY_STATUS(status), NULL);
 
@@ -149,10 +149,10 @@ lasso_idwsf2_disco_query_response_new(LassoUtilityStatus *status)
 	return node;
 }
 
-LassoIdwsf2DiscoQueryResponse*
+LassoIdWsf2DiscoQueryResponse*
 lasso_idwsf2_disco_query_response_new_from_message(const gchar *message)
 {
-	LassoIdwsf2DiscoQueryResponse *response;
+	LassoIdWsf2DiscoQueryResponse *response;
 
 	g_return_val_if_fail(message != NULL, NULL);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.h b/lasso/xml/id-wsf-2.0/disco_query_response.h
index 6f13a25e..d26c97dc 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.h
@@ -35,39 +35,39 @@ extern "C" {
 
 #define LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE (lasso_idwsf2_disco_query_response_get_type())
 #define LASSO_IDWSF2_DISCO_QUERY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-			LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, LassoIdwsf2DiscoQueryResponse))
+			LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, LassoIdWsf2DiscoQueryResponse))
 #define LASSO_IDWSF2_DISCO_QUERY_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-			LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, LassoIdwsf2DiscoQueryResponseClass))
+			LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, LassoIdWsf2DiscoQueryResponseClass))
 #define LASSO_IS_IDWSF2_DISCO_QUERY_RESPONSE(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE))
 #define LASSO_IS_IDWSF2_DISCO_QUERY_RESPONSE_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE))
 #define LASSO_IDWSF2_DISCO_QUERY_RESPONSE_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, \
-				    LassoIdwsf2DiscoQueryResponseClass))
+				    LassoIdWsf2DiscoQueryResponseClass))
 
-typedef struct _LassoIdwsf2DiscoQueryResponse LassoIdwsf2DiscoQueryResponse;
-typedef struct _LassoIdwsf2DiscoQueryResponseClass LassoIdwsf2DiscoQueryResponseClass;
+typedef struct _LassoIdWsf2DiscoQueryResponse LassoIdWsf2DiscoQueryResponse;
+typedef struct _LassoIdWsf2DiscoQueryResponseClass LassoIdWsf2DiscoQueryResponseClass;
 
-struct _LassoIdwsf2DiscoQueryResponse {
+struct _LassoIdWsf2DiscoQueryResponse {
 	LassoNode parent;
 
 	LassoUtilityStatus *Status;
 //	GList *ResourceOffering;
-//	LassoIdwsf2DiscoCredentials *Credentials;
+//	LassoIdWsf2DiscoCredentials *Credentials;
 
 	char *id;
 };
 
-struct _LassoIdwsf2DiscoQueryResponseClass {
+struct _LassoIdWsf2DiscoQueryResponseClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_query_response_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoQueryResponse* lasso_idwsf2_disco_query_response_new(LassoUtilityStatus *status);
+LASSO_EXPORT LassoIdWsf2DiscoQueryResponse* lasso_idwsf2_disco_query_response_new(LassoUtilityStatus *status);
 
-LASSO_EXPORT LassoIdwsf2DiscoQueryResponse* lasso_idwsf2_disco_query_response_new_from_message(
+LASSO_EXPORT LassoIdWsf2DiscoQueryResponse* lasso_idwsf2_disco_query_response_new_from_message(
 	const gchar *message);
 
 #ifdef __cplusplus
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c
index 5ce3738a..ce11fa0d 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -46,11 +46,11 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, ServiceType) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, ServiceType) },
 	{ "Options", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, Options) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, Options) },
 	{ "EndpointContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, EndpointContext) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, EndpointContext) },
 	{ NULL, 0, 0}
 };
 
@@ -59,7 +59,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoServiceContext *node)
+instance_init(LassoIdWsf2DiscoServiceContext *node)
 {
 	node->ServiceType = NULL;
 	node->Options = NULL;
@@ -67,7 +67,7 @@ instance_init(LassoIdwsf2DiscoServiceContext *node)
 }
 
 static void
-class_init(LassoIdwsf2DiscoServiceContextClass *klass)
+class_init(LassoIdWsf2DiscoServiceContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -84,27 +84,27 @@ lasso_idwsf2_disco_service_context_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoServiceContextClass),
+			sizeof (LassoIdWsf2DiscoServiceContextClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoServiceContext),
+			sizeof(LassoIdWsf2DiscoServiceContext),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoServiceContext", &this_info, 0);
+				"LassoIdWsf2DiscoServiceContext", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoServiceContext*
-lasso_idwsf2_disco_service_context_new(gchar *serviceType, LassoIdwsf2DiscoEndpointContext *endpointContext)
+LassoIdWsf2DiscoServiceContext*
+lasso_idwsf2_disco_service_context_new(gchar *serviceType, LassoIdWsf2DiscoEndpointContext *endpointContext)
 {
-	LassoIdwsf2DiscoServiceContext *context;
+	LassoIdWsf2DiscoServiceContext *context;
 
 	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, NULL);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.h b/lasso/xml/id-wsf-2.0/disco_service_context.h
index d950bb07..bd370f19 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.h
@@ -36,38 +36,38 @@ extern "C" {
 #define LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT (lasso_idwsf2_disco_service_context_get_type())
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				    LassoIdwsf2DiscoServiceContext))
+				    LassoIdWsf2DiscoServiceContext))
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				 LassoIdwsf2DiscoServiceContextClass))
+				 LassoIdWsf2DiscoServiceContextClass))
 #define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
 #define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				    LassoIdwsf2DiscoServiceContextClass)) 
+				    LassoIdWsf2DiscoServiceContextClass)) 
 
-typedef struct _LassoIdwsf2DiscoServiceContext LassoIdwsf2DiscoServiceContext;
-typedef struct _LassoIdwsf2DiscoServiceContextClass LassoIdwsf2DiscoServiceContextClass;
+typedef struct _LassoIdWsf2DiscoServiceContext LassoIdWsf2DiscoServiceContext;
+typedef struct _LassoIdWsf2DiscoServiceContextClass LassoIdWsf2DiscoServiceContextClass;
 
-struct _LassoIdwsf2DiscoServiceContext {
+struct _LassoIdWsf2DiscoServiceContext {
 	LassoNode parent;
 
 	/* elements */
 	gchar *ServiceType;
-	LassoIdwsf2DiscoOptions *Options;
-	LassoIdwsf2DiscoEndpointContext *EndpointContext;
+	LassoIdWsf2DiscoOptions *Options;
+	LassoIdWsf2DiscoEndpointContext *EndpointContext;
 };
 
-struct _LassoIdwsf2DiscoServiceContextClass {
+struct _LassoIdWsf2DiscoServiceContextClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_service_context_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new(
-	gchar *serviceType, LassoIdwsf2DiscoEndpointContext *endpointContext);
+LASSO_EXPORT LassoIdWsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new(
+	gchar *serviceType, LassoIdWsf2DiscoEndpointContext *endpointContext);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
index b9a6a58d..fdab258e 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
@@ -44,7 +44,7 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMD", SNIPPET_LIST_NODES,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMDRegister, metadata_list), "LassoIdwsf2DiscoSvcMetadata" },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, metadata_list), "LassoIdWsf2DiscoSvcMetadata" },
 	{ NULL, 0, 0}
 };
 
@@ -53,13 +53,13 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoSvcMDRegister *node)
+instance_init(LassoIdWsf2DiscoSvcMDRegister *node)
 {
 	node->metadata_list = NULL;
 }
 
 static void
-class_init(LassoIdwsf2DiscoSvcMDRegisterClass *klass)
+class_init(LassoIdWsf2DiscoSvcMDRegisterClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -76,28 +76,28 @@ lasso_idwsf2_disco_svc_md_register_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoSvcMDRegisterClass),
+			sizeof (LassoIdWsf2DiscoSvcMDRegisterClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoSvcMDRegister),
+			sizeof(LassoIdWsf2DiscoSvcMDRegister),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoSvcMDRegister", &this_info, 0);
+				"LassoIdWsf2DiscoSvcMDRegister", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoSvcMDRegister*
+LassoIdWsf2DiscoSvcMDRegister*
 lasso_idwsf2_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id)
 {
-	LassoIdwsf2DiscoSvcMDRegister *metadata_register;
-	LassoIdwsf2DiscoSvcMetadata *metadata;
+	LassoIdWsf2DiscoSvcMDRegister *metadata_register;
+	LassoIdWsf2DiscoSvcMetadata *metadata;
 
 	metadata_register = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, NULL);
 	metadata = lasso_idwsf2_disco_svc_metadata_new(service_type, abstract, provider_id);
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
index 1f4254c5..d60d6d86 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
@@ -34,38 +34,38 @@ extern "C" {
 #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER (lasso_idwsf2_disco_svc_md_register_get_type())
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				    LassoIdwsf2DiscoSvcMDRegister))
+				    LassoIdWsf2DiscoSvcMDRegister))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				 LassoIdwsf2DiscoSvcMDRegisterClass))
+				 LassoIdWsf2DiscoSvcMDRegisterClass))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				    LassoIdwsf2DiscoSvcMDRegisterClass)) 
+				    LassoIdWsf2DiscoSvcMDRegisterClass)) 
 
-typedef struct _LassoIdwsf2DiscoSvcMDRegister LassoIdwsf2DiscoSvcMDRegister;
-typedef struct _LassoIdwsf2DiscoSvcMDRegisterClass LassoIdwsf2DiscoSvcMDRegisterClass;
+typedef struct _LassoIdWsf2DiscoSvcMDRegister LassoIdWsf2DiscoSvcMDRegister;
+typedef struct _LassoIdWsf2DiscoSvcMDRegisterClass LassoIdWsf2DiscoSvcMDRegisterClass;
 
-struct _LassoIdwsf2DiscoSvcMDRegister {
+struct _LassoIdWsf2DiscoSvcMDRegister {
 	LassoNode parent;
 
 	/* elements */
 	GList *metadata_list;
 };
 
-struct _LassoIdwsf2DiscoSvcMDRegisterClass {
+struct _LassoIdWsf2DiscoSvcMDRegisterClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new(
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new(
 	gchar *service_type, gchar *abstract, gchar *provider_id);
 
-LASSO_EXPORT LassoIdwsf2DiscoSvcMDRegister*
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister*
 lasso_idwsf2_disco_svc_md_register_new_from_message(const gchar *message);
 
 #ifdef __cplusplus
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
index 7ad47d63..415e2072 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -49,13 +49,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Abstract", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, Abstract) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, Abstract) },
 	{ "ProviderID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, ProviderID) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ProviderID) },
 	{ "ServiceContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, ServiceContext) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ServiceContext) },
 	{ "svcMDID", SNIPPET_ATTRIBUTE,
-	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, svcMDID) },
+	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, svcMDID) },
 	{ NULL, 0, 0}
 };
 
@@ -64,7 +64,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdwsf2DiscoSvcMetadata *node)
+instance_init(LassoIdWsf2DiscoSvcMetadata *node)
 {
 	node->Abstract = NULL;
 	node->ProviderID = NULL;
@@ -73,7 +73,7 @@ instance_init(LassoIdwsf2DiscoSvcMetadata *node)
 }
 
 static void
-class_init(LassoIdwsf2DiscoSvcMetadataClass *klass)
+class_init(LassoIdWsf2DiscoSvcMetadataClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -90,28 +90,28 @@ lasso_idwsf2_disco_svc_metadata_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdwsf2DiscoSvcMetadataClass),
+			sizeof (LassoIdWsf2DiscoSvcMetadataClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdwsf2DiscoSvcMetadata),
+			sizeof(LassoIdWsf2DiscoSvcMetadata),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdwsf2DiscoSvcMetadata", &this_info, 0);
+				"LassoIdWsf2DiscoSvcMetadata", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoIdwsf2DiscoSvcMetadata*
+LassoIdWsf2DiscoSvcMetadata*
 lasso_idwsf2_disco_svc_metadata_new(gchar *service_type, gchar *abstract, gchar *provider_id)
 {
-	LassoIdwsf2DiscoSvcMetadata *metadata;
-	LassoIdwsf2DiscoEndpointContext *endpoint_context;
+	LassoIdWsf2DiscoSvcMetadata *metadata;
+	LassoIdWsf2DiscoEndpointContext *endpoint_context;
 
 	metadata = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, NULL);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
index 20376171..506108b1 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
@@ -35,40 +35,40 @@ extern "C" {
 #define LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA (lasso_idwsf2_disco_svc_metadata_get_type())
 #define LASSO_IDWSF2_DISCO_SVC_METADATA(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				    LassoIdwsf2DiscoSvcMetadata))
+				    LassoIdWsf2DiscoSvcMetadata))
 #define LASSO_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				 LassoIdwsf2DiscoSvcMetadataClass))
+				 LassoIdWsf2DiscoSvcMetadataClass))
 #define LASSO_IS_IDWSF2_DISCO_SVC_METADATA(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
 #define LASSO_IS_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
 #define LASSO_IDWSF2_DISCO_SVC_METADATA_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				    LassoIdwsf2DiscoSvcMetadataClass)) 
+				    LassoIdWsf2DiscoSvcMetadataClass)) 
 
-typedef struct _LassoIdwsf2DiscoSvcMetadata LassoIdwsf2DiscoSvcMetadata;
-typedef struct _LassoIdwsf2DiscoSvcMetadataClass LassoIdwsf2DiscoSvcMetadataClass;
+typedef struct _LassoIdWsf2DiscoSvcMetadata LassoIdWsf2DiscoSvcMetadata;
+typedef struct _LassoIdWsf2DiscoSvcMetadataClass LassoIdWsf2DiscoSvcMetadataClass;
 
-struct _LassoIdwsf2DiscoSvcMetadata {
+struct _LassoIdWsf2DiscoSvcMetadata {
 	LassoNode parent;
 
 	/* elements */
 	gchar *Abstract;
 	gchar *ProviderID;
-	LassoIdwsf2DiscoServiceContext *ServiceContext;
+	LassoIdWsf2DiscoServiceContext *ServiceContext;
 
 	/* attributes */
 	gchar *svcMDID;
 };
 
-struct _LassoIdwsf2DiscoSvcMetadataClass {
+struct _LassoIdWsf2DiscoSvcMetadataClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_metadata_get_type(void);
 
-LASSO_EXPORT LassoIdwsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new(
+LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new(
 	gchar *service_type, gchar *abstract, gchar *provider_id);
 
 #ifdef __cplusplus
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 9ed5973f..eb96c0d2 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1309,9 +1309,11 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 	if (strcmp((char*)xmlnode->ns->href, LASSO_WSSE_HREF) == 0)
 		prefix = "Wsse";
 	if (strcmp((char*)xmlnode->ns->href, LASSO_IDWSF2_DISCO_HREF) == 0)
-		prefix = "Idwsf2Disco";
+		prefix = "IdWsf2Disco";
 	if (strcmp((char*)xmlnode->ns->href, LASSO_IDWSF2_SOAP_BINDING_HREF) == 0)
 		prefix = "SoapBinding";
+	if (strcmp((char*)xmlnode->ns->href, LASSO_IDWSF2_UTIL_HREF) == 0)
+		prefix = "IdWsf2Util";
 	tmp = lasso_get_prefix_for_dst_service_href((char*)xmlnode->ns->href);
 	if (tmp) {
 		prefix = "Dst";
diff --git a/swig/Lasso-wsf2-disco.i b/swig/Lasso-wsf2-disco.i
index acb540f4..5e6569d7 100644
--- a/swig/Lasso-wsf2-disco.i
+++ b/swig/Lasso-wsf2-disco.i
@@ -47,20 +47,20 @@
 
 
 #ifndef SWIGPHP4
-%rename(Idwsf2DiscoQuery) LassoIdwsf2DiscoQuery;
+%rename(IdWsf2DiscoQuery) LassoIdWsf2DiscoQuery;
 #endif
 typedef struct {
 	/* Attributes */
 
 	char *id;
-} LassoIdwsf2DiscoQuery;
-%extend LassoIdwsf2DiscoQuery {
+} LassoIdWsf2DiscoQuery;
+%extend LassoIdWsf2DiscoQuery {
 
 	/* Constructor, Destructor & Static Methods */
 
-	LassoIdwsf2DiscoQuery();
+	LassoIdWsf2DiscoQuery();
 
-	~LassoIdwsf2DiscoQuery();
+	~LassoIdWsf2DiscoQuery();
 
 	/* Methods inherited from LassoNode */
 
@@ -72,11 +72,11 @@ typedef struct {
 
 /* Constructors, destructors & static methods implementations */
 
-#define new_LassoIdwsf2DiscoQuery lasso_idwsf2_disco_query_new
-#define delete_LassoIdwsf2DiscoQuery(self) lasso_node_destroy(LASSO_NODE(self))
+#define new_LassoIdWsf2DiscoQuery lasso_idwsf2_disco_query_new
+#define delete_LassoIdWsf2DiscoQuery(self) lasso_node_destroy(LASSO_NODE(self))
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoIdwsf2DiscoQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+#define LassoIdWsf2DiscoQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
diff --git a/swig/Lasso-wsf2.i b/swig/Lasso-wsf2.i
index eca8cf48..88f2dfb1 100644
--- a/swig/Lasso-wsf2.i
+++ b/swig/Lasso-wsf2.i
@@ -45,11 +45,11 @@
 
 
 #ifndef SWIGPHP4
-%rename(Idwsf2Discovery) LassoIdwsf2Discovery;
+%rename(IdWsf2Discovery) LassoIdWsf2Discovery;
 #endif
 typedef struct {
-} LassoIdwsf2Discovery;
-%extend LassoIdwsf2Discovery {
+} LassoIdWsf2Discovery;
+%extend LassoIdWsf2Discovery {
 
 	/* Attributes inherited from Wsf2Profile */
 
@@ -77,13 +77,16 @@ typedef struct {
 	/* Attributes */
 
 	%newobject metadata_get;
-	LassoIdwsf2DiscoSvcMetadata *metadata;
+	LassoIdWsf2DiscoSvcMetadata *metadata;
+
+	%immutable svcMDID;
+	char *svcMDID;
 
 	/* Constructor, Destructor & Static Methods */
 
-	LassoIdwsf2Discovery(LassoServer *server);
+	LassoIdWsf2Discovery(LassoServer *server);
 
-	~LassoIdwsf2Discovery();
+	~LassoIdWsf2Discovery();
 
 	/* Methods inherited from Wsf2Profile */
 
@@ -106,6 +109,10 @@ typedef struct {
 	END_THROW_ERROR()
 
 	THROW_ERROR()
+	int processMetadataRegisterResponseMsg(const gchar *message);
+	END_THROW_ERROR()
+
+	THROW_ERROR()
 	int initQuery(const char *security_mech_id = NULL);
 	END_THROW_ERROR()
 }
@@ -115,64 +122,70 @@ typedef struct {
 /* Attributes inherited from Wsf2Profile implementations */
 
 /* msgBody */
-#define LassoIdwsf2Discovery_get_msgBody(self) LASSO_WSF2_PROFILE(self)->msg_body
-#define LassoIdwsf2Discovery_msgBody_get(self) LASSO_WSF2_PROFILE(self)->msg_body
+#define LassoIdWsf2Discovery_get_msgBody(self) LASSO_WSF2_PROFILE(self)->msg_body
+#define LassoIdWsf2Discovery_msgBody_get(self) LASSO_WSF2_PROFILE(self)->msg_body
 
 /* msgUrl */
-#define LassoIdwsf2Discovery_get_msgUrl(self) LASSO_WSF2_PROFILE(self)->msg_url
-#define LassoIdwsf2Discovery_msgUrl_get(self) LASSO_WSF2_PROFILE(self)->msg_url
+#define LassoIdWsf2Discovery_get_msgUrl(self) LASSO_WSF2_PROFILE(self)->msg_url
+#define LassoIdWsf2Discovery_msgUrl_get(self) LASSO_WSF2_PROFILE(self)->msg_url
 
 /* request */
-#define LassoIdwsf2Discovery_get_request(self) get_node(LASSO_WSF2_PROFILE(self)->request)
-#define LassoIdwsf2Discovery_request_get(self) get_node(LASSO_WSF2_PROFILE(self)->request)
-#define LassoIdwsf2Discovery_set_request(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->request, (value))
-#define LassoIdwsf2Discovery_request_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->request, (value))
+#define LassoIdWsf2Discovery_get_request(self) get_node(LASSO_WSF2_PROFILE(self)->request)
+#define LassoIdWsf2Discovery_request_get(self) get_node(LASSO_WSF2_PROFILE(self)->request)
+#define LassoIdWsf2Discovery_set_request(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->request, (value))
+#define LassoIdWsf2Discovery_request_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->request, (value))
 
 /* response */
-#define LassoIdwsf2Discovery_get_response(self) get_node(LASSO_WSF2_PROFILE(self)->response)
-#define LassoIdwsf2Discovery_response_get(self) get_node(LASSO_WSF2_PROFILE(self)->response)
-#define LassoIdwsf2Discovery_set_response(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->response, (value))
-#define LassoIdwsf2Discovery_response_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->response, (value))
+#define LassoIdWsf2Discovery_get_response(self) get_node(LASSO_WSF2_PROFILE(self)->response)
+#define LassoIdWsf2Discovery_response_get(self) get_node(LASSO_WSF2_PROFILE(self)->response)
+#define LassoIdWsf2Discovery_set_response(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->response, (value))
+#define LassoIdWsf2Discovery_response_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->response, (value))
 
 /* server */
-#define LassoIdwsf2Discovery_get_server(self) get_node(LASSO_WSF2_PROFILE(self)->server)
-#define LassoIdwsf2Discovery_server_get(self) get_node(LASSO_WSF2_PROFILE(self)->server)
-#define LassoIdwsf2Discovery_set_server(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->server, (value))
-#define LassoIdwsf2Discovery_server_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->server, (value))
+#define LassoIdWsf2Discovery_get_server(self) get_node(LASSO_WSF2_PROFILE(self)->server)
+#define LassoIdWsf2Discovery_server_get(self) get_node(LASSO_WSF2_PROFILE(self)->server)
+#define LassoIdWsf2Discovery_set_server(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->server, (value))
+#define LassoIdWsf2Discovery_server_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->server, (value))
 
 /* soapEnvelopeRequest */
-#define LassoIdwsf2Discovery_get_soapEnvelopeRequest(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_request)
-#define LassoIdwsf2Discovery_soapEnvelopeRequest_get(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_request)
-#define LassoIdwsf2Discovery_set_soapEnvelopeRequest(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_request, (value))
-#define LassoIdwsf2Discovery_soapEnvelopeRequest_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_request, (value))
+#define LassoIdWsf2Discovery_get_soapEnvelopeRequest(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_request)
+#define LassoIdWsf2Discovery_soapEnvelopeRequest_get(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_request)
+#define LassoIdWsf2Discovery_set_soapEnvelopeRequest(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_request, (value))
+#define LassoIdWsf2Discovery_soapEnvelopeRequest_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_request, (value))
 
 /* soapEnvelopeResponse */
-#define LassoIdwsf2Discovery_get_soapEnvelopeResponse(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_response)
-#define LassoIdwsf2Discovery_soapEnvelopeResponse_get(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_response)
-#define LassoIdwsf2Discovery_set_soapEnvelopeResponse(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_response, (value))
-#define LassoIdwsf2Discovery_soapEnvelopeResponse_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_response, (value))
+#define LassoIdWsf2Discovery_get_soapEnvelopeResponse(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_response)
+#define LassoIdWsf2Discovery_soapEnvelopeResponse_get(self) get_node(LASSO_WSF2_PROFILE(self)->soap_envelope_response)
+#define LassoIdWsf2Discovery_set_soapEnvelopeResponse(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_response, (value))
+#define LassoIdWsf2Discovery_soapEnvelopeResponse_set(self, value) set_node((gpointer *) &LASSO_WSF2_PROFILE(self)->soap_envelope_response, (value))
 
 /* Attributes */
 
-#define LassoIdwsf2Discovery_get_metadata(self) get_node(self->metadata)
-#define LassoIdwsf2Discovery_metadata_get(self) get_node(self->metadata)
-#define LassoIdwsf2Discovery_set_metadata(self, value) set_node((gpointer *) &self->metadata, value)
-#define LassoIdwsf2Discovery_metadata_set(self, value) set_node((gpointer *) &self->metadata, value)
+/* metadata */
+#define LassoIdWsf2Discovery_get_metadata(self) get_node(self->metadata)
+#define LassoIdWsf2Discovery_metadata_get(self) get_node(self->metadata)
+#define LassoIdWsf2Discovery_set_metadata(self, value) set_node((gpointer *) &self->metadata, value)
+#define LassoIdWsf2Discovery_metadata_set(self, value) set_node((gpointer *) &self->metadata, value)
+
+/* svcMDID */
+#define LassoIdWsf2Discovery_get_svcMDID(self) self->svcMDID
+#define LassoIdWsf2Discovery_svcMDID_get(self) self->svcMDID
 
 /* Constructors, destructors & static methods implementations */
 
-#define new_LassoIdwsf2Discovery lasso_idwsf2_discovery_new
-#define delete_LassoIdwsf2Discovery(self) lasso_node_destroy(LASSO_NODE(self))
+#define new_LassoIdWsf2Discovery lasso_idwsf2_discovery_new
+#define delete_LassoIdWsf2Discovery(self) lasso_node_destroy(LASSO_NODE(self))
 
 /* Implementations of methods inherited from Wsf2Profile */
 
-#define LassoIdwsf2Discovery_buildRequestMsg(self) lasso_wsf2_profile_build_soap_request_msg(LASSO_WSF2_PROFILE(self))
-#define LassoIdwsf2Discovery_buildResponseMsg(self) lasso_wsf2_profile_build_soap_response_msg(LASSO_WSF2_PROFILE(self))
+#define LassoIdWsf2Discovery_buildRequestMsg(self) lasso_wsf2_profile_build_soap_request_msg(LASSO_WSF2_PROFILE(self))
+#define LassoIdWsf2Discovery_buildResponseMsg(self) lasso_wsf2_profile_build_soap_response_msg(LASSO_WSF2_PROFILE(self))
 
 /* Methods implementations */
 
-#define LassoIdwsf2Discovery_initMetadataRegister lasso_idwsf2_discovery_init_metadata_register
-#define LassoIdwsf2Discovery_processMetadataRegisterMsg lasso_idwsf2_discovery_process_metadata_register_msg
-#define LassoIdwsf2Discovery_initQuery lasso_idwsf2_discovery_init_query
+#define LassoIdWsf2Discovery_initMetadataRegister lasso_idwsf2_discovery_init_metadata_register
+#define LassoIdWsf2Discovery_processMetadataRegisterMsg lasso_idwsf2_discovery_process_metadata_register_msg
+#define LassoIdWsf2Discovery_processMetadataRegisterResponseMsg lasso_idwsf2_discovery_process_metadata_register_response_msg
+#define LassoIdWsf2Discovery_initQuery lasso_idwsf2_discovery_init_query
 
 %}
diff --git a/swig/id-wsf-2.0/disco_svc_metadata.i b/swig/id-wsf-2.0/disco_svc_metadata.i
index 0a82a138..0c68c0a7 100644
--- a/swig/id-wsf-2.0/disco_svc_metadata.i
+++ b/swig/id-wsf-2.0/disco_svc_metadata.i
@@ -1,6 +1,6 @@
 
 #ifndef SWIGPHP4
-%rename(Idwsf2DiscoSvcMetadata) LassoIdwsf2DiscoSvcMetadata;
+%rename(IdWsf2DiscoSvcMetadata) LassoIdWsf2DiscoSvcMetadata;
 #endif
 typedef struct {
 	char *Abstract;
@@ -8,12 +8,12 @@ typedef struct {
 	/* XXX : Change this "void" if we happen to add ServiceContext in swig as well */
 	void *ServiceContext;
 	char *svcMDID;
-} LassoIdwsf2DiscoSvcMetadata;
-%extend LassoIdwsf2DiscoSvcMetadata {
+} LassoIdWsf2DiscoSvcMetadata;
+%extend LassoIdWsf2DiscoSvcMetadata {
 
 	/* Constructor, Destructor & Static Methods */
-	LassoIdwsf2DiscoSvcMetadata(gchar *service_type, gchar *abstract, gchar *provider_id);
-	~LassoIdwsf2DiscoSvcMetadata();
+	LassoIdWsf2DiscoSvcMetadata(gchar *service_type, gchar *abstract, gchar *provider_id);
+	~LassoIdWsf2DiscoSvcMetadata();
 
 	/* Method inherited from LassoNode */
 	%newobject dump;
@@ -25,12 +25,12 @@ typedef struct {
 
 /* Constructors, destructors & static methods implementations */
 
-#define new_LassoIdwsf2DiscoSvcMetadata lasso_idwsf2_disco_svc_metadata_new
-#define delete_LassoIdwsf2DiscoSvcMetadata(self) lasso_node_destroy(LASSO_NODE(self))
+#define new_LassoIdWsf2DiscoSvcMetadata lasso_idwsf2_disco_svc_metadata_new
+#define delete_LassoIdWsf2DiscoSvcMetadata(self) lasso_node_destroy(LASSO_NODE(self))
 
 /* Implementations of methods inherited from LassoNode */
 
-#define LassoIdwsf2DiscoSvcMetadata_dump(self) lasso_node_dump(LASSO_NODE(self))
+#define LassoIdWsf2DiscoSvcMetadata_dump(self) lasso_node_dump(LASSO_NODE(self))
 
 %}
 
diff --git a/swig/id-wsf-2.0/inheritance.h b/swig/id-wsf-2.0/inheritance.h
index ac32c71b..624ab9cd 100644
--- a/swig/id-wsf-2.0/inheritance.h
+++ b/swig/id-wsf-2.0/inheritance.h
@@ -1 +1 @@
-SET_NODE_INFO(Idwsf2DiscoSvcMetadata, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMetadata, Node)