Used new method set_ns() instead of new_ns() (in *_instance_init() methods)

41 files changed, 211 insertions, 230 deletions

diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c
index 1a34f858..ef55425b 100644
--- a/lasso/xml/lib_assertion.c
+++ b/lasso/xml/lib_assertion.c
@@ -70,13 +70,12 @@ lasso_lib_assertion_set_inResponseTo(LassoLibAssertion *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_assertion_instance_init(LassoLibAssertion *instance,
-				  LassoLibAssertionClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_lib_assertion_instance_init(LassoLibAssertion *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "Assertion");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "Assertion");
 }
 
 static void
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index 408346c7..37287d12 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -83,13 +83,12 @@ lasso_lib_authentication_statement_set_sessionIndex(LassoLibAuthenticationStatem
 /*****************************************************************************/
 
 static void
-lasso_lib_authentication_statement_instance_init(LassoLibAuthenticationStatement *instance)
+lasso_lib_authentication_statement_instance_init(LassoLibAuthenticationStatement *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->set_name(node, "AuthenticationStatement");
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
+  class->set_name(LASSO_NODE(node), "AuthenticationStatement");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
 }
 
 static void
diff --git a/lasso/xml/lib_authn_context.c b/lasso/xml/lib_authn_context.c
index ab8fc4a1..48567977 100644
--- a/lasso/xml/lib_authn_context.c
+++ b/lasso/xml/lib_authn_context.c
@@ -82,12 +82,12 @@ lasso_lib_authn_context_set_authnContextStatementRef(LassoLibAuthnContext *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_authn_context_instance_init(LassoLibAuthnContext *authnContext)
+lasso_lib_authn_context_instance_init(LassoLibAuthnContext *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(authnContext);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(authnContext), "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(authnContext), "AuthnContext");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "AuthnContext");
 }
 
 static void
diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c
index 08b9917d..f14d9574 100644
--- a/lasso/xml/lib_authn_request.c
+++ b/lasso/xml/lib_authn_request.c
@@ -234,12 +234,12 @@ lasso_lib_authn_request_set_scoping(LassoLibAuthnRequest *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_authn_request_instance_init(LassoLibAuthnRequest *authnRequest)
+lasso_lib_authn_request_instance_init(LassoLibAuthnRequest *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(authnRequest);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(authnRequest), "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(authnRequest), "AuthnRequest");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "AuthnRequest");
 }
 
 static void
diff --git a/lasso/xml/lib_authn_response.c b/lasso/xml/lib_authn_response.c
index 7eb5d1d2..0ce5656a 100644
--- a/lasso/xml/lib_authn_response.c
+++ b/lasso/xml/lib_authn_response.c
@@ -95,13 +95,12 @@ lasso_lib_authn_response_set_relayState(LassoLibAuthnResponse *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_authn_response_instance_init(LassoLibAuthnResponse *instance)
+lasso_lib_authn_response_instance_init(LassoLibAuthnResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "AuthnResponse");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "AuthnResponse");
 }
 
 static void
diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c
index 65c670fb..c5d30216 100644
--- a/lasso/xml/lib_federation_termination_notification.c
+++ b/lasso/xml/lib_federation_termination_notification.c
@@ -96,14 +96,12 @@ lasso_lib_federation_termination_notification_set_nameIdentifier(LassoLibFederat
 /*****************************************************************************/
 
 static void
-lasso_lib_federation_termination_notification_instance_init(LassoLibFederationTerminationNotification *federationTerminationNotification)
+lasso_lib_federation_termination_notification_instance_init(LassoLibFederationTerminationNotification *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(federationTerminationNotification);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(federationTerminationNotification),
-		       "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(federationTerminationNotification),
-			 "FederationTerminationNotification");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "FederationTerminationNotification");
 }
 
 static void
diff --git a/lasso/xml/lib_idp_entries.c b/lasso/xml/lib_idp_entries.c
index d4f22eef..033f4b57 100644
--- a/lasso/xml/lib_idp_entries.c
+++ b/lasso/xml/lib_idp_entries.c
@@ -65,13 +65,12 @@ lasso_lib_idp_entries_add_idpEntry(LassoLibIDPEntries *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_idp_entries_instance_init(LassoLibIDPEntries *instance)
+lasso_lib_idp_entries_instance_init(LassoLibIDPEntries *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "IDPEntries");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "IDPEntries");
 }
 
 static void
diff --git a/lasso/xml/lib_idp_entry.c b/lasso/xml/lib_idp_entry.c
index 11c9108d..9b814b6a 100644
--- a/lasso/xml/lib_idp_entry.c
+++ b/lasso/xml/lib_idp_entry.c
@@ -110,13 +110,12 @@ lasso_lib_idp_entry_set_loc(LassoLibIDPEntry *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_idp_entry_instance_init(LassoLibIDPEntry *instance)
+lasso_lib_idp_entry_instance_init(LassoLibIDPEntry *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "IDPEntry");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "IDPEntry");
 }
 
 static void
diff --git a/lasso/xml/lib_idp_list.c b/lasso/xml/lib_idp_list.c
index 2a37fd5f..5efc83bd 100644
--- a/lasso/xml/lib_idp_list.c
+++ b/lasso/xml/lib_idp_list.c
@@ -88,13 +88,12 @@ lasso_lib_idp_list_set_idpEntries(LassoLibIDPList *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_idp_list_instance_init(LassoLibIDPList *instance)
+lasso_lib_idp_list_instance_init(LassoLibIDPList *node)
 {
-  LassoNode *node = (LassoNode *)instance;
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "IDPList");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "IDPList");
 }
 
 static void
diff --git a/lasso/xml/lib_idp_provided_name_identifier.c b/lasso/xml/lib_idp_provided_name_identifier.c
index 9c17a33e..b20aaf43 100644
--- a/lasso/xml/lib_idp_provided_name_identifier.c
+++ b/lasso/xml/lib_idp_provided_name_identifier.c
@@ -35,13 +35,12 @@
 /*****************************************************************************/
 
 static void
-lasso_lib_idp_provided_name_identifier_instance_init(LassoLibIDPProvidedNameIdentifier *instance)
+lasso_lib_idp_provided_name_identifier_instance_init(LassoLibIDPProvidedNameIdentifier *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "IDPProvidedNameIdentifier");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "IDPProvidedNameIdentifier");
 }
 
 static void
diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c
index 3325960e..22cd873e 100644
--- a/lasso/xml/lib_logout_request.c
+++ b/lasso/xml/lib_logout_request.c
@@ -116,12 +116,12 @@ lasso_lib_logout_request_set_nameIdentifier(LassoLibLogoutRequest *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_logout_request_instance_init(LassoLibLogoutRequest *logoutRequest)
+lasso_lib_logout_request_instance_init(LassoLibLogoutRequest *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(logoutRequest);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(logoutRequest), "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(logoutRequest), "LogoutRequest");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "LogoutRequest");
 }
 
 static void
diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c
index daa51923..b437bed7 100644
--- a/lasso/xml/lib_logout_response.c
+++ b/lasso/xml/lib_logout_response.c
@@ -36,13 +36,12 @@ The Schema fragment (liberty-idff-protocols-schema-v1.2.xsd):
 /*****************************************************************************/
 
 static void
-lasso_lib_logout_response_instance_init(LassoLibLogoutResponse *instance)
+lasso_lib_logout_response_instance_init(LassoLibLogoutResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "LogoutResponse");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "LogoutResponse");
 }
 
 static void
diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c
index 39004228..b69662a2 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.c
+++ b/lasso/xml/lib_name_identifier_mapping_request.c
@@ -94,12 +94,12 @@ lasso_lib_name_identifier_mapping_request_set_nameIdentifier(LassoLibNameIdentif
 /*****************************************************************************/
 
 static void
-lasso_lib_name_identifier_mapping_request_instance_init(LassoLibNameIdentifierMappingRequest *nameIdentifierMappingRequest)
+lasso_lib_name_identifier_mapping_request_instance_init(LassoLibNameIdentifierMappingRequest *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(nameIdentifierMappingRequest);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(nameIdentifierMappingRequest), "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(nameIdentifierMappingRequest), "NameIdentifierMappingRequest");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "NameIdentifierMappingRequest");
 }
 
 static void
diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c
index 990fbecd..5f13456d 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.c
+++ b/lasso/xml/lib_name_identifier_mapping_response.c
@@ -86,13 +86,12 @@ void lasso_lib_name_identifier_mapping_response_set_status(LassoLibNameIdentifie
 /*****************************************************************************/
 
 static void
-lasso_lib_name_identifier_mapping_response_instance_init(LassoLibNameIdentifierMappingResponse *instance)
+lasso_lib_name_identifier_mapping_response_instance_init(LassoLibNameIdentifierMappingResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "NameIdentifierMappingResponse");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "NameIdentifierMappingResponse");
 }
 
 static void
diff --git a/lasso/xml/lib_old_provided_name_identifier.c b/lasso/xml/lib_old_provided_name_identifier.c
index 06b048f4..22ca325b 100644
--- a/lasso/xml/lib_old_provided_name_identifier.c
+++ b/lasso/xml/lib_old_provided_name_identifier.c
@@ -36,13 +36,12 @@ The Schema fragment (liberty-idff-protocols-schema-v1.2.xsd):
 /*****************************************************************************/
 
 static void
-lasso_lib_old_provided_name_identifier_instance_init(LassoLibOLDProvidedNameIdentifier *instance)
+lasso_lib_old_provided_name_identifier_instance_init(LassoLibOLDProvidedNameIdentifier *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "OldProvidedNameIdentifier");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "OldProvidedNameIdentifier");
 }
 
 static void
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index 22dbf881..2bd21cd0 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -91,31 +91,31 @@ lasso_lib_register_name_identifier_request_set_old_provided_name_identifier(Lass
 void
 lasso_lib_register_name_identifier_request_update_nameIdentifiers(LassoLibRegisterNameIdentifierRequest *node)
 {
-     // IDPProvidedNameIdentifier
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			    "NameQualifier", "IDPNameQualifier");
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			    "Format", "IDPFormat");
-
-     // SPProvidedNameIdentifier
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
-			    "NameQualifier", "SPNameQualifier");
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
-			    "Format", "SPFormat");
-
-     // OldProvidedNameIdentifier
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
-			    "NameQualifier", "OldNameQualifier");
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
-			    "Format", "OldFormat");
+  // IDPProvidedNameIdentifier
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
+			 "NameQualifier", "IDPNameQualifier");
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
+			 "Format", "IDPFormat");
+  
+  // SPProvidedNameIdentifier
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
+			 "NameQualifier", "SPNameQualifier");
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
+			 "Format", "SPFormat");
+  
+  // OldProvidedNameIdentifier
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
+			 "NameQualifier", "OldNameQualifier");
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
+			 "Format", "OldFormat");
 }
 
 void
 lasso_lib_register_name_identifier_request_restore_nameIdentifiers(LassoLibRegisterNameIdentifierRequest *node)
 {
-     // IDPProvidedNameIdentifier
-     lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			    "NameQualifier", "IDPNameQualifier");
+  // IDPProvidedNameIdentifier
+  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
+			 "NameQualifier", "IDPNameQualifier");
 }
 
 void
@@ -158,12 +158,12 @@ lasso_lib_register_name_identifier_request_set_sp_provided_name_identifier(Lasso
 /*****************************************************************************/
 
 static void
-lasso_lib_register_name_identifier_request_instance_init(LassoLibRegisterNameIdentifierRequest *registerNameIdentifierRequest)
+lasso_lib_register_name_identifier_request_instance_init(LassoLibRegisterNameIdentifierRequest *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(registerNameIdentifierRequest);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(registerNameIdentifierRequest), "urn:liberty:iff:2003-08", "lib");
-  object_class->set_name(LASSO_NODE(registerNameIdentifierRequest), "RegisterNameIdentifierRequest");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "RegisterNameIdentifierRequest");
 }
 
 static void
diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c
index 7f241dd5..21ccf38d 100644
--- a/lasso/xml/lib_register_name_identifier_response.c
+++ b/lasso/xml/lib_register_name_identifier_response.c
@@ -36,13 +36,12 @@ The Schema fragment (liberty-idff-protocols-schema-v1.2.xsd):
 /*****************************************************************************/
 
 static void
-lasso_lib_register_name_identifier_response_instance_init(LassoLibRegisterNameIdentifierResponse *instance)
+lasso_lib_register_name_identifier_response_instance_init(LassoLibRegisterNameIdentifierResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "RegisterNameIdentifierResponse");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "RegisterNameIdentifierResponse");
 }
 
 static void
diff --git a/lasso/xml/lib_request_authn_context.c b/lasso/xml/lib_request_authn_context.c
index 8f59353a..4a704fc7 100644
--- a/lasso/xml/lib_request_authn_context.c
+++ b/lasso/xml/lib_request_authn_context.c
@@ -85,13 +85,12 @@ lasso_lib_request_authn_context_set_authnContextComparison(LassoLibRequestAuthnC
 /*****************************************************************************/
 
 static void
-lasso_lib_request_authn_context_instance_init(LassoLibRequestAuthnContext *instance)
+lasso_lib_request_authn_context_instance_init(LassoLibRequestAuthnContext *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "RequestAuthnContext");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "RequestAuthnContext");
 }
 
 static void
diff --git a/lasso/xml/lib_scoping.c b/lasso/xml/lib_scoping.c
index a55e5db9..8e2c40b5 100644
--- a/lasso/xml/lib_scoping.c
+++ b/lasso/xml/lib_scoping.c
@@ -92,13 +92,12 @@ lasso_lib_scoping_set_idpList(LassoLibScoping *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_scoping_instance_init(LassoLibScoping *instance)
+lasso_lib_scoping_instance_init(LassoLibScoping *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "Scoping");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "Scoping");
 }
 
 static void
diff --git a/lasso/xml/lib_sp_provided_name_identifier.c b/lasso/xml/lib_sp_provided_name_identifier.c
index 57bac17e..48ff3001 100644
--- a/lasso/xml/lib_sp_provided_name_identifier.c
+++ b/lasso/xml/lib_sp_provided_name_identifier.c
@@ -36,13 +36,12 @@ The Schema fragment (liberty-idff-protocols-schema-v1.2.xsd):
 /*****************************************************************************/
 
 static void
-lasso_lib_sp_provided_name_identifier_instance_init(LassoLibSPProvidedNameIdentifier *instance)
+lasso_lib_sp_provided_name_identifier_instance_init(LassoLibSPProvidedNameIdentifier *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "SPProvidedNameIdentifier");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "SPProvidedNameIdentifier");
 }
 
 static void
diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c
index 9f50789b..081db997 100644
--- a/lasso/xml/lib_status_response.c
+++ b/lasso/xml/lib_status_response.c
@@ -95,13 +95,12 @@ lasso_lib_status_response_set_status(LassoLibStatusResponse *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_status_response_instance_init(LassoLibStatusResponse *instance)
+lasso_lib_status_response_instance_init(LassoLibStatusResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "StatusResponse");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "StatusResponse");
 }
 
 static void
diff --git a/lasso/xml/lib_subject.c b/lasso/xml/lib_subject.c
index 38314708..5e5c130e 100644
--- a/lasso/xml/lib_subject.c
+++ b/lasso/xml/lib_subject.c
@@ -60,13 +60,12 @@ lasso_lib_subject_set_idpProvidedNameIdentifier(LassoLibSubject *node,
 /*****************************************************************************/
 
 static void
-lasso_lib_subject_instance_init(LassoLibSubject *instance,
-				LassoLibSubjectClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_lib_subject_instance_init(LassoLibSubject *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:liberty:iff:2003-08", "lib");
-  class->set_name(node, "Subject");
+  class->set_ns(LASSO_NODE(node), lassoLibHRef, lassoLibPrefix);
+  class->set_name(LASSO_NODE(node), "Subject");
 }
 
 static void
diff --git a/lasso/xml/saml_advice.c b/lasso/xml/saml_advice.c
index 888a6fa3..a421a61b 100644
--- a/lasso/xml/saml_advice.c
+++ b/lasso/xml/saml_advice.c
@@ -76,13 +76,13 @@ lasso_saml_advice_add_assertion(LassoSamlAdvice *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_advice_instance_init(LassoSamlAdvice *instance,
-				LassoSamlAdviceClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_saml_advice_instance_init(LassoSamlAdvice *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, NULL, "saml");
-  class->set_name(node, "Advice");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "Advice");
 }
 
 static void
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index 82aa21f3..1dc92a2b 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -259,13 +259,13 @@ lasso_saml_assertion_set_signature(LassoSamlAssertion *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_assertion_instance_init(LassoSamlAssertion *instance)
+lasso_saml_assertion_instance_init(LassoSamlAssertion *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "Assertion");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "Assertion");
 }
 
 static void
diff --git a/lasso/xml/saml_audience_restriction_condition.c b/lasso/xml/saml_audience_restriction_condition.c
index b2f823a0..5987952e 100644
--- a/lasso/xml/saml_audience_restriction_condition.c
+++ b/lasso/xml/saml_audience_restriction_condition.c
@@ -72,13 +72,13 @@ lasso_saml_audience_restriction_condition_add_audience(LassoSamlAudienceRestrict
 /*****************************************************************************/
 
 static void
-lasso_saml_audience_restriction_condition_instance_init(LassoSamlAudienceRestrictionCondition *instance)
+lasso_saml_audience_restriction_condition_instance_init(LassoSamlAudienceRestrictionCondition *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "AudienceRestrictionCondition");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "AudienceRestrictionCondition");
 }
 
 static void
diff --git a/lasso/xml/saml_authentication_statement.c b/lasso/xml/saml_authentication_statement.c
index 60a4ec15..f6d2531b 100644
--- a/lasso/xml/saml_authentication_statement.c
+++ b/lasso/xml/saml_authentication_statement.c
@@ -95,14 +95,12 @@ lasso_saml_authentication_statement_set_subjectLocality(LassoSamlAuthenticationS
 /*****************************************************************************/
 
 static void
-lasso_saml_authentication_statement_instance_init(LassoSamlAuthenticationStatement *instance)
+lasso_saml_authentication_statement_instance_init(LassoSamlAuthenticationStatement *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  // namespace is herited from SubjectStatementAbstract -> StatementAbstract
-  //class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "AuthenticationStatement");
+  // namespace herited from SubjectStatementAbstract -> StatementAbstract
+  class->set_name(LASSO_NODE(node), "AuthenticationStatement");
 }
 
 static void
diff --git a/lasso/xml/saml_authority_binding.c b/lasso/xml/saml_authority_binding.c
index 0725f083..89188f9c 100644
--- a/lasso/xml/saml_authority_binding.c
+++ b/lasso/xml/saml_authority_binding.c
@@ -78,13 +78,13 @@ lasso_saml_authority_binding_set_location(LassoSamlAuthorityBinding *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_authority_binding_instance_init(LassoSamlAuthorityBinding *instance)
+lasso_saml_authority_binding_instance_init(LassoSamlAuthorityBinding *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "AuthorityBinding");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "AuthorityBinding");
 }
 
 static void
diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c
index a896cdda..4a690abf 100644
--- a/lasso/xml/saml_condition_abstract.c
+++ b/lasso/xml/saml_condition_abstract.c
@@ -36,13 +36,13 @@ The schema fragment (oasis-sstc-saml-schema-assertion-1.0.xsd):
 /*****************************************************************************/
 
 static void
-lasso_saml_condition_abstract_instance_init(LassoSamlConditionAbstract *instance)
+lasso_saml_condition_abstract_instance_init(LassoSamlConditionAbstract *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "ConditionAbstract");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "ConditionAbstract");
 }
 
 static void
diff --git a/lasso/xml/saml_conditions.c b/lasso/xml/saml_conditions.c
index 3fe0461a..661d0b07 100644
--- a/lasso/xml/saml_conditions.c
+++ b/lasso/xml/saml_conditions.c
@@ -127,20 +127,22 @@ lasso_saml_conditions_set_notOnOrAfter(LassoSamlConditions *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_conditions_instance_init(LassoSamlConditions *instance,
-				    LassoSamlConditionsClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_saml_conditions_instance_init(LassoSamlConditions *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "Conditions");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "Conditions");
 }
 
 static void
-lasso_saml_conditions_class_init(LassoSamlConditionsClass *klass) {
+lasso_saml_conditions_class_init(LassoSamlConditionsClass *klass)
+{
 }
 
-GType lasso_saml_conditions_get_type() {
+GType lasso_saml_conditions_get_type()
+{
   static GType this_type = 0;
 
   if (!this_type) {
diff --git a/lasso/xml/saml_name_identifier.c b/lasso/xml/saml_name_identifier.c
index 16f03df8..bf2388a3 100644
--- a/lasso/xml/saml_name_identifier.c
+++ b/lasso/xml/saml_name_identifier.c
@@ -69,13 +69,13 @@ lasso_saml_name_identifier_set_format(LassoSamlNameIdentifier *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_name_identifier_instance_init(LassoSamlNameIdentifier *instance)
+lasso_saml_name_identifier_instance_init(LassoSamlNameIdentifier *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "NameIdentifier");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "NameIdentifier");
 }
 
 static void
diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c
index 7448239a..eb36299d 100644
--- a/lasso/xml/saml_statement_abstract.c
+++ b/lasso/xml/saml_statement_abstract.c
@@ -36,13 +36,13 @@ The schema fragment (oasis-sstc-saml-schema-assertion-1.0.xsd):
 /*****************************************************************************/
 
 static void
-lasso_saml_statement_abstract_instance_init(LassoSamlStatementAbstract *instance)
+lasso_saml_statement_abstract_instance_init(LassoSamlStatementAbstract *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "StatementAbstract");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "StatementAbstract");
 }
 
 static void
diff --git a/lasso/xml/saml_subject.c b/lasso/xml/saml_subject.c
index 9e5d9679..0f5f2e71 100644
--- a/lasso/xml/saml_subject.c
+++ b/lasso/xml/saml_subject.c
@@ -70,13 +70,13 @@ lasso_saml_subject_set_subjectConfirmation(LassoSamlSubject *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_subject_instance_init(LassoSamlSubject *instance,
-				 LassoSamlSubjectClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_saml_subject_instance_init(LassoSamlSubject *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "Subject");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "Subject");
 }
 
 static void
diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c
index 86d1ea87..4912f944 100644
--- a/lasso/xml/saml_subject_confirmation.c
+++ b/lasso/xml/saml_subject_confirmation.c
@@ -74,13 +74,13 @@ lasso_saml_subject_confirmation_set_subjectConfirmationMethod(LassoSamlSubjectCo
 /*****************************************************************************/
 
 static void
-lasso_saml_subject_confirmation_instance_init(LassoSamlSubjectConfirmation *instance)
+lasso_saml_subject_confirmation_instance_init(LassoSamlSubjectConfirmation *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "SubjectConfirmation");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "SubjectConfirmation");
 }
 
 static void
diff --git a/lasso/xml/saml_subject_locality.c b/lasso/xml/saml_subject_locality.c
index 5311e2d6..3071e035 100644
--- a/lasso/xml/saml_subject_locality.c
+++ b/lasso/xml/saml_subject_locality.c
@@ -65,13 +65,13 @@ lasso_saml_subject_locality_set_ipAddress(LassoSamlSubjectLocality *node,
 /*****************************************************************************/
 
 static void
-lasso_saml_subject_locality_instance_init(LassoSamlSubjectLocality *instance)
+lasso_saml_subject_locality_instance_init(LassoSamlSubjectLocality *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "SubjectLocality");
+  class->set_ns(LASSO_NODE(node), lassoSamlAssertionHRef,
+		lassoSamlAssertionPrefix);
+  class->set_name(LASSO_NODE(node), "SubjectLocality");
 }
 
 static void
diff --git a/lasso/xml/saml_subject_statement_abstract.c b/lasso/xml/saml_subject_statement_abstract.c
index dffb087d..d141a5a2 100644
--- a/lasso/xml/saml_subject_statement_abstract.c
+++ b/lasso/xml/saml_subject_statement_abstract.c
@@ -59,14 +59,12 @@ lasso_saml_subject_statement_abstract_set_subject(LassoSamlSubjectStatementAbstr
 /*****************************************************************************/
 
 static void
-lasso_saml_subject_statement_abstract_instance_init(LassoSamlSubjectStatementAbstract *instance)
+lasso_saml_subject_statement_abstract_instance_init(LassoSamlSubjectStatementAbstract *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  // namespace is herited from StatementAbstract
-  //class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:assertion", "saml");
-  class->set_name(node, "SubjectStatementAbstract");
+  // namespace herited from StatementAbstract
+  class->set_name(LASSO_NODE(node), "SubjectStatementAbstract");
 }
 
 static void
diff --git a/lasso/xml/samlp_request.c b/lasso/xml/samlp_request.c
index 754c7ac9..00eac88a 100644
--- a/lasso/xml/samlp_request.c
+++ b/lasso/xml/samlp_request.c
@@ -63,12 +63,13 @@ lasso_samlp_request_set_assertionArtifact(LassoSamlpRequest *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_request_instance_init(LassoSamlpRequest *request)
+lasso_samlp_request_instance_init(LassoSamlpRequest *node)
 {
-  LassoNodeClass *object_class = LASSO_NODE_GET_CLASS(request);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  object_class->new_ns(LASSO_NODE(request), "urn:oasis:names:tc:SAML:1.0:protocol", "samlp");
-  object_class->set_name(LASSO_NODE(request), "Request");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "Request");
 }
 
 static void
diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c
index 1484213e..e8b5ea1f 100644
--- a/lasso/xml/samlp_request_abstract.c
+++ b/lasso/xml/samlp_request_abstract.c
@@ -115,13 +115,13 @@ lasso_samlp_request_abstract_set_requestID(LassoSamlpRequestAbstract *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_request_abstract_instance_init(LassoSamlpRequestAbstract *instance,
-					   LassoSamlpRequestAbstractClass *klass) {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+lasso_samlp_request_abstract_instance_init(LassoSamlpRequestAbstract *node)
+{
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, NULL, "samlp");
-  class->set_name(node, "RequestAbstract");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "RequestAbstract");
 }
 
 static void
diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c
index dd351b27..c2fbade8 100644
--- a/lasso/xml/samlp_response.c
+++ b/lasso/xml/samlp_response.c
@@ -72,13 +72,13 @@ lasso_samlp_response_set_status(LassoSamlpResponse *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_response_instance_init(LassoSamlpResponse *instance)
+lasso_samlp_response_instance_init(LassoSamlpResponse *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, NULL, "samlp");
-  class->set_name(node, "Response");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "Response");
 }
 
 static void
diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c
index 8f653c50..2e5539a9 100644
--- a/lasso/xml/samlp_response_abstract.c
+++ b/lasso/xml/samlp_response_abstract.c
@@ -137,13 +137,13 @@ lasso_samlp_response_abstract_set_responseID(LassoSamlpResponseAbstract *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_response_abstract_instance_init(LassoSamlpResponseAbstract *instance)
+lasso_samlp_response_abstract_instance_init(LassoSamlpResponseAbstract *node)
 {
-  LassoNode *node = LASSO_NODE(instance);
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, NULL, "samlp");
-  class->set_name(node, "ResponseAbstract");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "ResponseAbstract");
 }
 
 static void
diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c
index b66e8bea..00f5d7c7 100644
--- a/lasso/xml/samlp_status.c
+++ b/lasso/xml/samlp_status.c
@@ -77,13 +77,13 @@ lasso_samlp_status_set_statusMessage(LassoSamlpStatus *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_status_instance_init(LassoSamlpStatus *instance)
+lasso_samlp_status_instance_init(LassoSamlpStatus *node)
 {
-  LassoNode *node = (LassoNode *)instance;
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, "urn:oasis:names:tc:SAML:1.0:protocol", "samlp");
-  class->set_name(node, "Status");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "Status");
 }
 
 static void
diff --git a/lasso/xml/samlp_status_code.c b/lasso/xml/samlp_status_code.c
index 69ec6cbd..202a631f 100644
--- a/lasso/xml/samlp_status_code.c
+++ b/lasso/xml/samlp_status_code.c
@@ -56,13 +56,13 @@ lasso_samlp_status_code_set_value(LassoSamlpStatusCode *node,
 /*****************************************************************************/
 
 static void
-lasso_samlp_status_code_instance_init(LassoSamlpStatusCode *instance)
+lasso_samlp_status_code_instance_init(LassoSamlpStatusCode *node)
 {
-  LassoNode *node = (LassoNode *)instance;
-  LassoNodeClass *class = LASSO_NODE_GET_CLASS(node);
+  LassoNodeClass *class = LASSO_NODE_GET_CLASS(LASSO_NODE(node));
 
-  class->new_ns(node, NULL, "samlp");
-  class->set_name(node, "StatusCode");
+  class->set_ns(LASSO_NODE(node), lassoSamlProtocolHRef,
+		lassoSamlProtocolPrefix);
+  class->set_name(LASSO_NODE(node), "StatusCode");
 }
 
 static void