SWIG high-level binding now uses camelCase.

Updated SWIG binding to support Java high-level classes.

Simplified java/Makefile.am (but now, it needs to be reworked by an
autotools expert).

ColdFusion simple Java test compiles ok.

7 files changed, 474 insertions, 469 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index d1f037ec..308b8897 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -27,41 +27,27 @@ libjlasso_la_LDFLAGS =	-no-undefined -avoid-version -module
 javashare_DATA = lasso.jar
 JAVA_JAR = lasso.jar
 
-SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in
+SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE)JNI.java
 JAVA_CRUFT = $(JAVA_PATH)$(JAVA_MODULE).class $(JAVA_MODULE)_wrap.o \
 	$(JAVA_JAR) \
-	$(JAVA_PATH)$(JAVA_MODULE)JNI.java
+	$(JAVA_PATH)$(JAVA_MODULE).java
 
 # The SWIG outputs are included in the distribution so SWIG is not
 # required to use the Java interface
-EXTRA_DIST = lasso-fragment.java $(SWIG_OUTPUTS)
+EXTRA_DIST = $(SWIG_OUTPUTS)
 
 CLEANFILES = $(JAVA_CRUFT)
 MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
 
 
-$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(top_srcdir)/swig/Lasso.i
+$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java: $(top_srcdir)/swig/Lasso.i
 	here=`pwd`; \
-	$(SWIG) -v -java -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<; \
-	if test -r $(JAVA_MODULE)JNI.java; then \
-	  echo "Fixing SWIG 1.3.15+ broken Java API"; \
-	  rm -f $(JAVA_MODULE).java SWIGTYPE_*; \
-	  sed -e 's/class $(JAVA_MODULE)JNI/public class $(JAVA_MODULE)/' $(JAVA_MODULE)JNI.java > $(JAVA_MODULE).java; \
-	  sed -e 's/$(JAVA_MODULE)JNI/$(JAVA_MODULE)/g' $(JAVA_MODULE)_wrap.c > $(JAVA_MODULE)_wrap.c.new; \
-	  rm -f $(JAVA_MODULE)_wrap.c $(JAVA_MODULE)JNI.java; \
-	  mv $(JAVA_MODULE)_wrap.c.new $(JAVA_MODULE)_wrap.c; \
-	fi; \
-	mv $(JAVA_MODULE).java $(JAVA_MODULE).java.in
+	$(SWIG) -v -java -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<
 
 # FIXME There must be a better way to do this with SWIG
-$(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java.in lasso-fragment.java
-	mkdir -p $(JAVA_PATH) 
-	cd $(JAVA_PATH) 
-	sed -e 's/^}//' $(JAVA_MODULE).java.in > $(JAVA_PATH)$(JAVA_MODULE).java.tmp
-	cat $(JAVA_PATH)$(JAVA_MODULE).java.tmp lasso-fragment.java > $@
-	echo "}" >> $@
-	rm -f $(JAVA_PATH)$(JAVA_MODULE).java.tmp
-
+$(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java
+	mkdir -p $(JAVA_PATH)
+	test -f $(JAVA_PATH)$(JAVA_MODULE).java || cp *.java $(JAVA_PATH)
 
 clean-local:
 	rm -f *.class
@@ -70,13 +56,11 @@ clean-local:
 all-local: $(JAVA_JAR)
 
 $(JAVA_PATH)$(JAVA_MODULE).class: $(JAVA_PATH)$(JAVA_MODULE).java
-	mkdir -p $(JAVA_PATH)
-	test -f $(JAVA_PATH)$(JAVA_MODULE).java || cp $(srcdir)/$(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_PATH)
-	$(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)$(JAVA_MODULE).java
+	$(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)*.java
 
 $(JAVA_JAR): $(JAVA_PATH)$(JAVA_MODULE).class 
 	rm -f $@
-	jar cf $@ $(JAVA_PATH)$(JAVA_MODULE).class 
+	jar cf $@ $(JAVA_PATH)*.class 
 
 $(DEPDIR)/libjlasso_la-lasso_wrap.Plo:
 	mkdir -p $(DEPDIR)
diff --git a/java/coldfusion/src/CFLasso.java b/java/coldfusion/src/CFLasso.java
index 824482bb..af6ea798 100644
--- a/java/coldfusion/src/CFLasso.java
+++ b/java/coldfusion/src/CFLasso.java
@@ -26,7 +26,7 @@
  * Simple wrapper for JLasso, to ease its use by ColdFusion applications.
  *
  * To use it:
- * $ javac -classpath ../lasso-devel/java/target/lasso.jar CFLasso.java
+ * $ javac -classpath ../../lasso.jar CFLasso.java
  * Edit ColdFusion file bin/jvm.config:
  *   - Add libjlasso.so directory to java.library.path variable.
  *   - Add classes directory to java.class.path variable.
@@ -34,41 +34,41 @@
 
 
 public class CFLasso {
-    protected com.entrouvert.lasso.LassoServer getServerContext() {
-        com.entrouvert.lasso.LassoServer serverContext = new com.entrouvert.lasso.LassoServer(
+    protected com.entrouvert.lasso.Server getServer() {
+        com.entrouvert.lasso.Server server = new com.entrouvert.lasso.Server(
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/metadata.xml'",
-	    NULL, //"/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/public-key.pem",
+	    null, //"/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/public-key.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/private-key-raw.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/certificate.pem",
-            com.entrouvert.lasso.Lasso.signatureMethodRsaSha1);
-        serverContext.addProvider(
+            com.entrouvert.lasso.lasso.signatureMethodRsaSha1);
+        server.addProvider(
             "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/metadata.xml",
             "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/public-key.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/ca1-la/certificate.pem");
-	return serverContext;
+	return server;
     }
 
     public String login(String relayState) {
-	com.entrouvert.lasso.LassoAuthnRequest authnRequest;
-	com.entrouvert.lasso.LassoLogin loginContext;
-	com.entrouvert.lasso.LassoServer serverContext;
+	com.entrouvert.lasso.AuthnRequest authnRequest;
+	com.entrouvert.lasso.Login login;
+	com.entrouvert.lasso.Server server;
 	String authnRequestUrl;
 
-	com.entrouvert.lasso.Lasso.init();
+	// com.entrouvert.lasso.lasso.init();
 
-	serverContext = getServerContext();
-        loginContext = new com.entrouvert.lasso.LassoLogin(serverContext, null);
-        loginContext.initAuthnRequest("https://idp1:1998/metadata");
-	authnRequest = (com.entrouvert.lasso.LassoAuthnRequest) loginContext.getRequest();
-        authnRequest.setPassive(false);
-        authnRequest.setNameIdPolicy(com.entrouvert.lasso.Lasso.libNameIdPolicyTypeFederated);
-        authnRequest.setConsent(com.entrouvert.lasso.Lasso.libConsentObtained);
+	server = getServer();
+        login = new com.entrouvert.lasso.Login(server);
+        login.initAuthnRequest(com.entrouvert.lasso.lasso.httpMethodRedirect);
+	authnRequest = login.getAuthnRequest();
+        authnRequest.setIsPassive(false);
+        authnRequest.setNameIdPolicy(com.entrouvert.lasso.lasso.libNameIdPolicyTypeFederated);
+        authnRequest.setConsent(com.entrouvert.lasso.lasso.libConsentObtained);
 	if (relayState != null)
 	    authnRequest.setRelayState(relayState);
-        loginContext.buildAuthnRequestMsg();
-        authnRequestUrl = loginContext.getMsgUrl();
+        login.buildAuthnRequestMsg("https://sp1/metadata");
+        authnRequestUrl = login.getMsgUrl();
 
-	com.entrouvert.lasso.Lasso.shutdown();
+	// com.entrouvert.lasso.lasso.shutdown();
 
 	return authnRequestUrl;
     }
diff --git a/java/lasso-fragment.java b/java/lasso-fragment.java
deleted file mode 100644
index 6e0d0542..00000000
--- a/java/lasso-fragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-    // START lasso-fragment.java
-
-    //
-    // -*- Mode: java; c-basic-offset: 4 -*-
-    //
-    // lasso-fragment.java - Inserted Java fragment for generated SWIG code
-    //
-    // $Id$
-    //
-
-    static
-    {
-        // Load a library whose "core" name is 'jlasso'
-        // Operating system specific stuff will be added to make from this an
-        // actual filename: Under Unix this will become libjlasso.so
-        // while under Windows it will likely become something like
-        // jlasso.dll
-        System.loadLibrary("jlasso");
-    }
-
-    // END lasso-fragment.java
diff --git a/python/.cvsignore b/python/.cvsignore
index e577c501..3129eda0 100644
--- a/python/.cvsignore
+++ b/python/.cvsignore
@@ -1,3 +1,5 @@
+lasso.py
+lasso_wrap.c
 *.pyc
 .deps
 .libs
diff --git a/python/tests/errorchecking_tests.py b/python/tests/errorchecking_tests.py
index 65cdbbe8..6dac359f 100644
--- a/python/tests/errorchecking_tests.py
+++ b/python/tests/errorchecking_tests.py
@@ -45,20 +45,20 @@ except NameError:
 class ErrorCheckingTestCase(unittest.TestCase):
     def test01(self):
         try:
-            lasso.Login(None).msg_url
+            lasso.Login(None).msgUrl
         except:
             pass
 
     def test02(self):
         # Same as test01; replace Login by Logout
         try:
-            lasso.Logout(None, lasso.providerTypeSp).msg_url
+            lasso.Logout(None, lasso.providerTypeSp).msgUrl
         except:
             pass
 
     def test03(self):
         # This time; we got something wrong as query string; we pass it to
-        # init_from_authn_request_msg; surely it shouldn't segfault
+        # initFromAuthnRequestMsg; surely it shouldn't segfault
         server = lasso.Server(
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
             None, # os.path.join(dataDir, 'idp1-la/public-key.pem') is no more used
@@ -67,7 +67,7 @@ class ErrorCheckingTestCase(unittest.TestCase):
             lasso.signatureMethodRsaSha1)
         login = lasso.Login(server)
         try:
-            login.init_from_authn_request_msg("", lasso.httpMethodRedirect)
+            login.initFromAuthnRequestMsg("", lasso.httpMethodRedirect)
         except:
             pass
 
diff --git a/python/tests/profiles_tests.py b/python/tests/profiles_tests.py
index 0fced9e6..2939ac4d 100755
--- a/python/tests/profiles_tests.py
+++ b/python/tests/profiles_tests.py
@@ -44,7 +44,7 @@ except NameError:
 
 class ServerTestCase(unittest.TestCase):
     def test01(self):
-        """Server construction, dump & new_from_dump."""
+        """Server construction, dump & newFromDump."""
 
         lassoServer = lasso.Server(
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
@@ -52,22 +52,22 @@ class ServerTestCase(unittest.TestCase):
             os.path.join(dataDir, 'sp1-la/private-key-raw.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'),
             lasso.signatureMethodRsaSha1)
-        lassoServer.add_provider(
+        lassoServer.addProvider(
             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'))
         dump = lassoServer.dump()
-        lassoServer2 = lassoServer.new_from_dump(dump)
+        lassoServer2 = lassoServer.newFromDump(dump)
         dump2 = lassoServer2.dump()
         self.failUnlessEqual(dump, dump2)
 
     def test02(self):
-        """Server construction without argument, dump & new_from_dump."""
+        """Server construction without argument, dump & newFromDump."""
 
         lassoServer = lasso.Server()
-        lassoServer.add_provider(os.path.join(dataDir, 'idp1-la/metadata.xml'))
+        lassoServer.addProvider(os.path.join(dataDir, 'idp1-la/metadata.xml'))
         dump = lassoServer.dump()
-        lassoServer2 = lassoServer.new_from_dump(dump)
+        lassoServer2 = lassoServer.newFromDump(dump)
         dump2 = lassoServer2.dump()
         self.failUnlessEqual(dump, dump2)
 
@@ -82,19 +82,19 @@ class LoginTestCase(unittest.TestCase):
             os.path.join(dataDir, 'sp1-la/private-key-raw.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'),
             lasso.signatureMethodRsaSha1)
-        lassoServer.add_provider(
+        lassoServer.addProvider(
             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.init_authn_request(lasso.httpMethodRedirect)
-        login.authn_request
-        login.authn_request.protocolProfile = lasso.libProtocolProfileBrwsArt
+        login.initAuthnRequest(lasso.httpMethodRedirect)
+        login.authnRequest
+        login.authnRequest.protocolProfile = lasso.libProtocolProfileBrwsArt
 
 
 class LogoutTestCase(unittest.TestCase):
     def test01(self):
-        """SP logout without session and identity; testing init_request."""
+        """SP logout without session and identity; testing initRequest."""
 
         lassoServer = lasso.Server(
             os.path.join(dataDir, 'sp1-la/metadata.xml'),
@@ -102,22 +102,22 @@ class LogoutTestCase(unittest.TestCase):
             os.path.join(dataDir, 'sp1-la/private-key-raw.pem'),
             os.path.join(dataDir, 'sp1-la/certificate.pem'),
             lasso.signatureMethodRsaSha1)
-        lassoServer.add_provider(
+        lassoServer.addProvider(
             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'))
         logout = lasso.Logout(lassoServer, lasso.providerTypeSp)
         try:
-            logout.init_request()
+            logout.initRequest()
         except RuntimeError, error:
             errorCode = int(error.args[0].split(' ', 1)[0])
             if errorCode != -1:
                 raise
         else:
-            self.fail('logout.init_request without having set identity before should fail')
+            self.fail('logout.initRequest without having set identity before should fail')
 
     def test02(self):
-        """IDP logout without session and identity; testing logout.get_next_providerID."""
+        """IDP logout without session and identity; testing logout.getNextProviderId."""
 
         lassoServer = lasso.Server(
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
@@ -125,17 +125,17 @@ class LogoutTestCase(unittest.TestCase):
             os.path.join(dataDir, 'idp1-la/private-key-raw.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'),
             lasso.signatureMethodRsaSha1)
-        lassoServer.add_provider(
+        lassoServer.addProvider(
             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'))
         logout = lasso.Logout(lassoServer, lasso.providerTypeIdp)
-        self.failIf(logout.get_next_providerID())
+        self.failIf(logout.getNextProviderId())
 
 
 class DefederationTestCase(unittest.TestCase):
     def test01(self):
-        """IDP initiated defederation; testing process_notification_msg with non Liberty query."""
+        """IDP initiated defederation; testing processNotificationMsg with non Liberty query."""
 
         lassoServer = lasso.Server(
             os.path.join(dataDir, 'idp1-la/metadata.xml'),
@@ -143,18 +143,18 @@ class DefederationTestCase(unittest.TestCase):
             os.path.join(dataDir, 'idp1-la/private-key-raw.pem'),
             os.path.join(dataDir, 'idp1-la/certificate.pem'),
             lasso.signatureMethodRsaSha1)
-        lassoServer.add_provider(
+        lassoServer.addProvider(
             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'))
         defederation = lasso.Defederation(lassoServer, lasso.providerTypeIdp)
-        # The process_notification_msg should failt but not abort.
+        # The processNotificationMsg should failt but not abort.
         try:
-            defederation.process_notification_msg('nonLibertyQuery=1', lasso.httpMethodRedirect)
+            defederation.processNotificationMsg('nonLibertyQuery=1', lasso.httpMethodRedirect)
         except SyntaxError:
             pass
         else:
-            self.fail('Defederation process_notification_msg should have failed.')
+            self.fail('Defederation processNotificationMsg should have failed.')
 
 
 suite1 = unittest.makeSuite(ServerTestCase, 'test')
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 8b227277..6c018a26 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -72,9 +72,29 @@
 
 %}
 
+#ifdef SWIGJAVA
+%pragma(java) jniclasscode=%{
+  static {
+    try {
+        // Load a library whose "core" name is "jlasso".
+        // Operating system specific stuff will be added to make an
+        // actual filename from this: Under Unix this will become
+	// libjlasso.so while under Windows it will likely become
+	// something like jlasso.dll.
+        System.loadLibrary("jlasso");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. \n" + e);
+      System.exit(1);
+    }
+    // Initialize Lasso.
+    init();
+  }
+%}
+#else
 %init %{
 	lasso_init();
 %}
+#endif
 
 
 /***********************************************************************
@@ -93,7 +113,14 @@
 #define guint unsigned int
 #define gchar char
 #define guchar unsigned char
-#define gboolean int
+
+#define gboolean bool
+%{
+#define bool int
+#define false 0
+#define true 1
+%}
+
 #define gshort short
 #define gushort unsigned short
 #define gulong unsigned long
@@ -156,11 +183,11 @@ typedef enum {
 %constant xmlChar *lassoLibConsentUnavailable  = "urn:liberty:consent:unavailable";
 %constant xmlChar *lassoLibConsentInapplicable = "urn:liberty:consent:inapplicable";
 
-/* NameIDPolicyType */
-%rename(libNameIDPolicyTypeNone) lassoLibNameIDPolicyTypeNone;
-%rename(libNameIDPolicyTypeOneTime) lassoLibNameIDPolicyTypeOneTime;
-%rename(libNameIDPolicyTypeFederated) lassoLibNameIDPolicyTypeFederated;
-%rename(libNameIDPolicyTypeAny) lassoLibNameIDPolicyTypeAny;
+/* NameIdPolicyType */
+%rename(libNameIdPolicyTypeNone) lassoLibNameIDPolicyTypeNone;
+%rename(libNameIdPolicyTypeOneTime) lassoLibNameIDPolicyTypeOneTime;
+%rename(libNameIdPolicyTypeFederated) lassoLibNameIDPolicyTypeFederated;
+%rename(libNameIdPolicyTypeAny) lassoLibNameIDPolicyTypeAny;
 %constant xmlChar *lassoLibNameIDPolicyTypeNone = "none";
 %constant xmlChar *lassoLibNameIDPolicyTypeOneTime = "onetime";
 %constant xmlChar *lassoLibNameIDPolicyTypeFederated = "federated";
@@ -256,9 +283,9 @@ typedef enum {
 %rename(samlAuthenticationMethodSmartcardPki) lassoSamlAuthenticationMethodSmartcardPki;
 %rename(samlAuthenticationMethodSoftwarePki) lassoSamlAuthenticationMethodSoftwarePki;
 %rename(samlAuthenticationMethodPgp) lassoSamlAuthenticationMethodPgp;
-%rename(samlAuthenticationMethodSPki) lassoSamlAuthenticationMethodSPki;
+%rename(samlAuthenticationMethodSpki) lassoSamlAuthenticationMethodSPki;
 %rename(samlAuthenticationMethodXkms) lassoSamlAuthenticationMethodXkms;
-%rename(samlAuthenticationMethodXmlDSig) lassoSamlAuthenticationMethodXmlDSig;
+%rename(samlAuthenticationMethodXmlDsig) lassoSamlAuthenticationMethodXmlDSig;
 %rename(samlAuthenticationMethodUnspecified) lassoSamlAuthenticationMethodUnspecified;
 %constant xmlChar *lassoSamlAuthenticationMethodPassword = "urn:oasis:names:tc:SAML:1.0:am:password";
 %constant xmlChar *lassoSamlAuthenticationMethodKerberos = "urn:ietf:rfc:1510";
@@ -385,19 +412,19 @@ int get_exception_type(int errorCode)
 
 
 %rename(AuthnRequest) LassoAuthnRequest;
-%nodefault _LassoAuthnRequest;
-typedef struct _LassoAuthnRequest {
+%nodefault LassoAuthnRequest;
+typedef struct {
 	%extend {
 		/* Attributes inherited from LassoLibAuthnRequest */
 
-		xmlChar *affiliationID;
-		xmlChar *assertionConsumerServiceID;
+		xmlChar *affiliationId;
+		xmlChar *assertionConsumerServiceId;
 		xmlChar *consent;
 		gboolean forceAuthn;
 		gboolean isPassive;
-		xmlChar *nameIDPolicy;
+		xmlChar *nameIdPolicy;
 		xmlChar *protocolProfile;
-		xmlChar *providerID;
+		xmlChar *providerId;
 		xmlChar *relayState;
 	}
 } LassoAuthnRequest;
@@ -406,22 +433,22 @@ typedef struct _LassoAuthnRequest {
 
 /* Attributes Implementations */
 
-/* affiliationID */
-xmlChar *LassoAuthnRequest_affiliationID_get(LassoAuthnRequest *self) {
+/* affiliationId */
+xmlChar *LassoAuthnRequest_affiliationId_get(LassoAuthnRequest *self) {
 	return NULL; /* FIXME */
 }
-void LassoAuthnRequest_affiliationID_set(LassoAuthnRequest *self, xmlChar *affiliationID) {
-	 lasso_lib_authn_request_set_affiliationID(LASSO_LIB_AUTHN_REQUEST(self), affiliationID);
+void LassoAuthnRequest_affiliationId_set(LassoAuthnRequest *self, xmlChar *affiliationId) {
+	 lasso_lib_authn_request_set_affiliationID(LASSO_LIB_AUTHN_REQUEST(self), affiliationId);
 }
 
-/* assertionConsumerServiceID */
-xmlChar *LassoAuthnRequest_assertionConsumerServiceID_get(LassoAuthnRequest *self) {
+/* assertionConsumerServiceId */
+xmlChar *LassoAuthnRequest_assertionConsumerServiceId_get(LassoAuthnRequest *self) {
 	return NULL; /* FIXME */
 }
-void LassoAuthnRequest_assertionConsumerServiceID_set(LassoAuthnRequest *self,
-						      xmlChar *assertionConsumerServiceID) {
+void LassoAuthnRequest_assertionConsumerServiceId_set(LassoAuthnRequest *self,
+						      xmlChar *assertionConsumerServiceId) {
 	lasso_lib_authn_request_set_assertionConsumerServiceID(LASSO_LIB_AUTHN_REQUEST(self),
-							       assertionConsumerServiceID);
+							       assertionConsumerServiceId);
 }
 
 /* consent */
@@ -448,12 +475,12 @@ void LassoAuthnRequest_isPassive_set(LassoAuthnRequest *self, gboolean isPassive
 	 lasso_lib_authn_request_set_isPassive(LASSO_LIB_AUTHN_REQUEST(self), isPassive);
 }
 
-/* nameIDPolicy */
-xmlChar *LassoAuthnRequest_nameIDPolicy_get(LassoAuthnRequest *self) {
+/* nameIdPolicy */
+xmlChar *LassoAuthnRequest_nameIdPolicy_get(LassoAuthnRequest *self) {
 	return NULL; /* FIXME */
 }
-void LassoAuthnRequest_nameIDPolicy_set(LassoAuthnRequest *self, xmlChar *nameIDPolicy) {
-	 lasso_lib_authn_request_set_nameIDPolicy(LASSO_LIB_AUTHN_REQUEST(self), nameIDPolicy);
+void LassoAuthnRequest_nameIdPolicy_set(LassoAuthnRequest *self, xmlChar *nameIdPolicy) {
+	 lasso_lib_authn_request_set_nameIDPolicy(LASSO_LIB_AUTHN_REQUEST(self), nameIdPolicy);
 }
 
 /* protocolProfile */
@@ -465,12 +492,12 @@ void LassoAuthnRequest_protocolProfile_set(LassoAuthnRequest *self, xmlChar *pro
 						     protocolProfile);
 }
 
-/* providerID */
-xmlChar *LassoAuthnRequest_providerID_get(LassoAuthnRequest *self) {
+/* providerId */
+xmlChar *LassoAuthnRequest_providerId_get(LassoAuthnRequest *self) {
 	return NULL; /* FIXME */
 }
-void LassoAuthnRequest_providerID_set(LassoAuthnRequest *self, xmlChar *providerID) {
-	 lasso_lib_authn_request_set_providerID(LASSO_LIB_AUTHN_REQUEST(self), providerID);
+void LassoAuthnRequest_providerId_set(LassoAuthnRequest *self, xmlChar *providerId) {
+	 lasso_lib_authn_request_set_providerID(LASSO_LIB_AUTHN_REQUEST(self), providerId);
 }
 
 /* relayState */
@@ -490,8 +517,8 @@ void LassoAuthnRequest_relayState_set(LassoAuthnRequest *self, xmlChar *relaySta
 
 
 %rename(AuthnResponse) LassoAuthnResponse;
-%nodefault _LassoAuthnResponse;
-typedef struct _LassoAuthnResponse {
+%nodefault LassoAuthnResponse;
+typedef struct {
 } LassoAuthnResponse;
 
 /* Methods */
@@ -506,8 +533,8 @@ xmlChar *lasso_authn_response_get_status(LassoAuthnResponse *response);
 
 
 %rename(Request) LassoRequest;
-%nodefault _LassoRequest;
-typedef struct _LassoRequest {
+%nodefault LassoRequest;
+typedef struct {
 } LassoRequest;
 
 
@@ -517,8 +544,8 @@ typedef struct _LassoRequest {
 
 
 %rename(Response) LassoResponse;
-%nodefault _LassoResponse;
-typedef struct _LassoResponse {
+%nodefault LassoResponse;
+typedef struct {
 } LassoResponse;
 
 
@@ -536,29 +563,23 @@ typedef struct _LassoResponse {
 
 %rename(Server) LassoServer;
 typedef struct {
-	GPtrArray *providers;
-	gchar *providerID;   
-	gchar *private_key;
-	gchar *certificate;
-	guint signature_method;
-
 	%extend {
 		/* Constructor, destructor & static methods */
 
-		LassoServer(gchar *metadata = NULL, gchar *public_key = NULL,
-			    gchar *private_key = NULL, gchar *certificate = NULL,
-			    lassoSignatureMethod signature_method = lassoSignatureMethodRsaSha1);
+		LassoServer(gchar *metadata = NULL, gchar *publicKey = NULL,
+			    gchar *privateKey = NULL, gchar *certificate = NULL,
+			    lassoSignatureMethod signatureMethod = lassoSignatureMethodRsaSha1);
 
 		~LassoServer();
 
-		%newobject new_from_dump;
-		static LassoServer *new_from_dump(gchar *dump);
+		%newobject newFromDump;
+		static LassoServer *newFromDump(gchar *dump);
 
 		/* Methods */
 
 	        THROW_ERROR
-		void add_provider(gchar *metadata, gchar *public_key = NULL,
-				  gchar *ca_certificate = NULL);
+		void addProvider(gchar *metadata, gchar *publicKey = NULL,
+				 gchar *caCertificate = NULL);
 		END_THROW_ERROR
 
 		%newobject dump;
@@ -570,8 +591,8 @@ typedef struct {
 
 #define new_LassoServer lasso_server_new
 #define delete_LassoServer lasso_server_destroy
-#define Server_new_from_dump lasso_server_new_from_dump
-#define LassoServer_add_provider lasso_server_add_provider
+#define Server_newFromDump lasso_server_new_from_dump
+#define LassoServer_addProvider lasso_server_add_provider
 #define LassoServer_dump lasso_server_dump
 
 %}
@@ -579,9 +600,9 @@ typedef struct {
 /* Constructors */
 
 %newobject lasso_server_new;
-LassoServer *lasso_server_new(gchar *metadata = NULL, gchar *public_key = NULL,
-			      gchar *private_key = NULL, gchar *certificate = NULL,
-			      lassoSignatureMethod signature_method = lassoSignatureMethodRsaSha1);
+LassoServer *lasso_server_new(gchar *metadata = NULL, gchar *publicKey = NULL,
+			      gchar *privateKey = NULL, gchar *certificate = NULL,
+			      lassoSignatureMethod signatureMethod = lassoSignatureMethodRsaSha1);
 
 %newobject lasso_server_new_from_dump;
 LassoServer *lasso_server_new_from_dump(gchar *dump);
@@ -592,8 +613,8 @@ void lasso_server_destroy(LassoServer *server);
 
 /* Methods */
 
-gint lasso_server_add_provider(LassoServer *server, gchar *metadata, gchar *public_key = NULL,
-			       gchar *ca_certificate = NULL);
+gint lasso_server_add_provider(LassoServer *server, gchar *metadata, gchar *publicKey = NULL,
+			       gchar *caCertificate = NULL);
 
 %newobject lasso_server_dump;
 gchar *lasso_server_dump(LassoServer *server);
@@ -606,19 +627,20 @@ gchar *lasso_server_dump(LassoServer *server);
 
 %rename(Identity) LassoIdentity;
 typedef struct {
-	GPtrArray *providerIDs; /* list of the remote provider ids for federations hash table */
-	GHashTable *federations; /* hash for federations with remote ProviderID as key */
-	gboolean is_dirty;
-
 	%extend {
+		/* Attributes */
+
+		%immutable isDirty;
+		gboolean isDirty;
+
 		/* Constructor, Destructor & Static Methods */
 
 		LassoIdentity();
 
 		~LassoIdentity();
 
-		%newobject new_from_dump;
-		static LassoIdentity *new_from_dump(gchar *dump);
+		%newobject newFromDump;
+		static LassoIdentity *newFromDump(gchar *dump);
 
 		/* Methods */
 
@@ -629,10 +651,21 @@ typedef struct {
 
 %{
 
+/* Attributes implementations */
+
+/* isDirty */
+gboolean LassoIdentity_isDirty_get(LassoIdentity *self) {
+	return self->is_dirty;
+}
+
+/* Constructors, destructors & static methods implementations */
+
 #define new_LassoIdentity lasso_identity_new
 #define delete_LassoIdentity lasso_identity_destroy
-#define Identity_new_from_dump lasso_identity_new_from_dump
-#define LassoIdentity_add_provider lasso_identity_add_provider
+#define Identity_newFromDump lasso_identity_new_from_dump
+
+/* Methods implementations */
+
 #define LassoIdentity_dump lasso_identity_dump
 
 %}
@@ -662,43 +695,50 @@ gchar *lasso_identity_dump(LassoIdentity *identity);
 
 %rename(Session) LassoSession;
 typedef struct {
-	GPtrArray *providerIDs; /* list of the remote provider ids for federations hash table */
-	GHashTable *assertions;  /* hash for assertions with remote providerID as key */
-	gboolean is_dirty;
-
 	%extend {
+		/* Attributes */
+
+		%immutable isDirty;
+		gboolean isDirty;
+
 		/* Constructor, destructor & static methods */
 
 		LassoSession();
 
 		~LassoSession();
 
-		%newobject new_from_dump;
-		static LassoSession *new_from_dump(gchar *dump);
+		%newobject newFromDump;
+		static LassoSession *newFromDump(gchar *dump);
 
 		/* Methods */
 
 		%newobject dump;
 		gchar *dump();
 
-		%newobject get_authentication_method;
-		gchar *get_authentication_method(gchar *remote_providerID);
+		%newobject getAuthenticationMethod;
+		gchar *getAuthenticationMethod(gchar *remoteProviderId);
 	}
 } LassoSession;
 
 %{
 
+/* Attributes implementations */
+
+/* isDirty */
+gboolean LassoSession_isDirty_get(LassoSession *self) {
+	return self->is_dirty;
+}
+
 /* Constructors, destructors & static methods implementations */
 
 #define new_LassoSession lasso_session_new
 #define delete_LassoSession lasso_session_destroy
-#define Session_new_from_dump lasso_session_new_from_dump
+#define Session_newFromDump lasso_session_new_from_dump
 
 /* Methods implementations */
 
-#define LassoSession_add_provider lasso_session_add_provider
 #define LassoSession_dump lasso_session_dump
-#define LassoSession_get_authentication_method lasso_session_get_authentication_method
+#define LassoSession_getAuthenticationMethod lasso_session_get_authentication_method
 
 %}
 
@@ -720,7 +760,7 @@ void lasso_session_destroy(LassoSession *session);
 gchar *lasso_session_dump(LassoSession *session);
 
 %newobject lasso_session_get_authentication_method;
-gchar *lasso_session_get_authentication_method(LassoSession *session, gchar *remote_providerID);
+gchar *lasso_session_get_authentication_method(LassoSession *session, gchar *remoteProviderId);
 
 
 /***********************************************************************
@@ -732,16 +772,16 @@ gchar *lasso_session_get_authentication_method(LassoSession *session, gchar *rem
 
 /* Attributes Implementations */
 
-/* authn_request */
-LassoAuthnRequest *LassoProfile_authn_request_get(LassoProfile *profile) {
+/* authnRequest */
+LassoAuthnRequest *LassoProfile_authnRequest_get(LassoProfile *profile) {
 	if (profile->request_type == lassoMessageTypeAuthnRequest)
 		return LASSO_AUTHN_REQUEST(profile->request);
 	else
 		return NULL;
 }
 
-/* authn_response */
-LassoAuthnResponse *LassoProfile_authn_response_get(LassoProfile *profile) {
+/* authnResponse */
+LassoAuthnResponse *LassoProfile_authnResponse_get(LassoProfile *profile) {
 	if (profile->response_type == lassoMessageTypeAuthnResponse)
 		return LASSO_AUTHN_RESPONSE(profile->response);
 	else
@@ -782,34 +822,34 @@ typedef struct {
 	%extend {
 		/* Attributes inherited from LassoProfile */
 
-		%immutable authn_request;
-		LassoAuthnRequest *authn_request;
+		%immutable authnRequest;
+		LassoAuthnRequest *authnRequest;
 
-		%immutable authn_response;
-		LassoAuthnResponse *authn_response;
+		%immutable authnResponse;
+		LassoAuthnResponse *authnResponse;
 
 		%newobject identity_get;
 		LassoIdentity *identity;
 
-		%immutable is_identity_dirty;
-		gboolean is_identity_dirty;
+		%immutable isIdentityDirty;
+		gboolean isIdentityDirty;
 
-		%immutable is_session_dirty;
-		gboolean is_session_dirty;
+		%immutable isSessionDirty;
+		gboolean isSessionDirty;
 
-		%immutable msg_body;
-		gchar *msg_body;
+		%immutable msgBody;
+		gchar *msgBody;
 
-		%immutable msg_relayState;
-		gchar *msg_relayState;
+		%immutable msgRelayState;
+		gchar *msgRelayState;
 
-		%immutable msg_url;
-		gchar *msg_url;
+		%immutable msgUrl;
+		gchar *msgUrl;
 
 		%immutable nameIdentifier;
 		gchar *nameIdentifier;
 
-		gchar *remote_providerID;
+		gchar *remoteProviderId;
 
 		%immutable request;
 		LassoRequest *request;
@@ -817,45 +857,44 @@ typedef struct {
 		%immutable response;
 		LassoResponse *response;
 
-		gchar *response_status;
+		gchar *responseStatus;
 
 		%newobject session_get;
 		LassoSession *session;
 
 		/* Constructor, Destructor & Static Methods */
 
-		LassoDefederation(LassoServer *server, lassoProviderType provider_type);
+		LassoDefederation(LassoServer *server, lassoProviderType providerType);
 
 		~LassoDefederation();
 
 		/* Methods inherited from LassoProfile */
 
 	        THROW_ERROR
-		void set_identity_from_dump(gchar *dump);
+		void setIdentityFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void set_session_from_dump(gchar *dump);
+		void setSessionFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		/* Methods */
 
 		THROW_ERROR
-		void build_notification_msg();
+		void buildNotificationMsg();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void init_notification(gchar *remote_providerID,
-				       lassoHttpMethod notification_method = lassoHttpMethodAny);
+		void initNotification(gchar *remoteProviderId,
+				      lassoHttpMethod httpMethod = lassoHttpMethodAny);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_notification_msg(gchar *notification_msg,
-					      lassoHttpMethod notification_method);
+		void processNotificationMsg(gchar *notificationMsg, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void validate_notification();
+		void validateNotification();
 		END_THROW_ERROR
 	}
 } LassoDefederation;
@@ -864,14 +903,14 @@ typedef struct {
 
 /* Attributes inherited from LassoProfile implementations */
 
-/* authn_request */
-LassoAuthnRequest *LassoDefederation_authn_request_get(LassoDefederation *self) {
-	return LassoProfile_authn_request_get(LASSO_PROFILE(self));
+/* authnRequest */
+LassoAuthnRequest *LassoDefederation_authnRequest_get(LassoDefederation *self) {
+	return LassoProfile_authnRequest_get(LASSO_PROFILE(self));
 }
 
-/* authn_response */
-LassoAuthnResponse *LassoDefederation_authn_response_get(LassoDefederation *self) {
-	return LassoProfile_authn_response_get(LASSO_PROFILE(self));
+/* authnResponse */
+LassoAuthnResponse *LassoDefederation_authnResponse_get(LassoDefederation *self) {
+	return LassoProfile_authnResponse_get(LASSO_PROFILE(self));
 }
 
 /* identity */
@@ -882,28 +921,28 @@ gint LassoDefederation_identity_set(LassoDefederation *self, LassoIdentity *iden
 	return lasso_profile_set_identity(LASSO_PROFILE(self), identity);
 }
 
-/* is_identity_dirty */
-gboolean LassoDefederation_is_identity_dirty_get(LassoDefederation *self) {
+/* isIdentityDirty */
+gboolean LassoDefederation_isIdentityDirty_get(LassoDefederation *self) {
 	return lasso_profile_is_identity_dirty(LASSO_PROFILE(self));
 }
 
-/* is_session_dirty */
-gboolean LassoDefederation_is_session_dirty_get(LassoDefederation *self) {
+/* isSessionDirty */
+gboolean LassoDefederation_isSessionDirty_get(LassoDefederation *self) {
 	return lasso_profile_is_session_dirty(LASSO_PROFILE(self));
 }
 
-/* msg_body */
-gchar *LassoDefederation_msg_body_get(LassoDefederation *self) {
+/* msgBody */
+gchar *LassoDefederation_msgBody_get(LassoDefederation *self) {
 	return LASSO_PROFILE(self)->msg_body;
 }
 
-/* msg_relayState */
-gchar *LassoDefederation_msg_relayState_get(LassoDefederation *self) {
+/* msgRelayState */
+gchar *LassoDefederation_msgRelayState_get(LassoDefederation *self) {
 	return LASSO_PROFILE(self)->msg_relayState;
 }
 
-/* msg_url */
-gchar *LassoDefederation_msg_url_get(LassoDefederation *self) {
+/* msgUrl */
+gchar *LassoDefederation_msgUrl_get(LassoDefederation *self) {
 	return LASSO_PROFILE(self)->msg_url;
 }
 
@@ -912,12 +951,12 @@ gchar *LassoDefederation_nameIdentifier_get(LassoDefederation *self) {
 	return LASSO_PROFILE(self)->nameIdentifier;
 }
 
-/* remote_providerID */
-gchar *LassoDefederation_remote_providerID_get(LassoDefederation *self) {
+/* remoteProviderId */
+gchar *LassoDefederation_remoteProviderId_get(LassoDefederation *self) {
 	return NULL; /* FIXME */
 }
-void LassoDefederation_remote_providerID_set(LassoDefederation *self, gchar *remote_providerID) {
-	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remote_providerID);
+void LassoDefederation_remoteProviderId_set(LassoDefederation *self, gchar *remoteProviderId) {
+	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remoteProviderId);
 }
 
 /* request */
@@ -930,12 +969,12 @@ LassoResponse *LassoDefederation_response_get(LassoDefederation *self) {
 	return LassoProfile_response_get(LASSO_PROFILE(self));
 }
 
-/* response_status */
-gchar *LassoDefederation_response_status_get(LassoDefederation *self) {
+/* responseStatus */
+gchar *LassoDefederation_responseStatus_get(LassoDefederation *self) {
 	return NULL; /* FIXME */
 }
-void LassoDefederation_response_status_set(LassoDefederation *self, gchar *response_status) {
-	lasso_profile_set_response_status(LASSO_PROFILE(self), response_status);
+void LassoDefederation_responseStatus_set(LassoDefederation *self, gchar *responseStatus) {
+	lasso_profile_set_response_status(LASSO_PROFILE(self), responseStatus);
 }
 
 /* session */
@@ -953,27 +992,27 @@ gint LassoDefederation_session_set(LassoDefederation *self, LassoSession *sessio
 
 /* Methods inherited from LassoProfile implementations */
 
-gint LassoDefederation_set_identity_from_dump(LassoDefederation *self, gchar *dump) {
+gint LassoDefederation_setIdentityFromDump(LassoDefederation *self, gchar *dump) {
 	return lasso_profile_set_identity_from_dump(LASSO_PROFILE(self), dump);
 }
 
-gint LassoDefederation_set_session_from_dump(LassoDefederation *self, gchar *dump) {
+gint LassoDefederation_setSessionFromDump(LassoDefederation *self, gchar *dump) {
 	return lasso_profile_set_session_from_dump(LASSO_PROFILE(self), dump);
 }
 
 /* Methods implementations */
 
-#define LassoDefederation_build_notification_msg lasso_defederation_build_notification_msg
-#define LassoDefederation_init_notification lasso_defederation_init_notification
-#define LassoDefederation_process_notification_msg lasso_defederation_process_notification_msg
-#define LassoDefederation_validate_notification lasso_defederation_validate_notification
+#define LassoDefederation_buildNotificationMsg lasso_defederation_build_notification_msg
+#define LassoDefederation_initNotification lasso_defederation_init_notification
+#define LassoDefederation_processNotificationMsg lasso_defederation_process_notification_msg
+#define LassoDefederation_validateNotification lasso_defederation_validate_notification
 
 %}
 
 /* Constructors */
 
 %newobject lasso_defederation_new;
-LassoDefederation *lasso_defederation_new(LassoServer *server, lassoProviderType provider_type);
+LassoDefederation *lasso_defederation_new(LassoServer *server, lassoProviderType providerType);
 
 /* Destructor */
 
@@ -984,12 +1023,12 @@ void lasso_defederation_destroy(LassoDefederation *defederation);
 gint lasso_defederation_build_notification_msg(LassoDefederation *defederation);
 
 gint lasso_defederation_init_notification(LassoDefederation *defederation,
-					  gchar *remote_providerID,
-					  lassoHttpMethod notification_method);
+					  gchar *remoteProviderId,
+					  lassoHttpMethod httpMethod);
 
 gint lasso_defederation_process_notification_msg(LassoDefederation *defederation,
-						 gchar *notification_msg,
-						 lassoHttpMethod notification_method);
+						 gchar *notificationMsg,
+						 lassoHttpMethod httpMethod);
 
 gint lasso_defederation_validate_notification(LassoDefederation *defederation);
 
@@ -1007,40 +1046,37 @@ typedef struct {
 	%immutable protocolProfile;
 	lassoLoginProtocolProfile protocolProfile;
 
-	%immutable response_dump;
-	gchar *response_dump;
-
 	%extend {
 		/* Attributes inherited from LassoProfile */
 
-		%immutable authn_request;
-		LassoAuthnRequest *authn_request;
+		%immutable authnRequest;
+		LassoAuthnRequest *authnRequest;
 
-		%immutable authn_response;
-		LassoAuthnResponse *authn_response;
+		%immutable authnResponse;
+		LassoAuthnResponse *authnResponse;
 
 		%newobject identity_get;
 		LassoIdentity *identity;
 
-		%immutable is_identity_dirty;
-		gboolean is_identity_dirty;
+		%immutable isIdentityDirty;
+		gboolean isIdentityDirty;
 
-		%immutable is_session_dirty;
-		gboolean is_session_dirty;
+		%immutable isSessionDirty;
+		gboolean isSessionDirty;
 
-		%immutable msg_body;
-		gchar *msg_body;
+		%immutable msgBody;
+		gchar *msgBody;
 
-		%immutable msg_relayState;
-		gchar *msg_relayState;
+		%immutable msgRelayState;
+		gchar *msgRelayState;
 
-		%immutable msg_url;
-		gchar *msg_url;
+		%immutable msgUrl;
+		gchar *msgUrl;
 
 		%immutable nameIdentifier;
 		gchar *nameIdentifier;
 
-		gchar *remote_providerID;
+		gchar *remoteProviderId;
 
 		%immutable request;
 		LassoRequest *request;
@@ -1048,7 +1084,10 @@ typedef struct {
 		%immutable response;
 		LassoResponse *response;
 
-		gchar *response_status;
+		%immutable responseDump;
+		gchar *responseDump;
+
+		gchar *responseStatus;
 
 		%newobject session_get;
 		LassoSession *session;
@@ -1059,74 +1098,71 @@ typedef struct {
 
 		~LassoLogin();
 
-		%newobject new_from_dump;
-		static LassoLogin *new_from_dump(LassoServer *server, gchar *dump);
+		%newobject newFromDump;
+		static LassoLogin *newFromDump(LassoServer *server, gchar *dump);
 
 		/* Methods inherited from LassoProfile */
 
 	        THROW_ERROR
-		void set_identity_from_dump(gchar *dump);
+		void setIdentityFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void set_session_from_dump(gchar *dump);
+		void setSessionFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		/* Methods */
 
 		THROW_ERROR
-		void accept_sso();
+		void acceptSso();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_artifact_msg(gint authentication_result, gchar *authenticationMethod,
-					gchar *reauthenticateOnOrAfter,
-					lassoHttpMethod http_method);
+		void buildArtifactMsg(gint authenticationResult, gchar *authenticationMethod,
+				      gchar *reauthenticateOnOrAfter, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_authn_request_msg(gchar *remote_providerID);
+		void buildAuthnRequestMsg(gchar *remoteProviderId);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_authn_response_msg(gint authentication_result,
-					      gchar *authenticationMethod,
-					      gchar *reauthenticateOnOrAfter);
+		void buildAuthnResponseMsg(gint authenticationResult, gchar *authenticationMethod,
+					   gchar *reauthenticateOnOrAfter);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_request_msg();
+		void buildRequestMsg();
 		END_THROW_ERROR
 
 		%newobject dump;
 		gchar *dump();
 
 		THROW_ERROR
-		void init_authn_request(lassoHttpMethod http_method);
+		void initAuthnRequest(lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void init_from_authn_request_msg(gchar *authn_request_msg,
-						 lassoHttpMethod authn_request_http_method);
+		void initFromAuthnRequestMsg(gchar *authnrequestMsg, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void init_request(gchar *response_msg,
-				  lassoHttpMethod response_http_method = lassoHttpMethodRedirect);
+		void initRequest(gchar *responseMsg,
+				 lassoHttpMethod httpMethod = lassoHttpMethodRedirect);
 		END_THROW_ERROR
 
-		gboolean must_authenticate();
+		gboolean mustAuthenticate();
 
 		THROW_ERROR
-		void process_authn_response_msg(gchar *authn_response_msg);
+		void processAuthnResponseMsg(gchar *authnResponseMsg);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_request_msg(gchar *request_msg);
+		void processRequestMsg(gchar *requestMsg);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_response_msg(gchar *response_msg);
+		void processResponseMsg(gchar *responseMsg);
 		END_THROW_ERROR
 	}
 } LassoLogin;
@@ -1135,14 +1171,14 @@ typedef struct {
 
 /* Attributes inherited from LassoProfile implementations */
 
-/* authn_request */
-LassoAuthnRequest *LassoLogin_authn_request_get(LassoLogin *self) {
-	return LassoProfile_authn_request_get(LASSO_PROFILE(self));
+/* authnRequest */
+LassoAuthnRequest *LassoLogin_authnRequest_get(LassoLogin *self) {
+	return LassoProfile_authnRequest_get(LASSO_PROFILE(self));
 }
 
-/* authn_response */
-LassoAuthnResponse *LassoLogin_authn_response_get(LassoLogin *self) {
-	return LassoProfile_authn_response_get(LASSO_PROFILE(self));
+/* authnResponse */
+LassoAuthnResponse *LassoLogin_authnResponse_get(LassoLogin *self) {
+	return LassoProfile_authnResponse_get(LASSO_PROFILE(self));
 }
 
 /* identity */
@@ -1153,28 +1189,28 @@ gint LassoLogin_identity_set(LassoLogin *self, LassoIdentity *identity) {
 	return lasso_profile_set_identity(LASSO_PROFILE(self), identity);
 }
 
-/* is_identity_dirty */
-gboolean LassoLogin_is_identity_dirty_get(LassoLogin *self) {
+/* isIdentityDirty */
+gboolean LassoLogin_isIdentityDirty_get(LassoLogin *self) {
 	return lasso_profile_is_identity_dirty(LASSO_PROFILE(self));
 }
 
-/* is_session_dirty */
-gboolean LassoLogin_is_session_dirty_get(LassoLogin *self) {
+/* isSessionDirty */
+gboolean LassoLogin_isSessionDirty_get(LassoLogin *self) {
 	return lasso_profile_is_session_dirty(LASSO_PROFILE(self));
 }
 
-/* msg_body */
-gchar *LassoLogin_msg_body_get(LassoLogin *self) {
+/* msgBody */
+gchar *LassoLogin_msgBody_get(LassoLogin *self) {
 	return LASSO_PROFILE(self)->msg_body;
 }
 
-/* msg_relayState */
-gchar *LassoLogin_msg_relayState_get(LassoLogin *self) {
+/* msgRelayState */
+gchar *LassoLogin_msgRelayState_get(LassoLogin *self) {
 	return LASSO_PROFILE(self)->msg_relayState;
 }
 
-/* msg_url */
-gchar *LassoLogin_msg_url_get(LassoLogin *self) {
+/* msgUrl */
+gchar *LassoLogin_msgUrl_get(LassoLogin *self) {
 	return LASSO_PROFILE(self)->msg_url;
 }
 
@@ -1183,12 +1219,12 @@ gchar *LassoLogin_nameIdentifier_get(LassoLogin *self) {
 	return LASSO_PROFILE(self)->nameIdentifier;
 }
 
-/* remote_providerID */
-gchar *LassoLogin_remote_providerID_get(LassoLogin *self) {
+/* remoteProviderId */
+gchar *LassoLogin_remoteProviderId_get(LassoLogin *self) {
 	return NULL; /* FIXME */
 }
-void LassoLogin_remote_providerID_set(LassoLogin *self, gchar *remote_providerID) {
-	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remote_providerID);
+void LassoLogin_remoteProviderId_set(LassoLogin *self, gchar *remoteProviderId) {
+	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remoteProviderId);
 }
 
 /* request */
@@ -1201,12 +1237,17 @@ LassoResponse *LassoLogin_response_get(LassoLogin *self) {
 	return LassoProfile_response_get(LASSO_PROFILE(self));
 }
 
-/* response_status */
-gchar *LassoLogin_response_status_get(LassoLogin *self) {
+/* responseDump */
+gchar *LassoLogin_responseDump_get(LassoLogin *self) {
+	return self->response_dump;
+}
+
+/* responseStatus */
+gchar *LassoLogin_responseStatus_get(LassoLogin *self) {
 	return NULL; /* FIXME */
 }
-void LassoLogin_response_status_set(LassoLogin *self, gchar *response_status) {
-	lasso_profile_set_response_status(LASSO_PROFILE(self), response_status);
+void LassoLogin_responseStatus_set(LassoLogin *self, gchar *responseStatus) {
+	lasso_profile_set_response_status(LASSO_PROFILE(self), responseStatus);
 }
 
 /* session */
@@ -1221,33 +1262,33 @@ gint LassoLogin_session_set(LassoLogin *self, LassoSession *session) {
 
 #define new_LassoLogin lasso_login_new
 #define delete_LassoLogin lasso_login_destroy
-#define Login_new_from_dump lasso_login_new_from_dump
+#define Login_newFromDump lasso_login_new_from_dump
 
 /* Methods inherited from LassoProfile implementations */
 
-gint LassoLogin_set_identity_from_dump(LassoLogin *self, gchar *dump) {
+gint LassoLogin_setIdentityFromDump(LassoLogin *self, gchar *dump) {
 	return lasso_profile_set_identity_from_dump(LASSO_PROFILE(self), dump);
 }
 
-gint LassoLogin_set_session_from_dump(LassoLogin *self, gchar *dump) {
+gint LassoLogin_setSessionFromDump(LassoLogin *self, gchar *dump) {
 	return lasso_profile_set_session_from_dump(LASSO_PROFILE(self), dump);
 }
 
 /* Methods implementations */
 
-#define LassoLogin_accept_sso lasso_login_accept_sso
-#define LassoLogin_build_artifact_msg lasso_login_build_artifact_msg
-#define LassoLogin_build_authn_request_msg lasso_login_build_authn_request_msg
-#define LassoLogin_build_authn_response_msg lasso_login_build_authn_response_msg
-#define LassoLogin_build_request_msg lasso_login_build_request_msg
+#define LassoLogin_acceptSso lasso_login_accept_sso
+#define LassoLogin_buildArtifactMsg lasso_login_build_artifact_msg
+#define LassoLogin_buildAuthnRequestMsg lasso_login_build_authn_request_msg
+#define LassoLogin_buildAuthnResponseMsg lasso_login_build_authn_response_msg
+#define LassoLogin_buildRequestMsg lasso_login_build_request_msg
 #define LassoLogin_dump lasso_login_dump
-#define LassoLogin_init_authn_request lasso_login_init_authn_request
-#define LassoLogin_init_from_authn_request_msg lasso_login_init_from_authn_request_msg
-#define LassoLogin_init_request lasso_login_init_request
-#define LassoLogin_must_authenticate lasso_login_must_authenticate
-#define LassoLogin_process_authn_response_msg lasso_login_process_authn_response_msg
-#define LassoLogin_process_request_msg lasso_login_process_request_msg
-#define LassoLogin_process_response_msg lasso_login_process_response_msg
+#define LassoLogin_initAuthnRequest lasso_login_init_authn_request
+#define LassoLogin_initFromAuthnRequestMsg lasso_login_init_from_authn_request_msg
+#define LassoLogin_initRequest lasso_login_init_request
+#define LassoLogin_mustAuthenticate lasso_login_must_authenticate
+#define LassoLogin_processAuthnResponseMsg lasso_login_process_authn_response_msg
+#define LassoLogin_processRequestMsg lasso_login_process_request_msg
+#define LassoLogin_processResponseMsg lasso_login_process_response_msg
 
 %}
 
@@ -1267,14 +1308,14 @@ void lasso_login_destroy(LassoLogin *login);
 
 gint lasso_login_accept_sso(LassoLogin *login);
 
-gint lasso_login_build_artifact_msg(LassoLogin *login, gint authentication_result,
+gint lasso_login_build_artifact_msg(LassoLogin *login, gint authenticationResult,
 				    const gchar *authenticationMethod,
 				    const gchar *reauthenticateOnOrAfter,
-				    lassoHttpMethod http_method);
+				    lassoHttpMethod httpMethod);
 
-gint lasso_login_build_authn_request_msg(LassoLogin *login, const gchar *remote_providerID);
+gint lasso_login_build_authn_request_msg(LassoLogin *login, const gchar *remoteProviderId);
 
-gint lasso_login_build_authn_response_msg(LassoLogin  *login, gint authentication_result,
+gint lasso_login_build_authn_response_msg(LassoLogin  *login, gint authenticationResult,
 					  const gchar *authenticationMethod,
 					  const gchar *reauthenticateOnOrAfter);
 
@@ -1283,21 +1324,21 @@ gint lasso_login_build_request_msg(LassoLogin *login);
 %newobject lasso_login_dump;
 gchar *lasso_login_dump(LassoLogin *login);
 
-gint lasso_login_init_authn_request(LassoLogin *login, lassoHttpMethod http_method);
+gint lasso_login_init_authn_request(LassoLogin *login, lassoHttpMethod httpMethod);
 
-gint lasso_login_init_from_authn_request_msg(LassoLogin *login, gchar *authn_request_msg,
-					     lassoHttpMethod  authn_request_http_method);
+gint lasso_login_init_from_authn_request_msg(LassoLogin *login, gchar *authnRequestMsg,
+					     lassoHttpMethod  httpMethod);
 
-gint lasso_login_init_request(LassoLogin *login, gchar *response_msg,
-			      lassoHttpMethod response_http_method);
+gint lasso_login_init_request(LassoLogin *login, gchar *responseMsg,
+			      lassoHttpMethod httpMethod);
 
 gboolean lasso_login_must_authenticate(LassoLogin *login);
 
-gint lasso_login_process_authn_response_msg(LassoLogin *login, gchar *authn_response_msg);
+gint lasso_login_process_authn_response_msg(LassoLogin *login, gchar *authnResponseMsg);
 
-gint lasso_login_process_request_msg(LassoLogin *login, gchar *request_msg);
+gint lasso_login_process_request_msg(LassoLogin *login, gchar *requestMsg);
 
-gint lasso_login_process_response_msg(LassoLogin  *login, gchar *response_msg);
+gint lasso_login_process_response_msg(LassoLogin  *login, gchar *responseMsg);
 
 
 /***********************************************************************
@@ -1310,34 +1351,34 @@ typedef struct {
 	%extend {
 		/* Attributes inherited from LassoProfile */
 
-		%immutable authn_request;
-		LassoAuthnRequest *authn_request;
+		%immutable authnRequest;
+		LassoAuthnRequest *authnRequest;
 
-		%immutable authn_response;
-		LassoAuthnResponse *authn_response;
+		%immutable authnResponse;
+		LassoAuthnResponse *authnResponse;
 
 		%newobject identity_get;
 		LassoIdentity *identity;
 
-		%immutable is_identity_dirty;
-		gboolean is_identity_dirty;
+		%immutable isIdentityDirty;
+		gboolean isIdentityDirty;
 
-		%immutable is_session_dirty;
-		gboolean is_session_dirty;
+		%immutable isSessionDirty;
+		gboolean isSessionDirty;
 
-		%immutable msg_body;
-		gchar *msg_body;
+		%immutable msgBody;
+		gchar *msgBody;
 
-		%immutable msg_relayState;
-		gchar *msg_relayState;
+		%immutable msgRelayState;
+		gchar *msgRelayState;
 
-		%immutable msg_url;
-		gchar *msg_url;
+		%immutable msgUrl;
+		gchar *msgUrl;
 
 		%immutable nameIdentifier;
 		gchar *nameIdentifier;
 
-		gchar *remote_providerID;
+		gchar *remoteProviderId;
 
 		%immutable request;
 		LassoRequest *request;
@@ -1345,65 +1386,65 @@ typedef struct {
 		%immutable response;
 		LassoResponse *response;
 
-		gchar *response_status;
+		gchar *responseStatus;
 
 		%newobject session_get;
 		LassoSession *session;
 
 		/* Constructor, Destructor & Static Methods */
 
-		LassoLogout(LassoServer *server, lassoProviderType provider_type);
+		LassoLogout(LassoServer *server, lassoProviderType providerType);
 
 		~LassoLogout();
 
-		%newobject new_from_dump;
-		static LassoLogout *new_from_dump(LassoServer *server, gchar *dump);
+		%newobject newFromDump;
+		static LassoLogout *newFromDump(LassoServer *server, gchar *dump);
 
 		/* Methods inherited from LassoProfile */
 
 	        THROW_ERROR
-		void set_identity_from_dump(gchar *dump);
+		void setIdentityFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void set_session_from_dump(gchar *dump);
+		void setSessionFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		/* Methods */
 
 		THROW_ERROR
-		void build_request_msg();
+		void buildRequestMsg();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_response_msg();
+		void buildResponseMsg();
 		END_THROW_ERROR
 
 		%newobject dump;
 		gchar *dump();
 
-		%newobject get_next_providerID;
-		gchar *get_next_providerID();
+		%newobject getNextProviderId;
+		gchar *getNextProviderId();
 
 		THROW_ERROR
-		void init_request(gchar *remote_providerID = NULL,
-				  lassoHttpMethod request_method = lassoHttpMethodAny);
+		void initRequest(gchar *remoteProviderId = NULL,
+				 lassoHttpMethod httpMethod = lassoHttpMethodAny);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_request_msg(gchar *request_msg, lassoHttpMethod request_method);
+		void processRequestMsg(gchar *requestMsg, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_response_msg(gchar *response_msg, lassoHttpMethod response_method);
+		void processResponseMsg(gchar *responseMsg, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void reset_session_index();
+		void resetSessionIndex();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void validate_request();
+		void validateRequest();
 		END_THROW_ERROR
 	}
 } LassoLogout;
@@ -1412,14 +1453,14 @@ typedef struct {
 
 /* Attributes inherited from LassoProfile implementations */
 
-/* authn_request */
-LassoAuthnRequest *LassoLogout_authn_request_get(LassoLogout *self) {
-	return LassoProfile_authn_request_get(LASSO_PROFILE(self));
+/* authnRequest */
+LassoAuthnRequest *LassoLogout_authnRequest_get(LassoLogout *self) {
+	return LassoProfile_authnRequest_get(LASSO_PROFILE(self));
 }
 
-/* authn_response */
-LassoAuthnResponse *LassoLogout_authn_response_get(LassoLogout *self) {
-	return LassoProfile_authn_response_get(LASSO_PROFILE(self));
+/* authnResponse */
+LassoAuthnResponse *LassoLogout_authnResponse_get(LassoLogout *self) {
+	return LassoProfile_authnResponse_get(LASSO_PROFILE(self));
 }
 
 /* identity */
@@ -1430,28 +1471,28 @@ gint LassoLogout_identity_set(LassoLogout *self, LassoIdentity *identity) {
 	return lasso_profile_set_identity(LASSO_PROFILE(self), identity);
 }
 
-/* is_identity_dirty */
-gboolean LassoLogout_is_identity_dirty_get(LassoLogout *self) {
+/* isIdentityDirty */
+gboolean LassoLogout_isIdentityDirty_get(LassoLogout *self) {
 	return lasso_profile_is_identity_dirty(LASSO_PROFILE(self));
 }
 
-/* is_session_dirty */
-gboolean LassoLogout_is_session_dirty_get(LassoLogout *self) {
+/* isSessionDirty */
+gboolean LassoLogout_isSessionDirty_get(LassoLogout *self) {
 	return lasso_profile_is_session_dirty(LASSO_PROFILE(self));
 }
 
-/* msg_body */
-gchar *LassoLogout_msg_body_get(LassoLogout *self) {
+/* msgBody */
+gchar *LassoLogout_msgBody_get(LassoLogout *self) {
 	return LASSO_PROFILE(self)->msg_body;
 }
 
-/* msg_relayState */
-gchar *LassoLogout_msg_relayState_get(LassoLogout *self) {
+/* msgRelayState */
+gchar *LassoLogout_msgRelayState_get(LassoLogout *self) {
 	return LASSO_PROFILE(self)->msg_relayState;
 }
 
-/* msg_url */
-gchar *LassoLogout_msg_url_get(LassoLogout *self) {
+/* msgUrl */
+gchar *LassoLogout_msgUrl_get(LassoLogout *self) {
 	return LASSO_PROFILE(self)->msg_url;
 }
 
@@ -1460,12 +1501,12 @@ gchar *LassoLogout_nameIdentifier_get(LassoLogout *self) {
 	return LASSO_PROFILE(self)->nameIdentifier;
 }
 
-/* remote_providerID */
-gchar *LassoLogout_remote_providerID_get(LassoLogout *self) {
+/* remoteProviderId */
+gchar *LassoLogout_remoteProviderId_get(LassoLogout *self) {
 	return NULL; /* FIXME */
 }
-void LassoLogout_remote_providerID_set(LassoLogout *self, gchar *remote_providerID) {
-	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remote_providerID);
+void LassoLogout_remoteProviderId_set(LassoLogout *self, gchar *remoteProviderId) {
+	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remoteProviderId);
 }
 
 /* request */
@@ -1478,12 +1519,12 @@ LassoResponse *LassoLogout_response_get(LassoLogout *self) {
 	return LassoProfile_response_get(LASSO_PROFILE(self));
 }
 
-/* response_status */
-gchar *LassoLogout_response_status_get(LassoLogout *self) {
+/* responseStatus */
+gchar *LassoLogout_responseStatus_get(LassoLogout *self) {
 	return NULL; /* FIXME */
 }
-void LassoLogout_response_status_set(LassoLogout *self, gchar *response_status) {
-	lasso_profile_set_response_status(LASSO_PROFILE(self), response_status);
+void LassoLogout_responseStatus_set(LassoLogout *self, gchar *responseStatus) {
+	lasso_profile_set_response_status(LASSO_PROFILE(self), responseStatus);
 }
 
 /* session */
@@ -1498,36 +1539,36 @@ gint LassoLogout_session_set(LassoLogout *self, LassoSession *session) {
 
 #define new_LassoLogout lasso_logout_new
 #define delete_LassoLogout lasso_logout_destroy
-#define Logout_new_from_dump lasso_logout_new_from_dump
+#define Logout_newFromDump lasso_logout_new_from_dump
 
 /* Methods inherited from LassoProfile implementations */
 
-gint LassoLogout_set_identity_from_dump(LassoLogout *self, gchar *dump) {
+gint LassoLogout_setIdentityFromDump(LassoLogout *self, gchar *dump) {
 	return lasso_profile_set_identity_from_dump(LASSO_PROFILE(self), dump);
 }
 
-gint LassoLogout_set_session_from_dump(LassoLogout *self, gchar *dump) {
+gint LassoLogout_setSessionFromDump(LassoLogout *self, gchar *dump) {
 	return lasso_profile_set_session_from_dump(LASSO_PROFILE(self), dump);
 }
 
 /* Methods implementations */
 
-#define LassoLogout_build_request_msg lasso_logout_build_request_msg
-#define LassoLogout_build_response_msg lasso_logout_build_response_msg
+#define LassoLogout_buildRequestMsg lasso_logout_build_request_msg
+#define LassoLogout_buildResponseMsg lasso_logout_build_response_msg
 #define LassoLogout_dump lasso_logout_dump
-#define LassoLogout_get_next_providerID lasso_logout_get_next_providerID
-#define LassoLogout_init_request lasso_logout_init_request
-#define LassoLogout_process_request_msg lasso_logout_process_request_msg
-#define LassoLogout_process_response_msg lasso_logout_process_response_msg
-#define LassoLogout_reset_session_index lasso_logout_reset_session_index
-#define LassoLogout_validate_request lasso_logout_validate_request
+#define LassoLogout_getNextProviderId lasso_logout_get_next_providerID
+#define LassoLogout_initRequest lasso_logout_init_request
+#define LassoLogout_processRequestMsg lasso_logout_process_request_msg
+#define LassoLogout_processResponseMsg lasso_logout_process_response_msg
+#define LassoLogout_resetSessionIndex lasso_logout_reset_session_index
+#define LassoLogout_validateRequest lasso_logout_validate_request
 
 %}
 
 /* Constructors */
 
 %newobject lasso_logout_new;
-LassoLogout *lasso_logout_new(LassoServer *server, lassoProviderType provider_type);
+LassoLogout *lasso_logout_new(LassoServer *server, lassoProviderType providerType);
 
 %newobject lasso_logout_new_from_dump;
 LassoLogout *lasso_logout_new_from_dump(LassoServer *server, gchar *dump);
@@ -1548,14 +1589,14 @@ gchar *lasso_logout_dump(LassoLogout *logout);
 %newobject lasso_logout_get_next_providerID;
 gchar *lasso_logout_get_next_providerID(LassoLogout *logout);
 
-gint lasso_logout_init_request(LassoLogout *logout, gchar *remote_providerID,
-			       lassoHttpMethod request_method);
+gint lasso_logout_init_request(LassoLogout *logout, gchar *remoteProviderId,
+			       lassoHttpMethod httpMethod);
 
-gint lasso_logout_process_request_msg(LassoLogout *logout, gchar *request_msg,
-				      lassoHttpMethod request_method);
+gint lasso_logout_process_request_msg(LassoLogout *logout, gchar *requestMsg,
+				      lassoHttpMethod httpMethod);
 
-gint lasso_logout_process_response_msg(LassoLogout *logout, gchar *response_msg,
-				       lassoHttpMethod response_method);
+gint lasso_logout_process_response_msg(LassoLogout *logout, gchar *responseMsg,
+				       lassoHttpMethod httpMethod);
 
 gint lasso_logout_reset_session_index(LassoLogout *logout);
 
@@ -1572,34 +1613,34 @@ typedef struct {
 	%extend {
 		/* Attributes inherited from LassoProfile */
 
-		%immutable authn_request;
-		LassoAuthnRequest *authn_request;
+		%immutable authnRequest;
+		LassoAuthnRequest *authnRequest;
 
-		%immutable authn_response;
-		LassoAuthnResponse *authn_response;
+		%immutable authnResponse;
+		LassoAuthnResponse *authnResponse;
 
 		%newobject identity_get;
 		LassoIdentity *identity;
 
-		%immutable is_identity_dirty;
-		gboolean is_identity_dirty;
+		%immutable isIdentityDirty;
+		gboolean isIdentityDirty;
 
-		%immutable is_session_dirty;
-		gboolean is_session_dirty;
+		%immutable isSessionDirty;
+		gboolean isSessionDirty;
 
-		%immutable msg_body;
-		gchar *msg_body;
+		%immutable msgBody;
+		gchar *msgBody;
 
-		%immutable msg_relayState;
-		gchar *msg_relayState;
+		%immutable msgRelayState;
+		gchar *msgRelayState;
 
-		%immutable msg_url;
-		gchar *msg_url;
+		%immutable msgUrl;
+		gchar *msgUrl;
 
 		%immutable nameIdentifier;
 		gchar *nameIdentifier;
 
-		gchar *remote_providerID;
+		gchar *remoteProviderId;
 
 		%immutable request;
 		LassoRequest *request;
@@ -1607,7 +1648,7 @@ typedef struct {
 		%immutable response;
 		LassoResponse *response;
 
-		gchar *response_status;
+		gchar *responseStatus;
 
 		%newobject session_get;
 		LassoSession *session;
@@ -1621,48 +1662,47 @@ typedef struct {
 		/* Methods inherited from LassoProfile */
 
 	        THROW_ERROR
-		void set_identity_from_dump(gchar *dump);
+		void setIdentityFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void set_session_from_dump(gchar *dump);
+		void setSessionFromDump(gchar *dump);
 		END_THROW_ERROR
 
 		/* Methods */
 
 		THROW_ERROR
-		void build_authn_request_envelope_msg();
+		void buildAuthnRequestEnvelopeMsg();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_authn_request_msg(gchar *remote_providerID);
+		void buildAuthnRequestMsg(gchar *remoteProviderId);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_authn_response_envelope_msg(gint authentication_result,
-						       gchar *authenticationMethod,
-						       gchar *reauthenticateOnOrAfter);
+		void buildAuthnResponseEnvelopeMsg(gint authenticationResult,
+						   gchar *authenticationMethod,
+						   gchar *reauthenticateOnOrAfter);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void build_authn_response_msg();
+		void buildAuthnResponseMsg();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void init_authn_request();
+		void initAuthnRequest();
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void init_from_authn_request_msg(gchar *authn_request_msg,
-						 lassoHttpMethod authn_request_method);
+		void initFromAuthnRequestMsg(gchar *authnRequestMsg, lassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_authn_request_envelope_msg(gchar *request_msg);
+		void processAuthnRequestEnvelopeMsg(gchar *requestMsg);
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void process_authn_response_envelope_msg(gchar *response_msg);
+		void processAuthnResponseEnvelopeMsg(gchar *responseMsg);
 		END_THROW_ERROR
 	}
 } LassoLecp;
@@ -1671,14 +1711,14 @@ typedef struct {
 
 /* Attributes inherited from LassoProfile implementations */
 
-/* authn_request */
-LassoAuthnRequest *LassoLecp_authn_request_get(LassoLecp *self) {
-	return LassoProfile_authn_request_get(LASSO_PROFILE(self));
+/* authnRequest */
+LassoAuthnRequest *LassoLecp_authnRequest_get(LassoLecp *self) {
+	return LassoProfile_authnRequest_get(LASSO_PROFILE(self));
 }
 
-/* authn_response */
-LassoAuthnResponse *LassoLecp_authn_response_get(LassoLecp *self) {
-	return LassoProfile_authn_response_get(LASSO_PROFILE(self));
+/* authnResponse */
+LassoAuthnResponse *LassoLecp_authnResponse_get(LassoLecp *self) {
+	return LassoProfile_authnResponse_get(LASSO_PROFILE(self));
 }
 
 /* identity */
@@ -1689,28 +1729,28 @@ gint LassoLecp_identity_set(LassoLecp *self, LassoIdentity *identity) {
 	return lasso_profile_set_identity(LASSO_PROFILE(self), identity);
 }
 
-/* is_identity_dirty */
-gboolean LassoLecp_is_identity_dirty_get(LassoLecp *self) {
+/* isIdentityDirty */
+gboolean LassoLecp_isIdentityDirty_get(LassoLecp *self) {
 	return lasso_profile_is_identity_dirty(LASSO_PROFILE(self));
 }
 
-/* is_session_dirty */
-gboolean LassoLecp_is_session_dirty_get(LassoLecp *self) {
+/* isSessionDirty */
+gboolean LassoLecp_isSessionDirty_get(LassoLecp *self) {
 	return lasso_profile_is_session_dirty(LASSO_PROFILE(self));
 }
 
-/* msg_body */
-gchar *LassoLecp_msg_body_get(LassoLecp *self) {
+/* msgBody */
+gchar *LassoLecp_msgBody_get(LassoLecp *self) {
 	return LASSO_PROFILE(self)->msg_body;
 }
 
-/* msg_relayState */
-gchar *LassoLecp_msg_relayState_get(LassoLecp *self) {
+/* msgRelayState */
+gchar *LassoLecp_msgRelayState_get(LassoLecp *self) {
 	return LASSO_PROFILE(self)->msg_relayState;
 }
 
-/* msg_url */
-gchar *LassoLecp_msg_url_get(LassoLecp *self) {
+/* msgUrl */
+gchar *LassoLecp_msgUrl_get(LassoLecp *self) {
 	return LASSO_PROFILE(self)->msg_url;
 }
 
@@ -1719,12 +1759,12 @@ gchar *LassoLecp_nameIdentifier_get(LassoLecp *self) {
 	return LASSO_PROFILE(self)->nameIdentifier;
 }
 
-/* remote_providerID */
-gchar *LassoLecp_remote_providerID_get(LassoLecp *self) {
+/* remoteProviderId */
+gchar *LassoLecp_remoteProviderId_get(LassoLecp *self) {
 	return NULL; /* FIXME */
 }
-void LassoLecp_remote_providerID_set(LassoLecp *self, gchar *remote_providerID) {
-	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remote_providerID);
+void LassoLecp_remoteProviderId_set(LassoLecp *self, gchar *remoteProviderId) {
+	lasso_profile_set_remote_providerID(LASSO_PROFILE(self), remoteProviderId);
 }
 
 /* request */
@@ -1737,12 +1777,12 @@ LassoResponse *LassoLecp_response_get(LassoLecp *self) {
 	return LassoProfile_response_get(LASSO_PROFILE(self));
 }
 
-/* response_status */
-gchar *LassoLecp_response_status_get(LassoLecp *self) {
+/* responseStatus */
+gchar *LassoLecp_responseStatus_get(LassoLecp *self) {
 	return NULL; /* FIXME */
 }
-void LassoLecp_response_status_set(LassoLecp *self, gchar *response_status) {
-	lasso_profile_set_response_status(LASSO_PROFILE(self), response_status);
+void LassoLecp_responseStatus_set(LassoLecp *self, gchar *responseStatus) {
+	lasso_profile_set_response_status(LASSO_PROFILE(self), responseStatus);
 }
 
 /* session */
@@ -1760,24 +1800,24 @@ gint LassoLecp_session_set(LassoLecp *self, LassoSession *session) {
 
 /* Methods inherited from LassoProfile implementations */
 
-gint LassoLecp_set_identity_from_dump(LassoLecp *self, gchar *dump) {
+gint LassoLecp_setIdentityFromDump(LassoLecp *self, gchar *dump) {
 	return lasso_profile_set_identity_from_dump(LASSO_PROFILE(self), dump);
 }
 
-gint LassoLecp_set_session_from_dump(LassoLecp *self, gchar *dump) {
+gint LassoLecp_setSessionFromDump(LassoLecp *self, gchar *dump) {
 	return lasso_profile_set_session_from_dump(LASSO_PROFILE(self), dump);
 }
 
 /* Methods implementations */
 
-#define LassoLecp_build_authn_request_envelope_msg lasso_lecp_build_authn_request_envelope_msg
-#define LassoLecp_build_authn_request_msg lasso_lecp_build_authn_request_msg
-#define LassoLecp_build_authn_response_envelope_msg lasso_lecp_build_authn_response_envelope_msg
-#define LassoLecp_build_authn_response_msg lasso_lecp_build_authn_response_msg
-#define LassoLecp_init_authn_request lasso_lecp_init_authn_request
-#define LassoLecp_init_from_authn_request_msg lasso_lecp_init_from_authn_request_msg
-#define LassoLecp_process_authn_request_envelope_msg lasso_lecp_process_authn_request_envelope_msg
-#define LassoLecp_process_authn_response_envelope_msg lasso_lecp_process_authn_response_envelope_msg
+#define LassoLecp_buildAuthnRequestEnvelopeMsg lasso_lecp_build_authn_request_envelope_msg
+#define LassoLecp_buildAuthnRequestMsg lasso_lecp_build_authn_request_msg
+#define LassoLecp_buildAuthnResponseEnvelopeMsg lasso_lecp_build_authn_response_envelope_msg
+#define LassoLecp_buildAuthnResponseMsg lasso_lecp_build_authn_response_msg
+#define LassoLecp_initAuthnRequest lasso_lecp_init_authn_request
+#define LassoLecp_initFromAuthnRequestMsg lasso_lecp_init_from_authn_request_msg
+#define LassoLecp_processAuthnRequestEnvelopeMsg lasso_lecp_process_authn_request_envelope_msg
+#define LassoLecp_processAuthnResponseEnvelopeMsg lasso_lecp_process_authn_response_envelope_msg
 
 %}
 
@@ -1794,9 +1834,9 @@ void lasso_lecp_destroy(LassoLecp *lecp);
 
 gint lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp);
 
-gint lasso_lecp_build_authn_request_msg(LassoLecp *lecp, const gchar *remote_providerID);
+gint lasso_lecp_build_authn_request_msg(LassoLecp *lecp, const gchar *remoteProviderId);
 
-gint lasso_lecp_build_authn_response_envelope_msg(LassoLecp *lecp, gint authentication_result,
+gint lasso_lecp_build_authn_response_envelope_msg(LassoLecp *lecp, gint authenticationResult,
 						  const gchar *authenticationMethod,
 						  const gchar *reauthenticateOnOrAfter);
 
@@ -1804,9 +1844,9 @@ gint lasso_lecp_build_authn_response_msg(LassoLecp *lecp);
 
 gint lasso_lecp_init_authn_request(LassoLecp *lecp);
 
-gint lasso_lecp_init_from_authn_request_msg(LassoLecp *lecp, gchar *authn_request_msg,
-					    lassoHttpMethod authn_request_method);
+gint lasso_lecp_init_from_authn_request_msg(LassoLecp *lecp, gchar *authnRequestMsg,
+					    lassoHttpMethod httpMethod);
 
-gint lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, gchar *request_msg);
+gint lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, gchar *requestMsg);
   
-gint lasso_lecp_process_authn_response_envelope_msg(LassoLecp *lecp, gchar *response_msg);
+gint lasso_lecp_process_authn_response_envelope_msg(LassoLecp *lecp, gchar *responseMsg);