moved remaining lasso[A-Z].* enums to Lasso[A-Z].*

38 files changed, 110 insertions, 112 deletions

diff --git a/docs/reference/lasso-sections.txt b/docs/reference/lasso-sections.txt
index b4bf9c17..041cf219 100644
--- a/docs/reference/lasso-sections.txt
+++ b/docs/reference/lasso-sections.txt
@@ -5,8 +5,8 @@
 <TITLE>LassoProvider</TITLE>
 LassoProvider
 LassoProviderRole
-lassoHttpMethod
-lassoMdProtocolType
+LassoHttpMethod
+LassoMdProtocolType
 lasso_provider_new
 lasso_provider_new_from_dump
 lasso_provider_accept_http_method
@@ -113,8 +113,8 @@ LASSO_FEDERATION_GET_CLASS
 <SECTION>
 <FILE>profile</FILE>
 <TITLE>LassoProfile</TITLE>
-lassoMessageType
-lassoRequestType
+LassoMessageType
+LassoRequestType
 LassoProfile
 lasso_profile_get_identity
 lasso_profile_get_session
@@ -140,7 +140,7 @@ LASSO_PROFILE_GET_CLASS
 <FILE>login</FILE>
 <TITLE>LassoLogin</TITLE>
 LassoLogin
-lassoLoginProtocolProfile
+LassoLoginProtocolProfile
 lasso_login_new
 lasso_login_destroy
 lasso_login_dump
@@ -685,8 +685,8 @@ LASSO_SAMLP_STATUS_CODE_GET_CLASS
 <TITLE>LassoNode</TITLE>
 LassoNode
 LassoMessageFormat
-lassoSignatureType
-lassoSignatureMethod
+LassoSignatureType
+LassoSignatureMethod
 lasso_node_new
 lasso_node_new_from_dump
 lasso_node_new_from_xmlNode
@@ -902,7 +902,7 @@ LASSO_LIB_AUTHENTICATION_STATEMENT_GET_CLASS
 <FILE>lasso</FILE>
 lasso_init
 lasso_shutdown
-lassoCheckVersionMode
+LassoCheckVersionMode
 lasso_check_version_exact
 lasso_check_version
 lasso_check_version_ext
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index ead18936..d1aadc52 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -142,7 +142,7 @@ lasso_defederation_destroy(LassoDefederation *defederation)
  **/
 gint
 lasso_defederation_init_notification(LassoDefederation *defederation, gchar *remote_providerID,
-		lassoHttpMethod http_method)
+		LassoHttpMethod http_method)
 {
 	LassoProfile*profile;
 	LassoProvider *remote_provider;
diff --git a/lasso/id-ff/defederation.h b/lasso/id-ff/defederation.h
index f2f4983b..ab3cbf63 100644
--- a/lasso/id-ff/defederation.h
+++ b/lasso/id-ff/defederation.h
@@ -65,7 +65,7 @@ LASSO_EXPORT gint lasso_defederation_build_notification_msg(LassoDefederation *d
 LASSO_EXPORT void lasso_defederation_destroy(LassoDefederation *defederation);
 
 LASSO_EXPORT gint lasso_defederation_init_notification(LassoDefederation *defederation,
-		gchar *remote_providerID, lassoHttpMethod http_method);
+		gchar *remote_providerID, LassoHttpMethod http_method);
 
 LASSO_EXPORT gint lasso_defederation_process_notification_msg(
 		LassoDefederation *defederation, gchar *notification_msg);
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index ae210d55..5bdf5a4f 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -437,7 +437,7 @@ lasso_login_accept_sso(LassoLogin *login)
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_login_build_artifact_msg(LassoLogin *login, lassoHttpMethod http_method)
+lasso_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method)
 {
 	LassoProvider *remote_provider;
 	LassoProfile *profile;
@@ -810,7 +810,7 @@ lasso_login_destroy(LassoLogin *login)
  **/
 gint
 lasso_login_init_authn_request(LassoLogin *login, const gchar *remote_providerID,
-		lassoHttpMethod http_method)
+		LassoHttpMethod http_method)
 {
 	LassoLibAuthnRequest *request;
 
@@ -868,7 +868,7 @@ lasso_login_init_authn_request(LassoLogin *login, const gchar *remote_providerID
  **/ 
 gint
 lasso_login_init_request(LassoLogin *login, gchar *response_msg,
-		lassoHttpMethod response_http_method)
+		LassoHttpMethod response_http_method)
 {
 	char **query_fields;
 	gint ret = 0;
diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h
index e3d25aa9..323108ce 100644
--- a/lasso/id-ff/login.h
+++ b/lasso/id-ff/login.h
@@ -54,19 +54,19 @@ typedef struct _LassoLoginPrivate LassoLoginPrivate;
 typedef enum {
 	LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART = 1,
 	LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST,
-} lassoLoginProtocolProfile;
+} LassoLoginProtocolProfile;
 
 struct _LassoLogin {
 	LassoProfile parent;
 
 	/*< public >*/
-	lassoLoginProtocolProfile protocolProfile;
+	LassoLoginProtocolProfile protocolProfile;
 	gchar *assertionArtifact;
 	LassoSamlAssertion *assertion;
 
 	/*< private >*/
 	gchar *nameIDPolicy;
-	lassoHttpMethod http_method;
+	LassoHttpMethod http_method;
 
 	LassoLoginPrivate *private_data;
 };
@@ -80,7 +80,7 @@ LASSO_EXPORT LassoLogin* lasso_login_new(LassoServer *server);
 LASSO_EXPORT LassoLogin* lasso_login_new_from_dump(LassoServer *server, const gchar *dump);
 LASSO_EXPORT gint lasso_login_accept_sso(LassoLogin *login);
 
-LASSO_EXPORT gint lasso_login_build_artifact_msg(LassoLogin *login, lassoHttpMethod http_method);
+LASSO_EXPORT gint lasso_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method);
 
 LASSO_EXPORT gint lasso_login_build_authn_request_msg(LassoLogin *login);
 
@@ -91,10 +91,10 @@ LASSO_EXPORT gint lasso_login_build_response_msg(LassoLogin *login, gchar *remot
 LASSO_EXPORT void lasso_login_destroy(LassoLogin *login);
 LASSO_EXPORT gchar* lasso_login_dump(LassoLogin *login);
 LASSO_EXPORT gint lasso_login_init_authn_request(LassoLogin *login,
-		const gchar *remote_providerID, lassoHttpMethod http_method);
+		const gchar *remote_providerID, LassoHttpMethod http_method);
 
 LASSO_EXPORT gint lasso_login_init_request(LassoLogin *login, gchar *response_msg,
-		lassoHttpMethod response_http_method);
+		LassoHttpMethod response_http_method);
 
 LASSO_EXPORT gint lasso_login_init_idp_initiated_authn_request(LassoLogin *login,
 		const gchar *remote_providerID);
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 04563888..5abbc740 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -256,7 +256,7 @@ lasso_logout_get_next_providerID(LassoLogout *logout)
  **/
 gint
 lasso_logout_init_request(LassoLogout *logout, char *remote_providerID,
-		lassoHttpMethod http_method)
+		LassoHttpMethod http_method)
 {
 	LassoProfile      *profile;
 	LassoProvider     *remote_provider;
@@ -465,7 +465,7 @@ lasso_logout_process_response_msg(LassoLogout *logout, gchar *response_msg)
 	LassoProfile  *profile;
 	LassoProvider *remote_provider;
 	char *statusCodeValue;
-	lassoHttpMethod response_method;
+	LassoHttpMethod response_method;
 	LassoMessageFormat format;
 	LassoLibStatusResponse *response;
 	int rc;
diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h
index 08a5c7de..a90974c9 100644
--- a/lasso/id-ff/logout.h
+++ b/lasso/id-ff/logout.h
@@ -55,7 +55,7 @@ struct _LassoLogout {
 	LassoNode *initial_response;
 	gchar     *initial_remote_providerID;
 	gint       providerID_index;
-	lassoHttpMethod initial_http_request_method;
+	LassoHttpMethod initial_http_request_method;
 
 	LassoLogoutPrivate *private_data;
 };
@@ -83,7 +83,7 @@ LASSO_EXPORT gchar*       lasso_logout_get_next_providerID    (LassoLogout *logo
 
 LASSO_EXPORT gint         lasso_logout_init_request           (LassoLogout    *logout,
 							       gchar          *remote_providerID,
-							       lassoHttpMethod request_method);
+							       LassoHttpMethod request_method);
 
 LASSO_EXPORT gint         lasso_logout_process_request_msg    (LassoLogout     *logout,
 							       gchar           *request_msg);
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index 1a1c7b49..e5ceb530 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -163,7 +163,7 @@ lasso_name_registration_destroy(LassoNameRegistration *name_registration)
 
 gint
 lasso_name_registration_init_request(LassoNameRegistration *name_registration,
-		char *remote_providerID, lassoHttpMethod http_method)
+		char *remote_providerID, LassoHttpMethod http_method)
 {
 	LassoProfile *profile;
 	LassoProvider *remote_provider;
@@ -361,7 +361,7 @@ lasso_name_registration_process_response_msg(LassoNameRegistration *name_registr
 	LassoProvider *remote_provider;
 	LassoFederation *federation;
 	LassoSamlNameIdentifier *nameIdentifier = NULL;
-	lassoHttpMethod response_method;
+	LassoHttpMethod response_method;
 	LassoMessageFormat format;
 	int rc;
 	char *statusCodeValue;
diff --git a/lasso/id-ff/name_registration.h b/lasso/id-ff/name_registration.h
index 8ddeef45..aa045d7c 100644
--- a/lasso/id-ff/name_registration.h
+++ b/lasso/id-ff/name_registration.h
@@ -78,7 +78,7 @@ LASSO_EXPORT void lasso_name_registration_destroy(LassoNameRegistration *name_re
 LASSO_EXPORT gchar* lasso_name_registration_dump(LassoNameRegistration *name_registration);
 
 LASSO_EXPORT gint lasso_name_registration_init_request(LassoNameRegistration *name_registration,
-		char *remote_providerID, lassoHttpMethod http_method);
+		char *remote_providerID, LassoHttpMethod http_method);
 
 LASSO_EXPORT gint lasso_name_registration_process_request_msg(
 		LassoNameRegistration *name_registration, gchar *request_msg);
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 48c88f16..184e1721 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -87,13 +87,13 @@ lasso_profile_get_nameIdentifier(LassoProfile *profile)
  *
  * Return value: the type of request
  **/
-lassoRequestType
+LassoRequestType
 lasso_profile_get_request_type_from_soap_msg(const gchar *soap)
 {
 	xmlDoc *doc;
 	xmlXPathContext *xpathCtx;
 	xmlXPathObject *xpathObj;
-	lassoRequestType type = LASSO_REQUEST_TYPE_INVALID;
+	LassoRequestType type = LASSO_REQUEST_TYPE_INVALID;
 	const char *name = NULL;
 
 	doc = xmlParseMemory(soap, strlen(soap));
diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h
index 4b251649..dc5a711d 100644
--- a/lasso/id-ff/profile.h
+++ b/lasso/id-ff/profile.h
@@ -60,7 +60,7 @@ typedef enum {
 	LASSO_REQUEST_TYPE_NAME_REGISTRATION = 4,
 	LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING = 5,
 	LASSO_REQUEST_TYPE_LECP = 6
-} lassoRequestType;
+} LassoRequestType;
 
 typedef enum {
 	LASSO_MESSAGE_TYPE_NONE = 0,
@@ -69,7 +69,7 @@ typedef enum {
 	LASSO_MESSAGE_TYPE_REQUEST,
 	LASSO_MESSAGE_TYPE_RESPONSE,
 	LASSO_MESSAGE_TYPE_ARTIFACT
-} lassoMessageType;
+} LassoMessageType;
 
 struct _LassoProfile {
 	LassoNode parent;
@@ -92,7 +92,7 @@ struct _LassoProfile {
 	LassoIdentity *identity;
 	LassoSession  *session;
 
-	lassoHttpMethod http_request_method;
+	LassoHttpMethod http_request_method;
 	gint signature_status;
 
 	LassoProfilePrivate *private_data;
@@ -104,7 +104,7 @@ struct _LassoProfileClass {
 
 /* public functions */
 
-LASSO_EXPORT lassoRequestType lasso_profile_get_request_type_from_soap_msg(const gchar *soap);
+LASSO_EXPORT LassoRequestType lasso_profile_get_request_type_from_soap_msg(const gchar *soap);
 LASSO_EXPORT gboolean lasso_profile_is_liberty_query(const gchar *query);
 
 
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 6c4f1dd9..6482930c 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -159,13 +159,13 @@ lasso_provider_get_metadata_list(LassoProvider *provider, const char *name)
  * @remote_provider: a #LassoProvider depicting the remote provider
  * @protocol_type: a Liberty profile
  *
- * Looks up and returns a #lassoHttpMethod appropriate for performing the
+ * Looks up and returns a #LassoHttpMethod appropriate for performing the
  * @protocol_type between @provider and @remote_provider.
  *
- * Return value: the #lassoHttpMethod
+ * Return value: the #LassoHttpMethod
  **/
-lassoHttpMethod lasso_provider_get_first_http_method(LassoProvider *provider,
-		LassoProvider *remote_provider, lassoMdProtocolType protocol_type)
+LassoHttpMethod lasso_provider_get_first_http_method(LassoProvider *provider,
+		LassoProvider *remote_provider, LassoMdProtocolType protocol_type)
 {
 	char *protocol_profile_prefix;
 	GList *local_supported_profiles;
@@ -229,7 +229,7 @@ lassoHttpMethod lasso_provider_get_first_http_method(LassoProvider *provider,
  **/
 gboolean
 lasso_provider_accept_http_method(LassoProvider *provider, LassoProvider *remote_provider,
-		lassoMdProtocolType protocol_type, lassoHttpMethod http_method,
+		LassoMdProtocolType protocol_type, LassoHttpMethod http_method,
 		gboolean initiate_profile)
 { 
 	LassoProviderRole initiating_role;
@@ -273,7 +273,7 @@ lasso_provider_accept_http_method(LassoProvider *provider, LassoProvider *remote
  **/
 gboolean
 lasso_provider_has_protocol_profile(LassoProvider *provider,
-		lassoMdProtocolType protocol_type, const char *protocol_profile)
+		LassoMdProtocolType protocol_type, const char *protocol_profile)
 {
 	GList *supported;
 	
@@ -682,7 +682,7 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 	xmlNode *xmlnode = NULL, *sign, *x509data;
 	xmlSecKeysMngr *keys_mngr = NULL;
 	xmlSecDSigCtx *dsigCtx;
-	lassoPemFileType public_key_file_type;
+	LassoPemFileType public_key_file_type;
 	int rc;
 
 	msg = (char*)message;
@@ -767,8 +767,7 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 	dsigCtx = xmlSecDSigCtxCreate(keys_mngr);
 	if (keys_mngr == NULL) {
 		if (provider->public_key) {
-			public_key_file_type = lasso_get_pem_file_type(
-					provider->public_key);
+			public_key_file_type = lasso_get_pem_file_type(provider->public_key);
 			if (public_key_file_type == LASSO_PEM_FILE_TYPE_CERT) {
 				/* public_key_file is a certificate file
 				 * => get public key in it */
diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h
index 2f6d9166..c66b4f30 100644
--- a/lasso/id-ff/provider.h
+++ b/lasso/id-ff/provider.h
@@ -54,7 +54,7 @@ typedef enum {
 	LASSO_HTTP_METHOD_POST,          /* Browser POST */
 	LASSO_HTTP_METHOD_REDIRECT,      /* HTTP-Redirect based */
 	LASSO_HTTP_METHOD_SOAP           /* SOAP/HTTP based */
-} lassoHttpMethod;
+} LassoHttpMethod;
 
 typedef enum {
 	LASSO_MD_PROTOCOL_TYPE_FEDERATION_TERMINATION = 0, /* Federation Termination Notification */
@@ -62,7 +62,7 @@ typedef enum {
 	LASSO_MD_PROTOCOL_TYPE_REGISTER_NAME_IDENTIFIER,   /* Name Registration */
 	LASSO_MD_PROTOCOL_TYPE_SINGLE_LOGOUT,              /* Single Logout */
 	LASSO_MD_PROTOCOL_TYPE_SINGLE_SIGN_ON              /* Single Sign-On and Federation */
-} lassoMdProtocolType;
+} LassoMdProtocolType;
 
 typedef enum {
 	LASSO_PROVIDER_ROLE_NONE = 0,
@@ -99,15 +99,15 @@ LASSO_EXPORT GList* lasso_provider_get_metadata_list(LassoProvider *provider, co
 
 LASSO_EXPORT LassoProvider* lasso_provider_new_from_dump(const gchar *dump);
 
-LASSO_EXPORT lassoHttpMethod lasso_provider_get_first_http_method(LassoProvider *provider,
-		LassoProvider *remote_provider, lassoMdProtocolType protocol_type);
+LASSO_EXPORT LassoHttpMethod lasso_provider_get_first_http_method(LassoProvider *provider,
+		LassoProvider *remote_provider, LassoMdProtocolType protocol_type);
 
 LASSO_EXPORT gboolean lasso_provider_accept_http_method(LassoProvider *provider,
-		LassoProvider *remote_provider, lassoMdProtocolType protocol_type,
-		lassoHttpMethod http_method, gboolean initiate_profile);
+		LassoProvider *remote_provider, LassoMdProtocolType protocol_type,
+		LassoHttpMethod http_method, gboolean initiate_profile);
 
 LASSO_EXPORT gboolean lasso_provider_has_protocol_profile(LassoProvider *provider,
-		lassoMdProtocolType protocol_type, const char *protocol_profile);
+		LassoMdProtocolType protocol_type, const char *protocol_profile);
 
 LASSO_EXPORT gchar* lasso_provider_get_base64_succinct_id(LassoProvider *provider);
 
diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h
index 252fa042..31b1000a 100644
--- a/lasso/id-ff/server.h
+++ b/lasso/id-ff/server.h
@@ -56,7 +56,7 @@ struct _LassoServer {
 	gchar *private_key;
 	gchar *secret_key;
 	gchar *certificate;
-	lassoSignatureMethod signature_method;
+	LassoSignatureMethod signature_method;
 
 	/*< private >*/
 	LassoServerPrivate *private_data;
diff --git a/lasso/lasso.c b/lasso/lasso.c
index fa6ff4ee..6980194e 100644
--- a/lasso/lasso.c
+++ b/lasso/lasso.c
@@ -158,7 +158,7 @@ int lasso_shutdown()
  * 0 if it is not or a negative value if an error occurs.
  */
 int 
-lasso_check_version_ext(int major, int minor, int subminor, lassoCheckVersionMode mode)
+lasso_check_version_ext(int major, int minor, int subminor, LassoCheckVersionMode mode)
 {
 	/* we always want to have a match for major version number */
 	if (major != LASSO_VERSION_MAJOR) {
diff --git a/lasso/lasso.h b/lasso/lasso.h
index 5d0bcd43..4642ff00 100644
--- a/lasso/lasso.h
+++ b/lasso/lasso.h
@@ -50,7 +50,7 @@ LASSO_EXPORT int lasso_init(void);
 LASSO_EXPORT int lasso_shutdown(void);
 
 /**
- * lassoCheckVersionMode:
+ * LassoCheckVersionMode:
  * @LASSO_CHECK_VERSION_EXACT:		the version should match exactly.
  * @LASSO_CHECK_VERSIONABI_COMPATIBLE:	the version should be ABI compatible.
  *
@@ -59,7 +59,7 @@ LASSO_EXPORT int lasso_shutdown(void);
 typedef enum {
 	LASSO_CHECK_VERSION_EXACT = 0,
 	LASSO_CHECK_VERSIONABI_COMPATIBLE
-} lassoCheckVersionMode;
+} LassoCheckVersionMode;
 
 /**
  * lasso_check_version_exact:
@@ -87,7 +87,7 @@ typedef enum {
 LASSO_EXPORT int lasso_check_version_ext(int major,
 					 int minor,
 					 int subminor,
-					 lassoCheckVersionMode mode);
+					 LassoCheckVersionMode mode);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c
index 5dd7eb35..38426b41 100644
--- a/lasso/xml/lib_federation_termination_notification.c
+++ b/lasso/xml/lib_federation_termination_notification.c
@@ -227,7 +227,7 @@ lasso_lib_federation_termination_notification_new()
 LassoSamlpRequestAbstract*
 lasso_lib_federation_termination_notification_new_full(char *providerID,
 		LassoSamlNameIdentifier *nameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoSamlpRequestAbstract *request;
 
diff --git a/lasso/xml/lib_federation_termination_notification.h b/lasso/xml/lib_federation_termination_notification.h
index ddadfc86..8836c593 100644
--- a/lasso/xml/lib_federation_termination_notification.h
+++ b/lasso/xml/lib_federation_termination_notification.h
@@ -78,7 +78,7 @@ LASSO_EXPORT GType lasso_lib_federation_termination_notification_get_type(void);
 LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_federation_termination_notification_new(void);
 LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_federation_termination_notification_new_full(
 		char *providerID, LassoSamlNameIdentifier *nameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c
index 7f366b4e..38c44441 100644
--- a/lasso/xml/lib_logout_request.c
+++ b/lasso/xml/lib_logout_request.c
@@ -199,7 +199,7 @@ lasso_lib_logout_request_new()
  **/
 LassoSamlpRequestAbstract*
 lasso_lib_logout_request_new_full(char *providerID, LassoSamlNameIdentifier *nameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoSamlpRequestAbstract *request;
 
diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h
index 30f6ed1b..6232aeaf 100644
--- a/lasso/xml/lib_logout_request.h
+++ b/lasso/xml/lib_logout_request.h
@@ -73,7 +73,7 @@ LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_logout_request_new(void);
 
 LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_logout_request_new_full(
 		char *providerID, LassoSamlNameIdentifier *nameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c
index ed67db25..21bd2cb8 100644
--- a/lasso/xml/lib_logout_response.c
+++ b/lasso/xml/lib_logout_response.c
@@ -108,7 +108,7 @@ lasso_lib_logout_response_new()
 LassoSamlpResponseAbstract*
 lasso_lib_logout_response_new_full(char *providerID, const char *statusCodeValue,
 		LassoLibLogoutRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoLibStatusResponse *response;
 
diff --git a/lasso/xml/lib_logout_response.h b/lasso/xml/lib_logout_response.h
index 6de78e88..9b495b29 100644
--- a/lasso/xml/lib_logout_response.h
+++ b/lasso/xml/lib_logout_response.h
@@ -64,7 +64,7 @@ LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_logout_response_new(void);
 LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_logout_response_new_full(
 		char *providerID, const char *statusCodeValue,
 		LassoLibLogoutRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c
index e2c156c4..4d837666 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.c
+++ b/lasso/xml/lib_name_identifier_mapping_request.c
@@ -151,7 +151,7 @@ lasso_lib_name_identifier_mapping_request_new()
 LassoSamlpRequestAbstract*
 lasso_lib_name_identifier_mapping_request_new_full(char *providerID,
 		LassoSamlNameIdentifier *nameIdentifier, const char *targetNamespace,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoSamlpRequestAbstract *request;
 
diff --git a/lasso/xml/lib_name_identifier_mapping_request.h b/lasso/xml/lib_name_identifier_mapping_request.h
index 1dbd313c..4a059e73 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.h
+++ b/lasso/xml/lib_name_identifier_mapping_request.h
@@ -78,7 +78,7 @@ LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_name_identifier_mapping_reques
 LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_name_identifier_mapping_request_new_full(
 		char *providerID, LassoSamlNameIdentifier *nameIdentifier,
 		const char *targetNamespace,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c
index a16b782b..5e704a48 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.c
+++ b/lasso/xml/lib_name_identifier_mapping_response.c
@@ -139,7 +139,7 @@ lasso_lib_name_identifier_mapping_response_new()
 LassoSamlpResponseAbstract*
 lasso_lib_name_identifier_mapping_response_new_full(char *providerID, const char *statusCodeValue,
 		LassoLibNameIdentifierMappingRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoLibNameIdentifierMappingResponse *response;
 
diff --git a/lasso/xml/lib_name_identifier_mapping_response.h b/lasso/xml/lib_name_identifier_mapping_response.h
index 17a58292..74d50138 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.h
+++ b/lasso/xml/lib_name_identifier_mapping_response.h
@@ -79,7 +79,7 @@ LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_name_identifier_mapping_respo
 LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_name_identifier_mapping_response_new_full(
 		char *provideRID, const char *statusCodeValue,
 		LassoLibNameIdentifierMappingRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index 0fba37d6..234e7caa 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -229,7 +229,7 @@ lasso_lib_register_name_identifier_request_new_full(const char *providerID,
 		LassoSamlNameIdentifier *idpNameIdentifier,
 		LassoSamlNameIdentifier *spNameIdentifier,
 		LassoSamlNameIdentifier *oldNameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoLibRegisterNameIdentifierRequest *request;
 	LassoSamlpRequestAbstract *request_base;
diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h
index 6d8ca82a..9b071308 100644
--- a/lasso/xml/lib_register_name_identifier_request.h
+++ b/lasso/xml/lib_register_name_identifier_request.h
@@ -83,7 +83,7 @@ LASSO_EXPORT LassoSamlpRequestAbstract* lasso_lib_register_name_identifier_reque
 		LassoSamlNameIdentifier *idpNameIdentifier,
 		LassoSamlNameIdentifier *spNameIdentifier,
 		LassoSamlNameIdentifier *oldNameIdentifier,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c
index 8aa5c34e..c61d1d0c 100644
--- a/lasso/xml/lib_register_name_identifier_response.c
+++ b/lasso/xml/lib_register_name_identifier_response.c
@@ -111,7 +111,7 @@ lasso_lib_register_name_identifier_response_new()
 LassoSamlpResponseAbstract*
 lasso_lib_register_name_identifier_response_new_full(const char *providerID,
 		const char *statusCodeValue, LassoLibRegisterNameIdentifierRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method)
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method)
 {
 	LassoLibStatusResponse *response;
 	
diff --git a/lasso/xml/lib_register_name_identifier_response.h b/lasso/xml/lib_register_name_identifier_response.h
index d747419b..50db493d 100644
--- a/lasso/xml/lib_register_name_identifier_response.h
+++ b/lasso/xml/lib_register_name_identifier_response.h
@@ -66,7 +66,7 @@ LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_register_name_identifier_resp
 LASSO_EXPORT LassoSamlpResponseAbstract* lasso_lib_register_name_identifier_response_new_full(
 		const char *providerID, const char *statusCodeValue,
 		LassoLibRegisterNameIdentifierRequest *request,
-		lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+		LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/private.h b/lasso/xml/private.h
index 29bca258..46f47658 100644
--- a/lasso/xml/private.h
+++ b/lasso/xml/private.h
@@ -88,21 +88,20 @@ typedef enum {
 	LASSO_PEM_FILE_TYPE_PUB_KEY,
 	LASSO_PEM_FILE_TYPE_PRIVATE_KEY,
 	LASSO_PEM_FILE_TYPE_CERT
-} lassoPemFileType;
+} LassoPemFileType;
 
 void  lasso_build_random_sequence(char *buffer, unsigned int size);
 char* lasso_build_unique_id(unsigned int size);
 char* lasso_get_current_time(void);
-lassoPemFileType lasso_get_pem_file_type(const char *file);
+LassoPemFileType lasso_get_pem_file_type(const char *file);
 
 xmlSecKey* lasso_get_public_key_from_pem_cert_file(const char *file);
 xmlSecKeysMngr* lasso_load_certs_from_pem_certs_chain_file (const char *file);
 
 xmlChar* lasso_query_sign(xmlChar *query,
-   lassoSignatureMethod sign_method, const char *private_key_file);
+		LassoSignatureMethod sign_method, const char *private_key_file);
 
-int lasso_query_verify_signature(
-   const char *query, const char *sender_public_key_file);
+int lasso_query_verify_signature(const char *query, const char *sender_public_key_file);
 
 char* lasso_sha1(const char *str);
 
diff --git a/lasso/xml/saml_assertion.h b/lasso/xml/saml_assertion.h
index c5330eb6..3bf15859 100644
--- a/lasso/xml/saml_assertion.h
+++ b/lasso/xml/saml_assertion.h
@@ -78,8 +78,8 @@ struct _LassoSamlAssertion {
 	char *IssueInstant;
 
 	/* ds:Signature stuff */
-	lassoSignatureType sign_type;
-	lassoSignatureMethod sign_method;
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
 	char *private_key_file;
 	char *certificate_file;
 };
diff --git a/lasso/xml/samlp_request_abstract.h b/lasso/xml/samlp_request_abstract.h
index e24688a9..9425d5a1 100644
--- a/lasso/xml/samlp_request_abstract.h
+++ b/lasso/xml/samlp_request_abstract.h
@@ -66,8 +66,8 @@ struct _LassoSamlpRequestAbstract {
 	char *IssueInstant;
 
 	/* ds:Signature stuffs */
-	lassoSignatureType sign_type;
-	lassoSignatureMethod sign_method;
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
 	char *private_key_file;
 	char *certificate_file;
 };
diff --git a/lasso/xml/samlp_response_abstract.h b/lasso/xml/samlp_response_abstract.h
index 62b0e76b..96428bdf 100644
--- a/lasso/xml/samlp_response_abstract.h
+++ b/lasso/xml/samlp_response_abstract.h
@@ -68,8 +68,8 @@ struct _LassoSamlpResponseAbstract {
 	char *Recipient;
 
 	/* ds:Signature stuffs */
-	lassoSignatureType sign_type;
-	lassoSignatureMethod sign_method;
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
 	char *private_key_file;
 	char *certificate_file;
 };
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index befa7841..57d52923 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -128,13 +128,13 @@ lasso_get_current_time()
  * 
  * Return value: the pem file type
  **/
-lassoPemFileType
+LassoPemFileType
 lasso_get_pem_file_type(const char *pem_file)
 {
 	BIO* bio;
 	EVP_PKEY *pkey;
 	X509 *cert;
-	lassoPemFileType type = LASSO_PEM_FILE_TYPE_UNKNOWN;
+	LassoPemFileType type = LASSO_PEM_FILE_TYPE_UNKNOWN;
 
 	g_return_val_if_fail(pem_file != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
 
@@ -303,7 +303,7 @@ lasso_load_certs_from_pem_certs_chain_file(const char* pem_certs_chain_file)
  * Return value: a newly allocated query signed or NULL if an error occurs.
  **/
 xmlChar*
-lasso_query_sign(xmlChar *query, lassoSignatureMethod sign_method, const char *private_key_file)
+lasso_query_sign(xmlChar *query, LassoSignatureMethod sign_method, const char *private_key_file)
 {
 	BIO *bio = NULL;
 	xmlChar *digest = NULL; /* 160 bit buffer */
@@ -419,7 +419,7 @@ lasso_query_verify_signature(const char *query, const char *sender_public_key_fi
 	RSA *rsa = NULL;
 	DSA *dsa = NULL;
 	gchar **str_split = NULL;
-	lassoSignatureMethod  sign_method;
+	LassoSignatureMethod  sign_method;
 	xmlChar *digest = NULL, *b64_signature = NULL;
 	xmlChar *e_rsa_alg = NULL, *e_dsa_alg = NULL;
 	xmlSecByte *signature = NULL;
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index dda87dbc..b976988e 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -173,7 +173,7 @@ lasso_node_export_to_base64(LassoNode *node)
  **/
 char*
 lasso_node_export_to_query(LassoNode *node,
-		lassoSignatureMethod sign_method, const char *private_key_file)
+		LassoSignatureMethod sign_method, const char *private_key_file)
 {
 	char *unsigned_query, *query;
 
@@ -949,8 +949,8 @@ void lasso_node_add_signature_template(LassoNode *node, xmlNode *xmlnode,
 		struct XmlSnippet *snippet_signature)
 {
 	LassoNodeClass *klass = LASSO_NODE_GET_CLASS(node);
-	lassoSignatureType sign_type;
-	lassoSignatureType sign_method;
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
 	xmlNode *signature = NULL, *reference, *key_info;
 	char *uri;
 	char *id;
@@ -965,10 +965,10 @@ void lasso_node_add_signature_template(LassoNode *node, xmlNode *xmlnode,
 		return;
 
 	sign_type = G_STRUCT_MEMBER(
-			lassoSignatureType, node,
+			LassoSignatureType, node,
 			klass->node_data->sign_type_offset);
 	sign_method = G_STRUCT_MEMBER(
-			lassoSignatureType, node,
+			LassoSignatureMethod, node,
 			klass->node_data->sign_method_offset);
 
 	if (sign_type == LASSO_SIGNATURE_TYPE_NONE)
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index 88fb7132..b9c55bdb 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -63,12 +63,12 @@ typedef enum {
 	LASSO_SIGNATURE_TYPE_NONE = 0,
 	LASSO_SIGNATURE_TYPE_SIMPLE,
 	LASSO_SIGNATURE_TYPE_WITHX509
-} lassoSignatureType;
+} LassoSignatureType;
 
 typedef enum {
 	LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,
 	LASSO_SIGNATURE_METHOD_DSA_SHA1
-} lassoSignatureMethod;
+} LassoSignatureMethod;
 
 typedef struct _LassoNode LassoNode;
 typedef struct _LassoNodeClass LassoNodeClass;
@@ -104,7 +104,7 @@ LASSO_EXPORT char* lasso_node_dump(LassoNode *node, const char *encoding, int fo
 LASSO_EXPORT char* lasso_node_export_to_base64(LassoNode *node);
 
 LASSO_EXPORT char* lasso_node_export_to_query(LassoNode *node,
-		lassoSignatureMethod  sign_method, const char *private_key_file);
+		LassoSignatureMethod sign_method, const char *private_key_file);
 
 LASSO_EXPORT char* lasso_node_export_to_soap(LassoNode *node);
 
diff --git a/swig/Lasso.i b/swig/Lasso.i
index a0e53103..a2a09013 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -253,7 +253,7 @@ typedef enum {
 	LASSO_HTTP_METHOD_POST,
 	LASSO_HTTP_METHOD_REDIRECT,
 	LASSO_HTTP_METHOD_SOAP
-} lassoHttpMethod;
+} LassoHttpMethod;
 
 /* Consent */
 #ifndef SWIGPHP4
@@ -323,7 +323,7 @@ typedef enum {
 typedef enum {
 	LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART = 1,
 	LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST,
-} lassoLoginProtocolProfile;
+} LassoLoginProtocolProfile;
 
 /* MessageType */
 #ifndef SWIGPHP4
@@ -341,7 +341,7 @@ typedef enum {
 	LASSO_MESSAGE_TYPE_REQUEST,
 	LASSO_MESSAGE_TYPE_RESPONSE,
 	LASSO_MESSAGE_TYPE_ARTIFACT
-} lassoMessageType;
+} LassoMessageType;
 
 /* ProviderRole */
 #ifndef SWIGPHP4
@@ -373,7 +373,7 @@ typedef enum {
 	LASSO_REQUEST_TYPE_NAME_REGISTRATION = 4,
 	LASSO_REQUEST_TYPE_NAME_IDENTIFIER_MAPPING = 5,
 	LASSO_REQUEST_TYPE_LECP = 6
-} lassoRequestType;
+} LassoRequestType;
 
 /* SamlAuthenticationMethod */
 #ifndef SWIGPHP4
@@ -409,7 +409,7 @@ typedef enum {
 typedef enum {
 	LASSO_SIGNATURE_METHOD_RSA_SHA1 = 1,
 	LASSO_SIGNATURE_METHOD_DSA_SHA1
-} lassoSignatureMethod;
+} LassoSignatureMethod;
 
 
 /***********************************************************************
@@ -749,8 +749,8 @@ typedef struct {
 
 	char *certificate_file;
 	char *private_key_file;
-	lassoSignatureType sign_type;
-	lassoSignatureMethod sign_method;
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
 } LassoSamlAssertion;
 %extend LassoSamlAssertion {
 	/* Attributes */
@@ -1068,8 +1068,8 @@ typedef struct {
 
 /* 	char *certificate_file; */
 /* 	char *private_key_file; */
-/* 	lassoSignatureType sign_type; */
-/* 	lassoSignatureMethod sign_method; */
+/* 	LassoSignatureType sign_type; */
+/* 	LassoSignatureMethod sign_method; */
 
 	/* Constructor, Destructor & Static Methods */
 
@@ -1282,7 +1282,7 @@ typedef struct {
 
 	LassoLibFederationTerminationNotification(
 			char *providerID, LassoSamlNameIdentifier *nameIdentifier,
-			lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+			LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 	~LassoLibFederationTerminationNotification();
 
@@ -1341,7 +1341,7 @@ typedef struct {
 
 	LassoLibLogoutRequest(
 			char *providerID, LassoSamlNameIdentifier *nameIdentifier,
-			lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+			LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 	~LassoLibLogoutRequest();
 
@@ -1396,7 +1396,7 @@ typedef struct {
 	LassoLibLogoutResponse(
 			char *providerID, const char *statusCodeValue,
 			LassoLibLogoutRequest *request,
-			lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+			LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 	~LassoLibLogoutResponse();
 
@@ -1469,7 +1469,7 @@ typedef struct {
 			LassoSamlNameIdentifier *idpNameIdentifier,
 			LassoSamlNameIdentifier *spNameIdentifier,
 			LassoSamlNameIdentifier *oldNameIdentifier,
-			lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+			LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 	~LassoLibRegisterNameIdentifierRequest();
 
@@ -1536,7 +1536,7 @@ typedef struct {
 	LassoLibRegisterNameIdentifierResponse(
 			char *providerID, char *statusCodeValue,
 			LassoLibRegisterNameIdentifierRequest *request,
-			lassoSignatureType sign_type, lassoSignatureMethod sign_method);
+			LassoSignatureType sign_type, LassoSignatureMethod sign_method);
 
 	~LassoLibRegisterNameIdentifierResponse();
 
@@ -1956,7 +1956,7 @@ LassoStringArray *LassoSession_providerIds_get(LassoSession *self) {
 #else
 %rename(getRequestTypeFromSoapMsg) lasso_profile_get_request_type_from_soap_msg;
 #endif
-lassoRequestType lasso_profile_get_request_type_from_soap_msg(char *soap);
+LassoRequestType lasso_profile_get_request_type_from_soap_msg(char *soap);
 
 #ifdef SWIGPHP4
 %rename(lasso_isLibertyQuery) lasso_profile_is_liberty_query;
@@ -2032,7 +2032,7 @@ typedef struct {
 
 	THROW_ERROR
 	void initNotification(char *remoteProviderId = NULL,
-			      lassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
+			      LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
 	END_THROW_ERROR
 
 	THROW_ERROR
@@ -2140,7 +2140,7 @@ typedef struct {
 	char *assertionArtifact;
 
 	%immutable protocolProfile;
-	lassoLoginProtocolProfile protocolProfile;
+	LassoLoginProtocolProfile protocolProfile;
 
 	%extend {
 		/* Attributes inherited from LassoProfile */
@@ -2211,7 +2211,7 @@ typedef struct {
 		END_THROW_ERROR
 
 		THROW_ERROR
-		void buildArtifactMsg(lassoHttpMethod httpMethod);
+		void buildArtifactMsg(LassoHttpMethod httpMethod);
 		END_THROW_ERROR
 
 		THROW_ERROR
@@ -2241,12 +2241,12 @@ typedef struct {
 
 		THROW_ERROR
 		void initAuthnRequest(char *remoteProviderId = NULL,
-				 lassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
+				 LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
 		END_THROW_ERROR
 
 		THROW_ERROR
 		void initRequest(char *responseMsg,
-				 lassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
+				 LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_REDIRECT);
 		END_THROW_ERROR
 
 		THROW_ERROR
@@ -2497,7 +2497,7 @@ typedef struct {
 
 		THROW_ERROR
 		void initRequest(char *remoteProviderId = NULL,
-				 lassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
+				 LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
 		END_THROW_ERROR
 
 		THROW_ERROR
@@ -3110,7 +3110,7 @@ typedef struct {
 
 		THROW_ERROR
 		void initRequest(char *remoteProviderId,
-				lassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
+				LassoHttpMethod httpMethod = LASSO_HTTP_METHOD_ANY);
 		END_THROW_ERROR
 
 		THROW_ERROR