renamed ProfileService to DataService

10 files changed, 100 insertions, 99 deletions

diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index 1b6286e7..1d704a9c 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -61,8 +61,9 @@ liblasso_la_LIBADD = \
 # Just make damn sure the ABI stays the same between
 # upgrades.
 # Obviously if you don't, fixing the situation up again can be painful. 
-liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ \
-	-export-symbols symbols.sym
+liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ 
+
+#-export-symbols symbols.sym
 endif
 
 .PHONY: types.c symbols.sym
diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h
index b7714244..1ff7fdbf 100644
--- a/lasso/id-ff/providerprivate.h
+++ b/lasso/id-ff/providerprivate.h
@@ -39,7 +39,7 @@ gboolean lasso_provider_load_metadata(LassoProvider *provider, const gchar *meta
 int lasso_provider_verify_signature(LassoProvider *provider,
 		const char *message, const char *id_attr_name, LassoMessageFormat format);
 LibertyConformanceLevel lasso_provider_compatibility_level(LassoProvider *provider);
-void lasso_provider_load_public_key(LassoProvider *provider);
+gboolean lasso_provider_load_public_key(LassoProvider *provider);
 
 
 #ifdef __cplusplus
diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am
index 3510cc59..43d4a392 100644
--- a/lasso/id-wsf/Makefile.am
+++ b/lasso/id-wsf/Makefile.am
@@ -13,11 +13,11 @@ WSF_C_FILES = \
 	discovery.c \
 	interaction_profile_service.c \
 	personal_profile_service.c \
-	profile_service.c \
+	data_service.c \
 	wsf_profile.c	
 
 lasso_private_h_sources = \
-	profile_service_private.h
+	data_service_private.h
 
 WSF_H_FILES = \
 	authentication.h \
@@ -25,7 +25,7 @@ WSF_H_FILES = \
 	identity.h \
 	interaction_profile_service.h \
 	personal_profile_service.h \
-	profile_service.h \
+	data_service.h \
 	wsf_profile.h
 endif
 
diff --git a/lasso/id-wsf/profile_service.c b/lasso/id-wsf/data_service.c
index a0301649..17232e39 100644
--- a/lasso/id-wsf/profile_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -26,8 +26,8 @@
 #include <libxml/xpathInternals.h>
 
 #include <lasso/id-wsf/discovery.h>
-#include <lasso/id-wsf/profile_service.h>
-#include <lasso/id-wsf/profile_service_private.h>
+#include <lasso/id-wsf/data_service.h>
+#include <lasso/id-wsf/data_service_private.h>
 #include <lasso/xml/dst_query.h>
 #include <lasso/xml/dst_query_response.h>
 #include <lasso/xml/dst_modify.h>
@@ -35,7 +35,7 @@
 #include <lasso/xml/soap_binding_correlation.h>
 
 
-struct _LassoProfileServicePrivate
+struct _LassoDataServicePrivate
 {
 	gboolean dispose_has_run;
 	LassoDiscoResourceOffering *offering;
@@ -47,7 +47,7 @@ struct _LassoProfileServicePrivate
 
 
 LassoDstModification*
-lasso_profile_service_add_modification(LassoProfileService *service, const gchar *select)
+lasso_data_service_add_modification(LassoDataService *service, const gchar *select)
 {
 	LassoWsfProfile *profile;
 	LassoDstModification *modification;
@@ -66,8 +66,8 @@ lasso_profile_service_add_modification(LassoProfileService *service, const gchar
 
 
 /**
- * lasso_profile_service_add_query_item:
- * @service: a #LassoProfileService
+ * lasso_data_service_add_query_item:
+ * @service: a #LassoDataService
  * @select: resource selection string (typically a XPath query)
  * @item_id: query item identifier
  *
@@ -78,7 +78,7 @@ lasso_profile_service_add_modification(LassoProfileService *service, const gchar
  *       be freed by the caller.
  **/
 LassoDstQueryItem*
-lasso_profile_service_add_query_item(LassoProfileService *service,
+lasso_data_service_add_query_item(LassoDataService *service,
 		const char *select, const char *item_id)
 {
 	LassoDstQuery *query;
@@ -101,8 +101,8 @@ lasso_profile_service_add_query_item(LassoProfileService *service,
 }
 
 /**
- * lasso_profile_service_init_query
- * @service: a #LassoProfileService
+ * lasso_data_service_init_query
+ * @service: a #LassoDataService
  * @select: resource selection string (typically a XPath query)
  * @item_id: query item identifier (optional)
  *
@@ -112,7 +112,7 @@ lasso_profile_service_add_query_item(LassoProfileService *service,
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_profile_service_init_query(LassoProfileService *service, const char *select,
+lasso_data_service_init_query(LassoDataService *service, const char *select,
 	const char *item_id)
 {
 	LassoWsfProfile *profile;
@@ -163,8 +163,8 @@ lasso_profile_service_init_query(LassoProfileService *service, const char *selec
 }
 
 /**
- * lasso_profile_service_process_query_msg:
- * @service: a #LassoProfileService
+ * lasso_data_service_process_query_msg:
+ * @service: a #LassoDataService
  * @message: the dst query message
  *
  * Processes a dst:Query message.  Rebuilds a request object from the message
@@ -173,7 +173,7 @@ lasso_profile_service_init_query(LassoProfileService *service, const char *selec
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_profile_service_process_query_msg(LassoProfileService *service, const char *message)
+lasso_data_service_process_query_msg(LassoDataService *service, const char *message)
 {
 	LassoDstQuery *query;
 	LassoWsfProfile *profile;
@@ -198,15 +198,15 @@ lasso_profile_service_process_query_msg(LassoProfileService *service, const char
 }
 
 /**
- * lasso_profile_service_build_response_msg:
- * @service: a #LassoProfileService
+ * lasso_data_service_build_response_msg:
+ * @service: a #LassoDataService
  *
  * Builds a dst:QueryResponse message.
  *
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_profile_service_build_response_msg(LassoProfileService *service)
+lasso_data_service_build_response_msg(LassoDataService *service)
 {
 	LassoWsfProfile *profile;
 	LassoDstQuery *query;
@@ -259,8 +259,8 @@ lasso_profile_service_build_response_msg(LassoProfileService *service)
 }
 
 /**
- * lasso_profile_service_get_answer:
- * @service: a #LassoProfileService
+ * lasso_data_service_get_answer:
+ * @service: a #LassoDataService
  * @select: resource selection string (typically a XPath query)
  * 
  * Returns the answer for the specified @select request.
@@ -269,7 +269,7 @@ lasso_profile_service_build_response_msg(LassoProfileService *service)
  *      This xmlnode must be freed by caller.
  **/
 xmlNode*
-lasso_profile_service_get_answer(LassoProfileService *service, const char *select)
+lasso_data_service_get_answer(LassoDataService *service, const char *select)
 {
 	LassoDstQueryResponse *response;
 	LassoDstData *data = NULL;
@@ -328,8 +328,8 @@ lasso_profile_service_get_answer(LassoProfileService *service, const char *selec
 }
 
 /**
- * lasso_profile_service_process_query_response_msg:
- * @service: a #LassoProfileService
+ * lasso_data_service_process_query_response_msg:
+ * @service: a #LassoDataService
  * @message: the dst query response message
  *
  * Processes a dst:Query message.  Rebuilds a request object from the message
@@ -338,7 +338,7 @@ lasso_profile_service_get_answer(LassoProfileService *service, const char *selec
  * Return value: 0 on success; or a negative value otherwise.
  **/
 gint
-lasso_profile_service_process_query_response_msg(LassoProfileService *service, const char *message)
+lasso_data_service_process_query_response_msg(LassoDataService *service, const char *message)
 {
 	int rc;
 	LassoDstQueryResponse *response;
@@ -355,7 +355,7 @@ lasso_profile_service_process_query_response_msg(LassoProfileService *service, c
 
 
 gint
-lasso_profile_service_init_modify(LassoProfileService *service, const gchar *select)
+lasso_data_service_init_modify(LassoDataService *service, const gchar *select)
 {
 	LassoDstModification *modification;
 	LassoWsfProfile *profile;
@@ -415,7 +415,7 @@ lasso_profile_service_init_modify(LassoProfileService *service, const gchar *sel
 
 
 gint
-lasso_profile_service_process_modify_msg(LassoProfileService *service, const gchar *modify_soap_msg)
+lasso_data_service_process_modify_msg(LassoDataService *service, const gchar *modify_soap_msg)
 {
 	LassoDstModify *modify;
 	LassoWsfProfile *profile;
@@ -439,7 +439,7 @@ lasso_profile_service_process_modify_msg(LassoProfileService *service, const gch
 	return 0;}
 
 gint
-lasso_profile_service_process_modify_response_msg(LassoProfileService *service,
+lasso_data_service_process_modify_response_msg(LassoDataService *service,
 	const gchar *soap_msg)
 {
 	LassoDstModifyResponse *response;
@@ -465,7 +465,7 @@ lasso_profile_service_process_modify_response_msg(LassoProfileService *service,
 static LassoNodeClass *parent_class = NULL;
 
 void
-lasso_profile_service_set_offering(LassoProfileService *service,
+lasso_data_service_set_offering(LassoDataService *service,
 		LassoDiscoResourceOffering *offering)
 {
 	service->private_data->offering = g_object_ref(offering);
@@ -478,7 +478,7 @@ lasso_profile_service_set_offering(LassoProfileService *service,
 static void
 dispose(GObject *object)
 {
-	LassoProfileService *service = LASSO_PROFILE_SERVICE(object);
+	LassoDataService *service = LASSO_DATA_SERVICE(object);
 
 	if (service->private_data->dispose_has_run == TRUE)
 		return;
@@ -490,7 +490,7 @@ dispose(GObject *object)
 static void
 finalize(GObject *object)
 { 
-	LassoProfileService *service = LASSO_PROFILE_SERVICE(object);
+	LassoDataService *service = LASSO_DATA_SERVICE(object);
 	if (service->private_data->offering) {
 		lasso_node_destroy(LASSO_NODE(service->private_data->offering));
 		service->private_data->offering = NULL;
@@ -506,14 +506,14 @@ finalize(GObject *object)
 /*****************************************************************************/
 
 static void
-instance_init(LassoProfileService *service)
+instance_init(LassoDataService *service)
 {
 	service->resource_data = NULL;
-	service->private_data = g_new0(LassoProfileServicePrivate, 1);
+	service->private_data = g_new0(LassoDataServicePrivate, 1);
 }
 
 static void
-class_init(LassoProfileServiceClass *klass)
+class_init(LassoDataServiceClass *klass)
 {
 	parent_class = g_type_class_peek_parent(klass);
 	
@@ -522,43 +522,43 @@ class_init(LassoProfileServiceClass *klass)
 }
 
 GType
-lasso_profile_service_get_type()
+lasso_data_service_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof(LassoProfileServiceClass),
+			sizeof(LassoDataServiceClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoProfileService),
+			sizeof(LassoDataService),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
-				"LassoProfileService", &this_info, 0);
+				"LassoDataService", &this_info, 0);
 	}
 	return this_type;
 }
 
 
 /**
- * lasso_profile_service_new:
+ * lasso_data_service_new:
  * @server: the #LassoServer
  *
- * Creates a new #LassoProfileService.
+ * Creates a new #LassoDataService.
  *
- * Return value: a newly created #LassoProfileService object; or NULL if an
+ * Return value: a newly created #LassoDataService object; or NULL if an
  *      error occured.
  **/
-LassoProfileService*
-lasso_profile_service_new(LassoServer *server)
+LassoDataService*
+lasso_data_service_new(LassoServer *server)
 {
-	LassoProfileService *service;
+	LassoDataService *service;
 
 	g_return_val_if_fail(LASSO_IS_SERVER(server) == TRUE, NULL);
 
@@ -568,12 +568,12 @@ lasso_profile_service_new(LassoServer *server)
 	return service;
 }
 
-LassoProfileService*
-lasso_profile_service_new_full(LassoServer *server, LassoDiscoResourceOffering *offering)
+LassoDataService*
+lasso_data_service_new_full(LassoServer *server, LassoDiscoResourceOffering *offering)
 {
-	LassoProfileService *service;
+	LassoDataService *service;
 
-	service = lasso_profile_service_new(server);
+	service = lasso_data_service_new(server);
 	if (service == NULL)
 		return NULL;
 
diff --git a/lasso/id-wsf/profile_service.h b/lasso/id-wsf/data_service.h
index d0768efb..ec6789a0 100644
--- a/lasso/id-wsf/profile_service.h
+++ b/lasso/id-wsf/data_service.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_PROFILE_SERVICE_H__
-#define __LASSO_PROFILE_SERVICE_H__
+#ifndef __LASSO_DATA_SERVICE_H__
+#define __LASSO_DATA_SERVICE_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,23 +39,23 @@ extern "C" {
 #include <lasso/xml/disco_resource_offering.h>
 #include <lasso/xml/xml.h>
 
-#define LASSO_TYPE_PROFILE_SERVICE (lasso_profile_service_get_type())
-#define LASSO_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-       LASSO_TYPE_PROFILE_SERVICE, LassoProfileService))
-#define LASSO_PROFILE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-       LASSO_TYPE_PROFILE_SERVICE, LassoProfileServiceClass))
+#define LASSO_TYPE_PROFILE_SERVICE (lasso_data_service_get_type())
+#define LASSO_DATA_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+       LASSO_TYPE_PROFILE_SERVICE, LassoDataService))
+#define LASSO_DATA_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+       LASSO_TYPE_PROFILE_SERVICE, LassoDataServiceClass))
 #define LASSO_IS_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
        LASSO_TYPE_PROFILE_SERVICE))
 #define LASSO_IS_PROFILE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
        LASSO_TYPE_PROFILE_SERVICE))
-#define LASSO_PROFILE_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-       LASSO_TYPE_PROFILE_SERVICE, LassoProfileServiceClass)) 
+#define LASSO_DATA_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
+       LASSO_TYPE_PROFILE_SERVICE, LassoDataServiceClass)) 
 
-typedef struct _LassoProfileService LassoProfileService;
-typedef struct _LassoProfileServiceClass LassoProfileServiceClass;
-typedef struct _LassoProfileServicePrivate LassoProfileServicePrivate;
+typedef struct _LassoDataService LassoDataService;
+typedef struct _LassoDataServiceClass LassoDataServiceClass;
+typedef struct _LassoDataServicePrivate LassoDataServicePrivate;
 
-struct _LassoProfileService {
+struct _LassoDataService {
 	LassoWsfProfile parent;
 
 	LassoDiscoResourceID *resource_id;
@@ -63,52 +63,52 @@ struct _LassoProfileService {
 	xmlNode *resource_data;
 
 	/*< private >*/
-	LassoProfileServicePrivate *private_data;
+	LassoDataServicePrivate *private_data;
 };
 
-struct _LassoProfileServiceClass {
+struct _LassoDataServiceClass {
 	LassoWsfProfileClass parent;
 };
 
 
-LASSO_EXPORT GType lasso_profile_service_get_type(void);
+LASSO_EXPORT GType lasso_data_service_get_type(void);
 
-LASSO_EXPORT LassoProfileService* lasso_profile_service_new(LassoServer *server);
+LASSO_EXPORT LassoDataService* lasso_data_service_new(LassoServer *server);
 
-LASSO_EXPORT LassoProfileService* lasso_profile_service_new_full(LassoServer *server,
+LASSO_EXPORT LassoDataService* lasso_data_service_new_full(LassoServer *server,
 	LassoDiscoResourceOffering *offering);
 
-LASSO_EXPORT gint lasso_profile_service_init_query(LassoProfileService *service,
+LASSO_EXPORT gint lasso_data_service_init_query(LassoDataService *service,
 	const char *select, const char *item_id);
 
-LASSO_EXPORT LassoDstQueryItem* lasso_profile_service_add_query_item(LassoProfileService *service,
+LASSO_EXPORT LassoDstQueryItem* lasso_data_service_add_query_item(LassoDataService *service,
 	const char *select, const char *item_id);
 
-LASSO_EXPORT gint lasso_profile_service_process_query_msg(LassoProfileService *service,
+LASSO_EXPORT gint lasso_data_service_process_query_msg(LassoDataService *service,
 	const char *message);
 	
-LASSO_EXPORT gint lasso_profile_service_build_response_msg(LassoProfileService *service);
+LASSO_EXPORT gint lasso_data_service_build_response_msg(LassoDataService *service);
 
-LASSO_EXPORT gint lasso_profile_service_process_query_response_msg(LassoProfileService *service,
+LASSO_EXPORT gint lasso_data_service_process_query_response_msg(LassoDataService *service,
 	const char *message);
 
-LASSO_EXPORT xmlNode* lasso_profile_service_get_answer(LassoProfileService *service,
+LASSO_EXPORT xmlNode* lasso_data_service_get_answer(LassoDataService *service,
 	const char *select);
 
-LASSO_EXPORT  gint lasso_profile_service_init_modify(LassoProfileService *service,
+LASSO_EXPORT  gint lasso_data_service_init_modify(LassoDataService *service,
 	const gchar *select);
 
-LASSO_EXPORT LassoDstModification* lasso_profile_service_add_modification(
-	LassoProfileService *service, const gchar *select);
+LASSO_EXPORT LassoDstModification* lasso_data_service_add_modification(
+	LassoDataService *service, const gchar *select);
 
-LASSO_EXPORT gint lasso_profile_service_process_modify_msg(LassoProfileService *service,
+LASSO_EXPORT gint lasso_data_service_process_modify_msg(LassoDataService *service,
 	const gchar *soap_msg);
 
-LASSO_EXPORT gint lasso_profile_service_process_modify_response_msg(LassoProfileService *service,
+LASSO_EXPORT gint lasso_data_service_process_modify_response_msg(LassoDataService *service,
 	const gchar *soap_msg);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_PROFILE_SERVICE_H__ */
+#endif /* __LASSO_DATA_SERVICE_H__ */
diff --git a/lasso/id-wsf/profile_service_private.h b/lasso/id-wsf/data_service_private.h
index b429a5a0..ef2ccc95 100644
--- a/lasso/id-wsf/profile_service_private.h
+++ b/lasso/id-wsf/data_service_private.h
@@ -22,19 +22,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_PROFILE_SERVICE_PRIVATE_H__
-#define __LASSO_PROFILE_SERVICE_PRIVATE_H__
+#ifndef __LASSO_DATA_SERVICE_PRIVATE_H__
+#define __LASSO_DATA_SERVICE_PRIVATE_H__
 
 #ifdef __cplusplus
 extern "C" {
 
 #endif /* __cplusplus */ 
 
-void lasso_profile_service_set_offering(LassoProfileService *service,
+void lasso_data_service_set_offering(LassoDataService *service,
 		LassoDiscoResourceOffering *offering);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_PROFILE_SERVICE_PRIVATE_H__ */
+#endif /* __LASSO_DATA_SERVICE_PRIVATE_H__ */
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index c896266d..a4c4459f 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -28,7 +28,7 @@
 #include <lasso/xml/saml_attribute_value.h>
 #include <lasso/xml/disco_modify.h>
 #include <lasso/id-wsf/identity.h>
-#include <lasso/id-wsf/profile_service.h>
+#include <lasso/id-wsf/data_service.h>
 #include <lasso/id-wsf/personal_profile_service.h>
 
 struct _LassoDiscoveryPrivate
@@ -664,19 +664,19 @@ lasso_discovery_process_query_response_msg(LassoDiscovery *discovery, const gcha
  * @discovery: a #LassoDiscovery
  * @service_type: the requested service type
  *
- * After a disco:query message, creates a #LassoProfileService instance for the
+ * After a disco:query message, creates a #LassoDataService instance for the
  * requested @service_type.
  *
  * Return value: a newly created #LAssoProfileService object; or NULL if an
  *     error occured.
  **/
-LassoProfileService*
+LassoDataService*
 lasso_discovery_get_service(LassoDiscovery *discovery, const char *service_type)
 {
 	LassoDiscoQueryResponse *response;
 	GList *iter;
 	LassoDiscoResourceOffering *offering = NULL;
-	LassoProfileService *service;
+	LassoDataService *service;
 
 	response = LASSO_DISCO_QUERY_RESPONSE(LASSO_WSF_PROFILE(discovery)->response);
 	iter = response->ResourceOffering;
@@ -702,10 +702,10 @@ lasso_discovery_get_service(LassoDiscovery *discovery, const char *service_type)
 	}
 
 	if (strcmp(offering->ServiceInstance->ServiceType, LASSO_PP_HREF) == 0) {
-		service = LASSO_PROFILE_SERVICE(lasso_personal_profile_service_new(
+		service = LASSO_DATA_SERVICE(lasso_personal_profile_service_new(
 					LASSO_WSF_PROFILE(discovery)->server, offering));
 	} else {
-		service = lasso_profile_service_new_full(LASSO_WSF_PROFILE(discovery)->server,
+		service = lasso_data_service_new_full(LASSO_WSF_PROFILE(discovery)->server,
 				offering);
 	}
 
diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h
index 9642e1fc..7eb4872c 100644
--- a/lasso/id-wsf/discovery.h
+++ b/lasso/id-wsf/discovery.h
@@ -39,7 +39,7 @@ extern "C" {
 #include <lasso/xml/disco_requested_service_type.h>
 
 #include <lasso/id-wsf/wsf_profile.h>
-#include <lasso/id-wsf/profile_service.h>
+#include <lasso/id-wsf/data_service.h>
 
 #define LASSO_TYPE_DISCOVERY (lasso_discovery_get_type())
 #define LASSO_DISCOVERY(obj) \
@@ -118,7 +118,7 @@ LASSO_EXPORT gint lasso_discovery_process_query_msg(LassoDiscovery *discovery,
 LASSO_EXPORT gint lasso_discovery_process_query_response_msg(LassoDiscovery *discovery,
 							     const gchar *message);
 
-LASSO_EXPORT LassoProfileService* lasso_discovery_get_service(LassoDiscovery *discovery,
+LASSO_EXPORT LassoDataService* lasso_discovery_get_service(LassoDiscovery *discovery,
 		const char *service_type);
 
 LASSO_EXPORT LassoDiscoDescription* lasso_discovery_get_description_auto(
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index febf68d4..ec9ad820 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -23,7 +23,7 @@
  */
 
 #include <lasso/id-wsf/personal_profile_service.h>
-#include <lasso/id-wsf/profile_service_private.h>
+#include <lasso/id-wsf/data_service_private.h>
 
 
 /*****************************************************************************/
@@ -39,7 +39,7 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service)
 
 	g_return_val_if_fail(LASSO_IS_PERSONAL_PROFILE_SERVICE(service) == TRUE, NULL);
 
-	xmlnode = lasso_profile_service_get_answer(LASSO_PROFILE_SERVICE(service),
+	xmlnode = lasso_data_service_get_answer(LASSO_DATA_SERVICE(service),
 			"/pp:PP/pp:MsgContact");
 
 	child = xmlnode->children;
@@ -123,7 +123,7 @@ lasso_personal_profile_service_new(LassoServer *server, LassoDiscoResourceOfferi
 	g_return_val_if_fail(LASSO_IS_SERVER(server) == TRUE, NULL);
 
 	service = g_object_new(LASSO_TYPE_PERSONAL_PROFILE_SERVICE, NULL);
-	lasso_profile_service_set_offering(LASSO_PROFILE_SERVICE(service), offering);
+	lasso_data_service_set_offering(LASSO_DATA_SERVICE(service), offering);
 
 	return service;
 }
diff --git a/lasso/id-wsf/personal_profile_service.h b/lasso/id-wsf/personal_profile_service.h
index eda7fbf7..f01575ef 100644
--- a/lasso/id-wsf/personal_profile_service.h
+++ b/lasso/id-wsf/personal_profile_service.h
@@ -30,7 +30,7 @@ extern "C" {
 
 #endif /* __cplusplus */ 
 
-#include <lasso/id-wsf/profile_service.h>
+#include <lasso/id-wsf/data_service.h>
 #include <lasso/xml/disco_resource_id.h>
 #include <lasso/xml/disco_encrypted_resource_id.h>
 #include <lasso/xml/dst_data.h>
@@ -55,11 +55,11 @@ typedef struct _LassoPersonalProfileServiceClass LassoPersonalProfileServiceClas
 typedef struct _LassoPersonalProfileServicePrivate LassoPersonalProfileServicePrivate;
 
 struct _LassoPersonalProfileService {
-	LassoProfileService parent;
+	LassoDataService parent;
 };
 
 struct _LassoPersonalProfileServiceClass {
-	LassoProfileServiceClass parent;
+	LassoDataServiceClass parent;
 };