SWIG: Renamed constants from camelCase to UPPER_CASE.

16 files changed, 171 insertions, 171 deletions

diff --git a/csharp/examples/perfs.cs b/csharp/examples/perfs.cs
index be568b90..f72d126f 100644
--- a/csharp/examples/perfs.cs
+++ b/csharp/examples/perfs.cs
@@ -17,7 +17,7 @@ public class perfs
 			null,
 			"../../tests/data/sp1-la/certificate.pem");
 
-	server.addProvider(lasso.LassoProviderRole.providerRoleSp,
+	server.addProvider(lasso.LassoProviderRole.PROVIDER_ROLE_SP,
 			"../../tests/data/idp1-la/metadata.xml",
 			"../../tests/data/idp1-la/public-key.pem",
 			"../../tests/data/ca1-la/certificate.pem");
@@ -26,7 +26,7 @@ public class perfs
 	
 	login.initAuthnRequest("https://idp1/metadata", (lasso.LassoHttpMethod)4);
 	lasso.LibAuthnRequest request = (lasso.LibAuthnRequest)login.request;
-	login.request.protocolProfile = lasso.lasso.libProtocolProfileBrwsPost;
+	login.request.protocolProfile = lasso.lasso.LIB_PROTOCOL_PROFILE_BRWS_POST;
 	login.buildAuthnRequestMsg();
 
 	Console.WriteLine(login.msgUrl);
diff --git a/csharp/examples/runme.cs b/csharp/examples/runme.cs
index 439e4304..e0114b94 100644
--- a/csharp/examples/runme.cs
+++ b/csharp/examples/runme.cs
@@ -16,7 +16,7 @@ public class runme
 			"../../tests/data/sp1-la/private-key-raw.pem",
 			null,
 			"../../tests/data/sp1-la/certificate.pem");
-	server.addProvider(lasso.LassoProviderRole.providerRoleSp,
+	server.addProvider(lasso.LassoProviderRole.PROVIDER_ROLE_SP,
 			"../../tests/data/idp1-la/metadata.xml",
 			"../../tests/data/idp1-la/public-key.pem",
 			"../../tests/data/ca1-la/certificate.pem");
diff --git a/csharp/tests/BindingTests.cs b/csharp/tests/BindingTests.cs
index b88bed94..63a0f4a4 100644
--- a/csharp/tests/BindingTests.cs
+++ b/csharp/tests/BindingTests.cs
@@ -81,8 +81,8 @@ public class BindingTests {
 
 		// Test a string attribute.
 		assertNull(authnRequest.consent);
-		authnRequest.consent = lasso.lasso.libConsentObtained;
-		assertEquals(authnRequest.consent, lasso.lasso.libConsentObtained);
+		authnRequest.consent = lasso.lasso.LIB_CONSENT_OBTAINED;
+		assertEquals(authnRequest.consent, lasso.lasso.LIB_CONSENT_OBTAINED);
 		authnRequest.consent = null;
 		assertNull(authnRequest.consent);
 
@@ -293,9 +293,9 @@ public class BindingTests {
 
 	        assertNull(login.request);
 	        login.request = (lasso.SamlpRequestAbstract) new lasso.LibAuthnRequest();
-	        ((lasso.LibAuthnRequest) login.request).consent = lasso.lasso.libConsentObtained;
+	        ((lasso.LibAuthnRequest) login.request).consent = lasso.lasso.LIB_CONSENT_OBTAINED;
 	        assertEquals(((lasso.LibAuthnRequest) login.request).consent,
-			 lasso.lasso.libConsentObtained);
+			 lasso.lasso.LIB_CONSENT_OBTAINED);
 	        login.request = null;
 	        assertNull(login.request);
 	
diff --git a/java/coldfusion/src/CFLassoSingleLogout.java b/java/coldfusion/src/CFLassoSingleLogout.java
index 588c97dd..6105151f 100644
--- a/java/coldfusion/src/CFLassoSingleLogout.java
+++ b/java/coldfusion/src/CFLassoSingleLogout.java
@@ -46,7 +46,7 @@ public class CFLassoSingleLogout {
     public void configure(String metadataPath, String publicKeyPath, String privateKeyPath,
 			  String idpProviderId, String idpMetadataPath, String idpPublicKeyPath) {
         server = new Server(metadataPath, publicKeyPath, privateKeyPath, null,
-			    lassoConstants.signatureMethodRsaSha1);
+			    lassoConstants.SIGNATURE_METHOD_RSA_SHA1);
 	this.idpProviderId = idpProviderId;
         server.addProvider(idpMetadataPath, idpPublicKeyPath, null);
         logout = new Logout(server, lassoConstants.providerTypeSp);
@@ -81,11 +81,11 @@ public class CFLassoSingleLogout {
     }
 
     public void initRequest() {
-	logout.initRequest(idpProviderId, lassoConstants.httpMethodAny);
+	logout.initRequest(idpProviderId, lassoConstants.HTTP_METHOD_ANY);
     }
 
     public void processResponseMsg(String responseMsg) {
-	logout.processResponseMsg(responseMsg, lassoConstants.httpMethodSoap);
+	logout.processResponseMsg(responseMsg, lassoConstants.HTTP_METHOD_SOAP);
     }
 
     public void setIdentityFromDump(String identityDump) {
diff --git a/java/coldfusion/src/CFLassoSingleSignOn.java b/java/coldfusion/src/CFLassoSingleSignOn.java
index cfcff127..efd24ee1 100644
--- a/java/coldfusion/src/CFLassoSingleSignOn.java
+++ b/java/coldfusion/src/CFLassoSingleSignOn.java
@@ -71,7 +71,7 @@ public class CFLassoSingleSignOn {
     public void configure(String metadataPath, String publicKeyPath, String privateKeyPath,
 			  String idpProviderId, String idpMetadataPath, String idpPublicKeyPath) {
         server = new Server(metadataPath, publicKeyPath, privateKeyPath, null,
-			    lassoConstants.signatureMethodRsaSha1);
+			    lassoConstants.SIGNATURE_METHOD_RSA_SHA1);
 	this.idpProviderId = idpProviderId;
         server.addProvider(idpMetadataPath, idpPublicKeyPath, null);
         login = new Login(server);
@@ -113,17 +113,17 @@ public class CFLassoSingleSignOn {
 	AuthnRequest authnRequest;
 	String authnRequestUrl;
 
-        login.initAuthnRequest(lassoConstants.httpMethodRedirect);
+        login.initAuthnRequest(lassoConstants.HTTP_METHOD_REDIRECT);
 	authnRequest = login.getAuthnRequest();
         authnRequest.setIsPassive(false);
-        authnRequest.setNameIdPolicy(lassoConstants.libNameIdPolicyTypeFederated);
-        authnRequest.setConsent(lassoConstants.libConsentObtained);
+        authnRequest.setNameIdPolicy(lassoConstants.LIB_NAMEID_POLICY_TYPE_FEDERATED);
+        authnRequest.setConsent(lassoConstants.LIB_CONSENT_OBTAINED);
 	if (relayState != null)
 	    authnRequest.setRelayState(relayState);
     }
 
     public void initRequest(String queryString) {
-	login.initRequest(queryString, lassoConstants.httpMethodRedirect);
+	login.initRequest(queryString, lassoConstants.HTTP_METHOD_REDIRECT);
     }
 
     static public void main(String [] args) {
diff --git a/java/tests/BindingTests.java b/java/tests/BindingTests.java
index 0aa26659..7543a5b8 100644
--- a/java/tests/BindingTests.java
+++ b/java/tests/BindingTests.java
@@ -63,8 +63,8 @@ public class BindingTests extends TestCase {
 
 	// Test a string attribute.
 	assertNull(authnRequest.getConsent());
-	authnRequest.setConsent(lasso.libConsentObtained);
-	assertEquals(authnRequest.getConsent(), lasso.libConsentObtained);
+	authnRequest.setConsent(lasso.LIB_CONSENT_OBTAINED);
+	assertEquals(authnRequest.getConsent(), lasso.LIB_CONSENT_OBTAINED);
 	authnRequest.setConsent(null);
 	assertNull(authnRequest.getConsent());
 
@@ -255,9 +255,9 @@ public class BindingTests extends TestCase {
 
         assertNull(login.getRequest());
         login.setRequest((SamlpRequestAbstract) new LibAuthnRequest());
-        ((LibAuthnRequest) login.getRequest()).setConsent(lasso.libConsentObtained);
+        ((LibAuthnRequest) login.getRequest()).setConsent(lasso.LIB_CONSENT_OBTAINED);
         assertEquals(((LibAuthnRequest) login.getRequest()).getConsent(),
-		     lasso.libConsentObtained);
+		     lasso.LIB_CONSENT_OBTAINED);
         login.setRequest(null);
         assertNull(login.getRequest());
 
diff --git a/java/tests/LoginTest.java b/java/tests/LoginTest.java
index 996fc9d6..e09b7c8d 100644
--- a/java/tests/LoginTest.java
+++ b/java/tests/LoginTest.java
@@ -47,7 +47,7 @@ public class LoginTest extends TestCase {
 	    NULL, //"../../tests/data/idp1-la/public-key.pem",
             "../../tests/data/idp1-la/private-key-raw.pem",
             "../../tests/data/idp1-la/certificate.pem",
-	    Lasso.signatureMethodRsaSha1);
+	    Lasso.SIGNATURE_METHOD_RSA_SHA1);
         serverContext.addProvider(
             "../../tests/data/sp1-la/metadata.xml",
             "../../tests/data/sp1-la/public-key.pem",
@@ -62,7 +62,7 @@ public class LoginTest extends TestCase {
 	    NULL, //"../../tests/data/sp1-la/public-key.pem",
             "../../tests/data/sp1-la/private-key-raw.pem",
             "../../tests/data/sp1-la/certificate.pem",
-	    Lasso.signatureMethodRsaSha1);
+	    Lasso.SIGNATURE_METHOD_RSA_SHA1);
         serverContext.addProvider(
             "../../tests/data/idp1-la/metadata.xml",
             "../../tests/data/idp1-la/public-key.pem",
@@ -100,17 +100,17 @@ public class LoginTest extends TestCase {
         spLoginContext = new LassoLogin(spContext);
         assertEquals(0, spLoginContext.initAuthnRequest(
             "https://identity-provider:1998/liberty-alliance/metadata"));
-        assertEquals(Lasso.messageTypeAuthnRequest, spLoginContext.getRequestType());
+        assertEquals(Lasso.MESSAGE_TYPE_AUTHN_REQUEST, spLoginContext.getRequestType());
 	authnRequest = (LassoAuthnRequest) spLoginContext.getRequest();
         authnRequest.setPassive(false);
-        authnRequest.setNameIdPolicy(Lasso.libNameIdPolicyTypeFederated);
-        authnRequest.setConsent(Lasso.libConsentObtained);
+        authnRequest.setNameIdPolicy(Lasso.LIB_NAMEID_POLICY_TYPE_FEDERATED);
+        authnRequest.setConsent(Lasso.LIB_CONSENT_OBTAINED);
 	relayState = "fake";
         authnRequest.setRelayState(relayState);
         assertEquals(0, spLoginContext.buildAuthnRequestMsg());
         authnRequestUrl = spLoginContext.getMsgUrl();
         authnRequestQuery = authnRequestUrl.substring(authnRequestUrl.indexOf("?") + 1);
-        method = Lasso.httpMethodRedirect;
+        method = Lasso.HTTP_METHOD_REDIRECT;
 
 	// Identity provider singleSignOn, for a user having no federation.
         idpContextDump = generateIdentityProviderContextDump();
@@ -121,11 +121,11 @@ public class LoginTest extends TestCase {
         assertTrue(idpLoginContext.mustAuthenticate());
 
         userAuthenticated = true;
-        authenticationMethod = Lasso.samlAuthenticationMethodPassword;
-        assertEquals(Lasso.loginProtocolProfileBrwsArt, idpLoginContext.getProtocolProfile());
+        authenticationMethod = Lasso.SAML_AUTHENTICATION_METHOD_PASSWORD;
+        assertEquals(Lasso.LOGIN_PROTOCOL_PROFILE_BRWS_ART, idpLoginContext.getProtocolProfile());
         assertEquals(0, idpLoginContext.buildArtifactMsg(
             userAuthenticated, authenticationMethod, "FIXME: reauthenticateOnOrAfter",
-            Lasso.httpMethodRedirect));
+            Lasso.HTTP_METHOD_REDIRECT));
 	idpIdentityContextDump = idpLoginContext.getIdentity().dump();
         assertNotNull(idpIdentityContextDump);
 	idpSessionContextDump = idpLoginContext.getSession().dump();
@@ -135,7 +135,7 @@ public class LoginTest extends TestCase {
         soapResponseMsg = idpLoginContext.getResponseDump();
         artifact = idpLoginContext.getAssertionArtifact();
 	nameIdentifier = idpLoginContext.getNameIdentifier();
-        method = Lasso.httpMethodRedirect;
+        method = Lasso.HTTP_METHOD_REDIRECT;
 
         // Service provider assertion consumer.
         spContextDump = generateServiceProviderContextDump();
@@ -149,7 +149,7 @@ public class LoginTest extends TestCase {
 
         // Identity provider SOAP endpoint.
         requestType = Lasso.getRequestTypeFromSoapMsg(soapRequestMsg);
-        assertEquals(Lasso.requestTypeLogin, requestType);
+        assertEquals(Lasso.REQUEST_TYPE_LOGIN, requestType);
 
 	// Service provider assertion consumer (step 2: process SOAP response).
         assertEquals(0, spLoginContext.processResponseMsg(soapResponseMsg));
@@ -165,7 +165,7 @@ public class LoginTest extends TestCase {
         spSessionContextDump = spSessionContext.dump();
         assertNotNull(spSessionContextDump);
 	authenticationMethod = spSessionContext.getAuthenticationMethod(null);
-        assertEquals(Lasso.samlAuthenticationMethodPassword, authenticationMethod);
+        assertEquals(Lasso.SAML_AUTHENTICATION_METHOD_PASSWORD, authenticationMethod);
 
         // Service provider logout.
         spContextDump = generateServiceProviderContextDump();
@@ -184,13 +184,13 @@ public class LoginTest extends TestCase {
 
 	// Identity provider SOAP endpoint.
 	requestType = Lasso.getRequestTypeFromSoapMsg(soapRequestMsg);
-        assertEquals(Lasso.requestTypeLogout, requestType);
+        assertEquals(Lasso.REQUEST_TYPE_LOGOUT, requestType);
         idpContextDump = generateIdentityProviderContextDump();
         assertNotNull(idpContextDump);
         idpContext = new LassoServer(idpContextDump);
         assertNotNull(idpContext);
         idpLogoutContext = new LassoLogout(idpContext, Lasso.providerTypeIdp);
-	assertEquals(0, idpLogoutContext.loadRequestMsg(soapRequestMsg, Lasso.httpMethodSoap));
+	assertEquals(0, idpLogoutContext.loadRequestMsg(soapRequestMsg, Lasso.HTTP_METHOD_SOAP));
         assertEquals(nameIdentifier, idpLogoutContext.getNameIdentifier());
         assertNotNull(idpIdentityContextDump);
         assertEquals(0, idpLogoutContext.setIdentityFromDump(idpIdentityContextDump));
@@ -207,7 +207,7 @@ public class LoginTest extends TestCase {
         soapResponseMsg = idpLogoutContext.getMsgBody();
 
 	// Service provider logout (step 2: process SOAP response).
-        assertEquals(0, spLogoutContext.processResponseMsg(soapResponseMsg, Lasso.httpMethodSoap));
+        assertEquals(0, spLogoutContext.processResponseMsg(soapResponseMsg, Lasso.HTTP_METHOD_SOAP));
         spIdentityContextDump = spLogoutContext.getIdentity().dump();
         assertNotNull(spIdentityContextDump);
     }
diff --git a/perl/tests/binding_tests.pl b/perl/tests/binding_tests.pl
index ea0e618c..3beaabdc 100755
--- a/perl/tests/binding_tests.pl
+++ b/perl/tests/binding_tests.pl
@@ -47,8 +47,8 @@ sub test02 {
 
     # Test a string attribute.
     $authnRequest->{consent} eq undef or die "Assertion failed\n";
-    $authnRequest->{consent} = $lasso::libConsentObtained;
-    $authnRequest->{consent} eq $lasso::libConsentObtained or die "Assertion failed\n";
+    $authnRequest->{consent} = $lasso::LIB_CONSENT_OBTAINED;
+    $authnRequest->{consent} eq $lasso::LIB_CONSENT_OBTAINED or die "Assertion failed\n";
     $authnRequest->{consent} = undef;
     $authnRequest->{consent} eq undef or die "Assertion failed\n";
 
@@ -238,8 +238,8 @@ sub test06 {
 
     $login->{request} eq undef or die "Assertion failed\n";
     $login->{request} = new lasso::LibAuthnRequest;
-    $login->{request}->{consent} = lasso::libConsentObtained;
-    $login->{request}->{consent} eq lasso::libConsentObtained or die "Assertion failed\n";
+    $login->{request}->{consent} = lasso::LIB_CONSENT_OBTAINED;
+    $login->{request}->{consent} eq lasso::LIB_CONSENT_OBTAINED or die "Assertion failed\n";
     undef $login->{request};
     $login->{request} eq undef or die "Assertion failed\n";
 
diff --git a/python/examples/defederation.py b/python/examples/defederation.py
index e4b44de8..0b709575 100644
--- a/python/examples/defederation.py
+++ b/python/examples/defederation.py
@@ -13,7 +13,7 @@ idpidentity_dump = "<LassoIdentity><LassoFederations><LassoFederation RemoteProv
 # SP :
 spserver = lasso.Server.new("../../examples/sp.xml",
                             "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-                            lasso.signatureMethodRsaSha1)
+                            lasso.SIGNATURE_METHOD_RSA_SHA1)
 spserver.add_provider("../../examples/idp.xml", None, None)
 
 spdefederation = lasso.FederationTermination.new(spserver, lasso.providerTypeSp)
@@ -29,11 +29,11 @@ notification_msg = spdefederation.msg_body
 # IDP :
 idpserver = lasso.Server.new("../../examples/idp.xml",
                             "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-                            lasso.signatureMethodRsaSha1)
+                            lasso.SIGNATURE_METHOD_RSA_SHA1)
 idpserver.add_provider("../../examples/sp.xml", None, None)
 
 idpdefederation = lasso.FederationTermination.new(idpserver, lasso.providerTypeIdp)
-idpdefederation.process_notification_msg(notification_msg, lasso.httpMethodSoap)
+idpdefederation.process_notification_msg(notification_msg, lasso.HTTP_METHOD_SOAP)
 print 'NameIdentifier :', idpdefederation.nameIdentifier
 
 idpdefederation.set_identity_from_dump(idpidentity_dump);
diff --git a/python/examples/login.py b/python/examples/login.py
index e2354b4f..77a0cdd3 100644
--- a/python/examples/login.py
+++ b/python/examples/login.py
@@ -12,7 +12,7 @@ import lasso
 ####################
 server = lasso.Server.new("../../examples/sp.xml",
                           "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-                          lasso.signatureMethodRsaSha1)
+                          lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 server.add_provider("../../examples/idp.xml", None, None)
 server_dump = server.dump()
@@ -26,8 +26,8 @@ splogin.request.set_isPassive(0)
 splogin.request.set_forceAuthn(1)
 splogin.request.set_nameIDPolicy(lasso.libNameIDPolicyTypeFederated)
 splogin.request.set_relayState("fake")
-splogin.request.set_consent(lasso.libConsentObtained)
-splogin.request.set_protocolProfile(lasso.libProtocolProfileBrwsArt)
+splogin.request.set_consent(lasso.LIB_CONSENT_OBTAINED)
+splogin.request.set_protocolProfile(lasso.LIB_PROTOCOL_PROFILE_BRWS_ART)
 
 splogin.build_authn_request_msg()
 print "message url =", splogin.msg_url
@@ -37,7 +37,7 @@ print "message url =", splogin.msg_url
 #####################
 server = lasso.Server.new("../../examples/idp.xml",
                           None, "../../examples/rsakey.pem", "../../examples/rootcert.pem",
-                          lasso.signatureMethodRsaSha1)
+                          lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 server.add_provider("../../examples/sp.xml",
                     "../../examples/rsapub.pem", "../../examples/rsacert.pem")
@@ -48,18 +48,18 @@ idplogin = lasso.Login.new(server)
 # get query part in msg_url
 authn_request_msg = string.split(splogin.msg_url, '?')[1]
 ret = idplogin.init_from_authn_request_msg(authn_request_msg,
-                                           lasso.httpMethodRedirect)
+                                           lasso.HTTP_METHOD_REDIRECT)
 
 print "ProtocolProfile =", idplogin.protocolProfile
 
 must_authenticate = idplogin.must_authenticate()
 print "User must be authenticated =", must_authenticate
 
-if idplogin.protocolProfile == lasso.loginProtocolProfileBrwsArt:
+if idplogin.protocolProfile == lasso.LOGIN_PROTOCOL_PROFILE_BRWS_ART:
     ret = idplogin.build_artifact_msg(1,
-                                      lasso.samlAuthenticationMethodPassword,
+                                      lasso.SAML_AUTHENTICATION_METHOD_PASSWORD,
                                       "",
-                                      lasso.httpMethodRedirect)
+                                      lasso.HTTP_METHOD_REDIRECT)
     print "ret = %d, msg_url = %s" % (ret, idplogin.msg_url)
     sess = idplogin.get_session()
     print sess.providerIDs
@@ -69,7 +69,7 @@ if idplogin.protocolProfile == lasso.loginProtocolProfileBrwsArt:
 ####################
 server = lasso.Server.new("../../examples/sp.xml",
                           "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-                          lasso.signatureMethodRsaSha1)
+                          lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 server.add_provider("../../examples/idp.xml", None, None)
 
@@ -78,7 +78,7 @@ splogin = lasso.Login.new(server)
 
 response_msg = string.split(idplogin.msg_url, '?')[1]
 ret = splogin.init_request(response_msg,
-                           lasso.httpMethodRedirect)
+                           lasso.HTTP_METHOD_REDIRECT)
 
 ret = splogin.build_request_msg()
 print "ret = %d, msg_url = %s, msg_body = %s" % (ret, splogin.msg_url, splogin.msg_body)
@@ -88,7 +88,7 @@ print "ret = %d, msg_url = %s, msg_body = %s" % (ret, splogin.msg_url, splogin.m
 #####################
 server = lasso.Server.new("../../examples/idp.xml",
                           None, "../../examples/rsakey.pem", "../../examples/rootcert.pem",
-                          lasso.signatureMethodRsaSha1)
+                          lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 server.add_provider("../../examples/sp.xml",
                     "../../examples/rsapub.pem", "../../examples/rsacert.pem")
diff --git a/python/examples/logout.py b/python/examples/logout.py
index b8e86431..46113731 100644
--- a/python/examples/logout.py
+++ b/python/examples/logout.py
@@ -7,7 +7,7 @@ import lasso
 # SP1 server and user :
 sp1server = lasso.Server.new("../../examples/sp1.xml",
     "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+    lasso.SIGNATURE_METHOD_RSA_SHA1)
 sp1server.add_provider("../../examples/idp.xml", None, None)
 
 sp1user_dump = "<LassoUser><LassoAssertions><LassoAssertion RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><Assertion AssertionID=\"C9DS8CD7CSD6CDSCKDKCS\"></Assertion></LassoAssertion></LassoAssertions><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">11111111111111111111111111</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
@@ -15,7 +15,7 @@ sp1user_dump = "<LassoUser><LassoAssertions><LassoAssertion RemoteProviderID=\"h
 # SP2 server and user :
 sp2server = lasso.Server.new("../../examples/sp2.xml",
     "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+    lasso.SIGNATURE_METHOD_RSA_SHA1)
 sp2server.add_provider("../../examples/idp.xml", None, None)
 
 sp2user_dump = "<LassoUser><LassoAssertions><LassoAssertion RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><Assertion AssertionID=\"4IK43JCJSDCSDKCSCSDL\"></Assertion></LassoAssertion></LassoAssertions><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">222222222222222222222222</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
@@ -23,7 +23,7 @@ sp2user_dump = "<LassoUser><LassoAssertions><LassoAssertion RemoteProviderID=\"h
 # IDP server and user :
 idpserver = lasso.Server.new("../../examples/idp.xml",
     "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+    lasso.SIGNATURE_METHOD_RSA_SHA1)
 idpserver.add_provider("../../examples/sp1.xml", None, None)
 idpserver.add_provider("../../examples/sp2.xml", None, None)
 idpserver.add_provider("../../examples/sp3.xml", None, None)
@@ -55,13 +55,13 @@ sp1logout.destroy()
 idpuser = lasso.User.new_from_dump(idpuser_dump)
 idplogout = lasso.Logout.new(idpserver, lasso.providerTypeIdp)
 
-if lasso.get_request_type_from_soap_msg(msg_body)==lasso.requestTypeLogout:
+if lasso.get_request_type_from_soap_msg(msg_body)==lasso.REQUEST_TYPE_LOGOUT:
     print "it's a logout request !"
 
 #fake response, only for test !
 response_msg_body = "<Envelope><LogoutResponse><ProviderID>https://service-provider2:2003/liberty-alliance/metadata</ProviderID><Status><StatusCode Value=\"Samlp:Success\"></StatusCode></Status></LogoutResponse></Envelope>"
 
-idplogout.load_request_msg(msg_body, lasso.httpMethodSoap)
+idplogout.load_request_msg(msg_body, lasso.HTTP_METHOD_SOAP)
 nameIdentifier = idplogout.nameIdentifier
 print "get the user dump from NameIdentifier : ", nameIdentifier
 idplogout.set_user_from_dump(idpuser_dump)
@@ -76,7 +76,7 @@ while next_provider_id:
 
     print "send soap msg to url", idplogout.msg_url
     # remote SP send back a LogoutResponse, process it.
-    idplogout.process_response_msg(response_msg_body, lasso.httpMethodSoap)
+    idplogout.process_response_msg(response_msg_body, lasso.HTTP_METHOD_SOAP)
 
     next_provider_id = idplogout.get_next_providerID()
 
diff --git a/python/examples/registration.py b/python/examples/registration.py
index 23d2fb8d..a619fd54 100644
--- a/python/examples/registration.py
+++ b/python/examples/registration.py
@@ -7,13 +7,13 @@ import lasso
 # servers :
 spserver = lasso.Server.new("../../examples/sp.xml",
     "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+    lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 spserver.add_provider("../../examples/idp.xml", None, None)
 
 idpserver = lasso.Server.new("../../examples/idp.xml",
     "../../examples/rsapub.pem", "../../examples/rsakey.pem", "../../examples/rsacert.pem",
-    lasso.signatureMethodRsaSha1)
+    lasso.SIGNATURE_METHOD_RSA_SHA1)
 
 spserver.add_provider("../../examples/sp.xml", None, None)
 
diff --git a/python/tests/binding_tests.py b/python/tests/binding_tests.py
index 0889133e..cb621e90 100755
--- a/python/tests/binding_tests.py
+++ b/python/tests/binding_tests.py
@@ -50,8 +50,8 @@ class BindingTestCase(unittest.TestCase):
 
         # Test a string attribute.
         self.failUnlessEqual(authnRequest.consent, None)
-        authnRequest.consent = lasso.libConsentObtained
-        self.failUnlessEqual(authnRequest.consent, lasso.libConsentObtained)
+        authnRequest.consent = lasso.LIB_CONSENT_OBTAINED
+        self.failUnlessEqual(authnRequest.consent, lasso.LIB_CONSENT_OBTAINED)
         authnRequest.consent = None
         self.failUnlessEqual(authnRequest.consent, None)
 
@@ -232,8 +232,8 @@ class BindingTestCase(unittest.TestCase):
 
         self.failUnlessEqual(login.request, None)
         login.request = lasso.LibAuthnRequest()
-        login.request.consent = lasso.libConsentObtained
-        self.failUnlessEqual(login.request.consent, lasso.libConsentObtained)
+        login.request.consent = lasso.LIB_CONSENT_OBTAINED
+        self.failUnlessEqual(login.request.consent, lasso.LIB_CONSENT_OBTAINED)
         login.request = None
         self.failUnlessEqual(login.request, None)
 
diff --git a/python/tests/profiles_tests.py b/python/tests/profiles_tests.py
index cd7293ba..b5a58dbd 100755
--- a/python/tests/profiles_tests.py
+++ b/python/tests/profiles_tests.py
@@ -53,7 +53,7 @@ class ServerTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleIdp,
+            lasso.PROVIDER_ROLE_IDP,
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
             os.path.join(dataDir, 'idp1-la/public-key.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
@@ -67,7 +67,7 @@ class ServerTestCase(unittest.TestCase):
 
         lassoServer = lasso.Server()
         lassoServer.addProvider(
-            lasso.providerRoleIdp, os.path.join(dataDir, 'idp1-la/metadata.xml'))
+            lasso.PROVIDER_ROLE_IDP, os.path.join(dataDir, 'idp1-la/metadata.xml'))
         dump = lassoServer.dump()
         lassoServer2 = lassoServer.newFromDump(dump)
         dump2 = lassoServer2.dump()
@@ -84,15 +84,15 @@ class LoginTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleIdp,
+            lasso.PROVIDER_ROLE_IDP,
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
             os.path.join(dataDir, 'idp1-la/public-key.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         login = lasso.Login(lassoServer)
         login.initAuthnRequest()
         login.request
-        login.request.protocolProfile = lasso.libProtocolProfileBrwsArt
-        self.failUnlessEqual(login.request.protocolProfile, lasso.libProtocolProfileBrwsArt)
+        login.request.protocolProfile = lasso.LIB_PROTOCOL_PROFILE_BRWS_ART
+        self.failUnlessEqual(login.request.protocolProfile, lasso.LIB_PROTOCOL_PROFILE_BRWS_ART)
 
     def test02(self):
         """SP login; testing processing of an empty Response."""
@@ -103,7 +103,7 @@ class LoginTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleIdp,
+            lasso.PROVIDER_ROLE_IDP,
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
             os.path.join(dataDir, 'idp1-la/public-key.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
@@ -125,7 +125,7 @@ class LogoutTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleIdp,
+            lasso.PROVIDER_ROLE_IDP,
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
             os.path.join(dataDir, 'idp1-la/public-key.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
@@ -147,7 +147,7 @@ class LogoutTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleSp,
+            lasso.PROVIDER_ROLE_SP,
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
             os.path.join(dataDir, 'sp1-la/public-key.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
@@ -163,7 +163,7 @@ class LogoutTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleSp,
+            lasso.PROVIDER_ROLE_SP,
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
             os.path.join(dataDir, 'sp1-la/public-key.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
@@ -186,7 +186,7 @@ class LogoutTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleSp,
+            lasso.PROVIDER_ROLE_SP,
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
             os.path.join(dataDir, 'sp1-la/public-key.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
@@ -209,7 +209,7 @@ class LogoutTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleSp,
+            lasso.PROVIDER_ROLE_SP,
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
             os.path.join(dataDir, 'sp1-la/public-key.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
@@ -225,7 +225,7 @@ class DefederationTestCase(unittest.TestCase):
             None,
             os.path.join(dataDir, 'idp1-la/certificate.pem'))
         lassoServer.addProvider(
-            lasso.providerRoleSp,
+            lasso.PROVIDER_ROLE_SP,
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
             os.path.join(dataDir, 'sp1-la/public-key.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'))
diff --git a/swig/Lasso-wsf.i b/swig/Lasso-wsf.i
index a31a724d..33e228f3 100644
--- a/swig/Lasso-wsf.i
+++ b/swig/Lasso-wsf.i
@@ -49,12 +49,12 @@
 
 /* WSF prefix & href */
 #ifndef SWIGPHP4
-%rename(discoHref) LASSO_DISCO_HREF;
-%rename(discoPrefix) LASSO_DISCO_PREFIX;
-%rename(epHref) LASSO_EP_HREF;
-%rename(epPrefix) LASSO_EP_PREFIX;
-%rename(ppHref) LASSO_PP_HREF;
-%rename(ppPrefix) LASSO_PP_PREFIX;
+%rename(DISCO_HREF) LASSO_DISCO_HREF;
+%rename(DISCO_PREFIX) LASSO_DISCO_PREFIX;
+%rename(EP_HREF) LASSO_EP_HREF;
+%rename(EP_PREFIX) LASSO_EP_PREFIX;
+%rename(PP_HREF) LASSO_PP_HREF;
+%rename(PP_PREFIX) LASSO_PP_PREFIX;
 #endif
 #define LASSO_DISCO_HREF   "urn:liberty:disco:2003-08"
 #define LASSO_DISCO_PREFIX "disco"
@@ -65,28 +65,28 @@
 
 /* WSF status code */
 #ifndef SWIGPHP4
-%rename(dstStatusCodeActionNotAuthorized) LASSO_DST_STATUS_CODE_ACTION_NOT_AUTHORIZED;
-%rename(dstStatusCodeActionNotSupported) LASSO_DST_STATUS_CODE_ACTION_NOT_SUPPORTED;
-%rename(dstStatusCodeAllReturned) LASSO_DST_STATUS_CODE_ALL_RETURNED;
-%rename(dstStatusCodeChangeHistoryNotSupported) LASSO_DST_STATUS_CODE_CHANGE_HISTORY_NOT_SUPPORTED;
-%rename(dstStatusCodechangedSinceReturnsAll) LASSO_DST_STATUS_CODE_CHANGED_SINCE_RETURNS_ALL;
-%rename(dstStatusCodeDataTooLong) LASSO_DST_STATUS_CODE_DATA_TOO_LONG;
-%rename(dstStatusCodeExistsAlready) LASSO_DST_STATUS_CODE_EXISTS_ALREADY;
-%rename(dstStatusCodeExtensionNotSupported) LASSO_DST_STATUS_CODE_EXTENSION_NOT_SUPPORTED;
-%rename(dstStatusCodeFailed) LASSO_DST_STATUS_CODE_FAILED;
-%rename(dstStatusCodeInvalidData) LASSO_DST_STATUS_CODE_INVALID_DATA;
-%rename(dstStatusCodeInvalidResourceId) LASSO_DST_STATUS_CODE_INVALID_RESOURCE_ID;
-%rename(dstStatusCodeInvalidSelect) LASSO_DST_STATUS_CODE_INVALID_SELECT;
-%rename(dstStatusCodeMissingNewDataElement) LASSO_DST_STATUS_CODE_MISSING_NEW_DATA_ELEMENT;
-%rename(dstStatusCodeMissingResourceIdElement) LASSO_DST_STATUS_CODE_MISSING_RESOURCE_ID_ELEMENT;
-%rename(dstStatusCodeMissingSelect) LASSO_DST_STATUS_CODE_MISSING_SELECT;
-%rename(dstStatusCodeModifiedSince) LASSO_DST_STATUS_CODE_MODIFIED_SINCE;
-%rename(dstStatusCodeNoMoreElements) LASSO_DST_STATUS_CODE_NO_MORE_ELEMENTS;
-%rename(dstStatusCodeNoMultipleAllowed) LASSO_DST_STATUS_CODE_NO_MULTIPLE_ALLOWED;
-%rename(dstStatusCodeNoMultipleResources) LASSO_DST_STATUS_CODE_NO_MULTIPLE_RESOURCES;
-%rename(dstStatusCodeOk) LASSO_DST_STATUS_CODE_OK;
-%rename(dstStatusCodeTimeOut) LASSO_DST_STATUS_CODE_TIME_OUT;
-%rename(dstStatusCodeUnexpectedError) LASSO_DST_STATUS_CODE_UNEXPECTED_ERROR;
+%rename(DST_STATUS_CODE_ACTION_NOT_AUTHORIZED) LASSO_DST_STATUS_CODE_ACTION_NOT_AUTHORIZED;
+%rename(DST_STATUS_CODE_ACTION_NOT_SUPPORTED) LASSO_DST_STATUS_CODE_ACTION_NOT_SUPPORTED;
+%rename(DST_STATUS_CODE_ALL_RETURNED) LASSO_DST_STATUS_CODE_ALL_RETURNED;
+%rename(DST_STATUS_CODE_CHANGE_HISTORY_NOT_SUPPORTED) LASSO_DST_STATUS_CODE_CHANGE_HISTORY_NOT_SUPPORTED;
+%rename(DST_STATUS_CODE_CHANGED_SINCE_RETURNS_ALL) LASSO_DST_STATUS_CODE_CHANGED_SINCE_RETURNS_ALL;
+%rename(DST_STATUS_CODE_DATA_TOO_LONG) LASSO_DST_STATUS_CODE_DATA_TOO_LONG;
+%rename(DST_STATUS_CODE_EXISTS_ALREADY) LASSO_DST_STATUS_CODE_EXISTS_ALREADY;
+%rename(DST_STATUS_CODE_EXTENSION_NOT_SUPPORTED) LASSO_DST_STATUS_CODE_EXTENSION_NOT_SUPPORTED;
+%rename(DST_STATUS_CODE_FAILED) LASSO_DST_STATUS_CODE_FAILED;
+%rename(DST_STATUS_CODE_INVALID_DATA) LASSO_DST_STATUS_CODE_INVALID_DATA;
+%rename(DST_STATUS_CODE_INVALID_RESOURCE_ID) LASSO_DST_STATUS_CODE_INVALID_RESOURCE_ID;
+%rename(DST_STATUS_CODE_INVALID_SELECT) LASSO_DST_STATUS_CODE_INVALID_SELECT;
+%rename(DST_STATUS_CODE_MISSING_NEW_DATA_ELEMENT) LASSO_DST_STATUS_CODE_MISSING_NEW_DATA_ELEMENT;
+%rename(DST_STATUS_CODE_MISSING_RESOURCE_ID_ELEMENT) LASSO_DST_STATUS_CODE_MISSING_RESOURCE_ID_ELEMENT;
+%rename(DST_STATUS_CODE_MISSING_SELECT) LASSO_DST_STATUS_CODE_MISSING_SELECT;
+%rename(DST_STATUS_CODE_MODIFIED_SINCE) LASSO_DST_STATUS_CODE_MODIFIED_SINCE;
+%rename(DST_STATUS_CODE_NO_MORE_ELEMENTS) LASSO_DST_STATUS_CODE_NO_MORE_ELEMENTS;
+%rename(DST_STATUS_CODE_NO_MULTIPLE_ALLOWED) LASSO_DST_STATUS_CODE_NO_MULTIPLE_ALLOWED;
+%rename(DST_STATUS_CODE_NO_MULTIPLE_RESOURCES) LASSO_DST_STATUS_CODE_NO_MULTIPLE_RESOURCES;
+%rename(DST_STATUS_CODE_OK) LASSO_DST_STATUS_CODE_OK;
+%rename(DST_STATUS_CODE_TIME_OUT) LASSO_DST_STATUS_CODE_TIME_OUT;
+%rename(DST_STATUS_CODE_UNEXPECTED_ERROR) LASSO_DST_STATUS_CODE_UNEXPECTED_ERROR;
 #endif
 #define LASSO_DST_STATUS_CODE_ACTION_NOT_AUTHORIZED "ActionNotAuthorized"
 #define LASSO_DST_STATUS_CODE_ACTION_NOT_SUPPORTED "ActionNotSupported"
@@ -151,11 +151,11 @@ typedef struct {
 
 /* Attributes Implementations */
 
-/* AttributeValue */
-#define LassoDiscoCredentials_get_AttributeValue(self) get_node_list((self)->any)
-#define LassoDiscoCredentials_AttributeValue_get(self) get_node_list((self)->any)
-#define LassoDiscoCredentials_set_AttributeValue(self, value) set_node_list(&(self)->any, (value))
-#define LassoDiscoCredentials_AttributeValue_set(self, value) set_node_list(&(self)->any, (value))
+/* any */
+#define LassoDiscoCredentials_get_any(self) get_node_list((self)->any)
+#define LassoDiscoCredentials_any_get(self) get_node_list((self)->any)
+#define LassoDiscoCredentials_set_any(self, value) set_node_list(&(self)->any, (value))
+#define LassoDiscoCredentials_any_set(self, value) set_node_list(&(self)->any, (value))
 
 /* Constructors, destructors & static methods implementations */
 #define new_LassoDiscoCredentials lasso_disco_credentials_new
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 59678023..e25e41e8 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -649,13 +649,13 @@ SET_NODE_INFO(Node, DowncastableNode)
 
 /* HttpMethod */
 #ifndef SWIGPHP4
-%rename(httpMethodNone) LASSO_HTTP_METHOD_NONE;
-%rename(httpMethodAny) LASSO_HTTP_METHOD_ANY;
-%rename(httpMethodIdpInitiated) LASSO_HTTP_METHOD_IDP_INITIATED;
-%rename(httpMethodGet) LASSO_HTTP_METHOD_GET;
-%rename(httpMethodPost) LASSO_HTTP_METHOD_POST;
-%rename(httpMethodRedirect) LASSO_HTTP_METHOD_REDIRECT;
-%rename(httpMethodSoap) LASSO_HTTP_METHOD_SOAP;
+%rename(HTTP_METHOD_NONE) LASSO_HTTP_METHOD_NONE;
+%rename(HTTP_METHOD_ANY) LASSO_HTTP_METHOD_ANY;
+%rename(HTTP_METHOD_IDP_INITIATED) LASSO_HTTP_METHOD_IDP_INITIATED;
+%rename(HTTP_METHOD_GET) LASSO_HTTP_METHOD_GET;
+%rename(HTTP_METHOD_POST) LASSO_HTTP_METHOD_POST;
+%rename(HTTP_METHOD_REDIRECT) LASSO_HTTP_METHOD_REDIRECT;
+%rename(HTTP_METHOD_SOAP) LASSO_HTTP_METHOD_SOAP;
 #endif
 typedef enum {
 	LASSO_HTTP_METHOD_NONE = -1,
@@ -669,12 +669,12 @@ typedef enum {
 
 /* Consent */
 #ifndef SWIGPHP4
-%rename(libConsentObtained) LASSO_LIB_CONSENT_OBTAINED;
-%rename(libConsentObtainedPrior) LASSO_LIB_CONSENT_OBTAINED_PRIOR;
-%rename(libConsentObtainedCurrentImplicit) LASSO_LIB_CONSENT_OBTAINED_CURRENT_IMPLICIT;
-%rename(libConsentObtainedCurrentExplicit) LASSO_LIB_CONSENT_OBTAINED_CURRENT_EXPLICIT;
-%rename(libConsentUnavailable) LASSO_LIB_CONSENT_UNAVAILABLE;
-%rename(libConsentInapplicable) LASSO_LIB_CONSENT_INAPPLICABLE;
+%rename(LIB_CONSENT_OBTAINED) LASSO_LIB_CONSENT_OBTAINED;
+%rename(LIB_CONSENT_OBTAINEDPrior) LASSO_LIB_CONSENT_OBTAINED_PRIOR;
+%rename(LIB_CONSENT_OBTAINED_CURRENT_IMPLICIT) LASSO_LIB_CONSENT_OBTAINED_CURRENT_IMPLICIT;
+%rename(LIB_CONSENT_OBTAINED_CURRENT_EXPLICIT) LASSO_LIB_CONSENT_OBTAINED_CURRENT_EXPLICIT;
+%rename(LIB_CONSENT_UNAVAILABLE) LASSO_LIB_CONSENT_UNAVAILABLE;
+%rename(LIB_CONSENT_INAPPLICABLE) LASSO_LIB_CONSENT_INAPPLICABLE;
 #endif
 #define LASSO_LIB_CONSENT_OBTAINED "urn:liberty:consent:obtained"
 #define LASSO_LIB_CONSENT_OBTAINED_PRIOR "urn:liberty:consent:obtained:prior"
@@ -685,10 +685,10 @@ typedef enum {
 
 /* NameIdPolicyType */
 #ifndef SWIGPHP4
-%rename(libNameIdPolicyTypeNone) LASSO_LIB_NAMEID_POLICY_TYPE_NONE;
-%rename(libNameIdPolicyTypeOneTime) LASSO_LIB_NAMEID_POLICY_TYPE_ONE_TIME;
-%rename(libNameIdPolicyTypeFederated) LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED;
-%rename(libNameIdPolicyTypeAny) LASSO_LIB_NAMEID_POLICY_TYPE_ANY;
+%rename(LIB_NAMEID_POLICY_TYPE_NONE) LASSO_LIB_NAMEID_POLICY_TYPE_NONE;
+%rename(LIB_NAMEID_POLICY_TYPE_ONE_TIME) LASSO_LIB_NAMEID_POLICY_TYPE_ONE_TIME;
+%rename(LIB_NAMEID_POLICY_TYPE_FEDERATED) LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED;
+%rename(LIB_NAMEID_POLICY_TYPE_ANY) LASSO_LIB_NAMEID_POLICY_TYPE_ANY;
 #endif
 #define LASSO_LIB_NAMEID_POLICY_TYPE_NONE "none"
 #define LASSO_LIB_NAMEID_POLICY_TYPE_ONE_TIME "onetime"
@@ -697,20 +697,20 @@ typedef enum {
 
 /* ProtocolProfile */
 #ifndef SWIGPHP4
-%rename(libProtocolProfileBrwsArt) LASSO_LIB_PROTOCOL_PROFILE_BRWS_ART;
-%rename(libProtocolProfileBrwsPost) LASSO_LIB_PROTOCOL_PROFILE_BRWS_POST;
-%rename(libProtocolProfileFedTermIdpHttp) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_HTTP;
-%rename(libProtocolProfileFedTermIdpSoap) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_SOAP;
-%rename(libProtocolProfileFedTermSpHttp) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_HTTP;
-%rename(libProtocolProfileFedTermSpSoap) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_SOAP;
-%rename(libProtocolProfileRniIdpHttp) LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_HTTP;
-%rename(libProtocolProfileRniIdpSoap) LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_SOAP;
-%rename(libProtocolProfileRniSpHttp) LASSO_LIB_PROTOCOL_PROFILE_RNI_SP_HTTP;
-%rename(libProtocolProfileRniSpSoap) LASSO_LIB_PROTOCOL_PROFILE_RNI_SP_SOAP;
-%rename(libProtocolProfileSloIdpHttp) LASSO_LIB_PROTOCOL_PROFILE_SLO_IDP_HTTP;
-%rename(libProtocolProfileSloIdpSoap) LASSO_LIB_PROTOCOL_PROFILE_SLO_IDP_SOAP;
-%rename(libProtocolProfileSloSpHttp) LASSO_LIB_PROTOCOL_PROFILE_SLO_SP_HTTP;
-%rename(libProtocolProfileSloSpSoap) LASSO_LIB_PROTOCOL_PROFILE_SLO_SP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_BRWS_ART) LASSO_LIB_PROTOCOL_PROFILE_BRWS_ART;
+%rename(LIB_PROTOCOL_PROFILE_BRWS_POST) LASSO_LIB_PROTOCOL_PROFILE_BRWS_POST;
+%rename(LIB_PROTOCOL_PROFILE_FED_TERM_IDP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_FED_TERM_IDP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_FED_TERM_SP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_FED_TERM_SP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_RNI_IDP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_RNI_IDP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_RNI_SP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_RNI_SP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_RNI_SP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_RNI_SP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_SLO_IDP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_SLO_IDP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_SLO_IDP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_SLO_IDP_SOAP;
+%rename(LIB_PROTOCOL_PROFILE_SLO_SP_HTTP) LASSO_LIB_PROTOCOL_PROFILE_SLO_SP_HTTP;
+%rename(LIB_PROTOCOL_PROFILE_SLO_SP_SOAP) LASSO_LIB_PROTOCOL_PROFILE_SLO_SP_SOAP;
 #endif
 #define LASSO_LIB_PROTOCOL_PROFILE_BRWS_ART "http://projectliberty.org/profiles/brws-art"
 #define LASSO_LIB_PROTOCOL_PROFILE_BRWS_POST "http://projectliberty.org/profiles/brws-post"
@@ -729,8 +729,8 @@ typedef enum {
 
 /* LoginProtocolProfile */
 #ifndef SWIGPHP4
-%rename(loginProtocolProfileBrwsArt) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART;
-%rename(loginProtocolProfileBrwsPost) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST;
+%rename(LOGIN_PROTOCOL_PROFILE_BRWS_ART) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART;
+%rename(LOGIN_PROTOCOL_PROFILE_BRWS_POST) LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST;
 #endif
 typedef enum {
 	LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART = 1,
@@ -739,12 +739,12 @@ typedef enum {
 
 /* MessageType */
 #ifndef SWIGPHP4
-%rename(messageTypeNone) LASSO_MESSAGE_TYPE_NONE;
-%rename(messageTypeAuthnRequest) LASSO_MESSAGE_TYPE_AUTHN_REQUEST;
-%rename(messageTypeAuthnResponse) LASSO_MESSAGE_TYPE_AUTHN_RESPONSE;
-%rename(messageTypeRequest) LASSO_MESSAGE_TYPE_REQUEST;
-%rename(messageTypeResponse) LASSO_MESSAGE_TYPE_RESPONSE;
-%rename(messageTypeArtifact) LASSO_MESSAGE_TYPE_ARTIFACT;
+%rename(MESSAGE_TYPE_NONE) LASSO_MESSAGE_TYPE_NONE;
+%rename(MESSAGE_TYPE_AUTHN_REQUEST) LASSO_MESSAGE_TYPE_AUTHN_REQUEST;
+%rename(MESSAGE_TYPE_AUTHN_RESPONSE) LASSO_MESSAGE_TYPE_AUTHN_RESPONSE;
+%rename(MESSAGE_TYPE_REQUEST) LASSO_MESSAGE_TYPE_REQUEST;
+%rename(MESSAGE_TYPE_RESPONSE) LASSO_MESSAGE_TYPE_RESPONSE;
+%rename(MESSAGE_TYPE_ARTIFACT) LASSO_MESSAGE_TYPE_ARTIFACT;
 #endif
 typedef enum {
 	LASSO_MESSAGE_TYPE_NONE = 0,
@@ -757,9 +757,9 @@ typedef enum {
 
 /* ProviderRole */
 #ifndef SWIGPHP4
-%rename(providerRoleNone) LASSO_PROVIDER_ROLE_NONE;
-%rename(providerRoleSp) LASSO_PROVIDER_ROLE_SP;
-%rename(providerRoleIdp) LASSO_PROVIDER_ROLE_IDP;
+%rename(PROVIDER_ROLE_NONE) LASSO_PROVIDER_ROLE_NONE;
+%rename(PROVIDER_ROLE_SP) LASSO_PROVIDER_ROLE_SP;
+%rename(PROVIDER_ROLE_IDP) LASSO_PROVIDER_ROLE_IDP;
 #endif
 typedef enum {
 	LASSO_PROVIDER_ROLE_NONE = 0,
@@ -769,13 +769,13 @@ typedef enum {
 
 /* RequestType */
 #ifndef SWIGPHP4
-%rename(requestTypeInvalid) LASSO_REQUEST_TYPE_INVALID;
-%rename(requestTypeLogin) LASSO_REQUEST_TYPE_LOGIN;
-%rename(requestTypeLogout) LASSO_REQUEST_TYPE_LOGOUT;
-%rename(requestTypeDefederation) LASSO_REQUEST_TYPE_DEFEDERATION;
-%rename(requestTypeNameRegistration) LASSO_REQUEST_TYPE_NAME_REGISTRATION;
-%rename(requestTypeNameIdentifierMapping) LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING;
-%rename(requestTypeLecp) LASSO_REQUEST_TYPE_LECP;
+%rename(REQUEST_TYPE_INVALID) LASSO_REQUEST_TYPE_INVALID;
+%rename(REQUEST_TYPE_LOGIN) LASSO_REQUEST_TYPE_LOGIN;
+%rename(REQUEST_TYPE_LOGOUT) LASSO_REQUEST_TYPE_LOGOUT;
+%rename(REQUEST_TYPE_DEFEDERATION) LASSO_REQUEST_TYPE_DEFEDERATION;
+%rename(REQUEST_TYPE_NAME_REGISTRATION) LASSO_REQUEST_TYPE_NAME_REGISTRATION;
+%rename(REQUEST_TYPE_NAME_IDENTIFIER_MAPPING) LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING;
+%rename(REQUEST_TYPE_LECP) LASSO_REQUEST_TYPE_LECP;
 #endif
 typedef enum {
 	LASSO_REQUEST_TYPE_INVALID = 0,
@@ -789,17 +789,17 @@ typedef enum {
 
 /* SamlAuthenticationMethod */
 #ifndef SWIGPHP4
-%rename(samlAuthenticationMethodPassword) LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD;
-%rename(samlAuthenticationMethodKerberos) LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS;
-%rename(samlAuthenticationMethodSecureRemotePassword) LASSO_SAML_AUTHENTICATION_METHOD_SECURE_REMOTE_PASSWORD;
-%rename(samlAuthenticationMethodHardwareToken) LASSO_SAML_AUTHENTICATION_METHOD_HARDWARE_TOKEN;
-%rename(samlAuthenticationMethodSmartcardPki) LASSO_SAML_AUTHENTICATION_METHOD_SMARTCARD_PKI;
-%rename(samlAuthenticationMethodSoftwarePki) LASSO_SAML_AUTHENTICATION_METHOD_SOFTWARE_PKI;
-%rename(samlAuthenticationMethodPgp) LASSO_SAML_AUTHENTICATION_METHOD_PGP;
-%rename(samlAuthenticationMethodSpki) LASSO_SAML_AUTHENTICATION_METHODS_PKI;
-%rename(samlAuthenticationMethodXkms) LASSO_SAML_AUTHENTICATION_METHOD_XKMS;
-%rename(samlAuthenticationMethodXmlDsig) LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG;
-%rename(samlAuthenticationMethodUnspecified) LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED;
+%rename(SAML_AUTHENTICATION_METHOD_PASSWORD) LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD;
+%rename(SAML_AUTHENTICATION_METHOD_KERBEROS) LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS;
+%rename(SAML_AUTHENTICATION_METHOD_SECURE_REMOTE_PASSWORD) LASSO_SAML_AUTHENTICATION_METHOD_SECURE_REMOTE_PASSWORD;
+%rename(SAML_AUTHENTICATION_METHOD_HARDWARE_TOKEN) LASSO_SAML_AUTHENTICATION_METHOD_HARDWARE_TOKEN;
+%rename(SAML_AUTHENTICATION_METHOD_SMARTCARD_PKI) LASSO_SAML_AUTHENTICATION_METHOD_SMARTCARD_PKI;
+%rename(SAML_AUTHENTICATION_METHOD_SOFTWARE_PKI) LASSO_SAML_AUTHENTICATION_METHOD_SOFTWARE_PKI;
+%rename(SAML_AUTHENTICATION_METHOD_PGP) LASSO_SAML_AUTHENTICATION_METHOD_PGP;
+%rename(SAML_AUTHENTICATION_METHODS_PKI) LASSO_SAML_AUTHENTICATION_METHODS_PKI;
+%rename(SAML_AUTHENTICATION_METHOD_XKMS) LASSO_SAML_AUTHENTICATION_METHOD_XKMS;
+%rename(SAML_AUTHENTICATION_METHOD_XMLD_SIG) LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG;
+%rename(SAML_AUTHENTICATION_METHOD_UNSPECIFIED) LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED;
 #endif
 #define LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD "urn:oasis:names:tc:SAML:1.0:am:password"
 #define LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS "urn:ietf:rfc:1510"
@@ -815,8 +815,8 @@ typedef enum {
 
 /* SignatureMethod */
 #ifndef SWIGPHP4
-%rename(signatureMethodRsaSha1) LASSO_SIGNATURE_METHOD_RSA_SHA1;
-%rename(signatureMethodDsaSha1) LASSO_SIGNATURE_METHOD_DSA_SHA1;
+%rename(SIGNATURE_METHOD_RSA_SHA1) LASSO_SIGNATURE_METHOD_RSA_SHA1;
+%rename(SIGNATURE_METHOD_DSA_SHA1) LASSO_SIGNATURE_METHOD_DSA_SHA1;
 #endif
 typedef enum {
 	LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,