2 files changed, 30 insertions, 30 deletions

diff --git a/python/environs/py_profile_context.c b/python/environs/py_profile.c
index 96e06dcc..ec07b9a6 100644
--- a/python/environs/py_profile_context.c
+++ b/python/environs/py_profile.c
@@ -24,11 +24,11 @@
  */
 
 #include "../lassomod.h"
-#include "py_profile_context.h"
+#include "py_profile.h"
 #include "py_user.h"
 #include "py_server.h"
 
-PyObject *LassoProfileContext_wrap(LassoProfileContext *ctx) {
+PyObject *LassoProfile_wrap(LassoProfile *ctx) {
   PyObject *ret;
 
   if (ctx == NULL) {
@@ -36,37 +36,37 @@ PyObject *LassoProfileContext_wrap(LassoProfileContext *ctx) {
     return (Py_None);
   }
   ret = PyCObject_FromVoidPtrAndDesc((void *) ctx,
-                                     (char *) "LassoProfileContext *", NULL);
+                                     (char *) "LassoProfile *", NULL);
   return (ret);
 }
 
 /******************************************************************************/
 
-PyObject *profile_context_get_request_type_from_soap_msg(PyObject *self, PyObject *args) {
+PyObject *profile_get_request_type_from_soap_msg(PyObject *self, PyObject *args) {
   gchar *soap_buffer;
   gint   type;
 
-  if (CheckArgs(args, "S:profile_context_get_request_type_from_soap_msg")) {
-    if(!PyArg_ParseTuple(args, (char *) "s:profile_context_get_request_type_from_soap_msg",
+  if (CheckArgs(args, "S:profile_get_request_type_from_soap_msg")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:profile_get_request_type_from_soap_msg",
 			 &soap_buffer))
       return NULL;
   }
   else return NULL;
 
-  type = lasso_profile_context_get_request_type_from_soap_msg(soap_buffer);
+  type = lasso_profile_get_request_type_from_soap_msg(soap_buffer);
 
   return(int_wrap(type));
 }
 
 /******************************************************************************/
 
-PyObject *profile_context_new(PyObject *self, PyObject *args) {
+PyObject *profile_new(PyObject *self, PyObject *args) {
   PyObject *server_obj, *user_obj;
-  LassoProfileContext *ctx;
+  LassoProfile *ctx;
   LassoUser   *user = NULL;
 
-  if (CheckArgs(args, "Oo:profile_context_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "O|O:profile_context_new",
+  if (CheckArgs(args, "Oo:profile_new")) {
+    if(!PyArg_ParseTuple(args, (char *) "O|O:profile_new",
 			 &server_obj, &user_obj))
       return NULL;
   }
@@ -75,26 +75,26 @@ PyObject *profile_context_new(PyObject *self, PyObject *args) {
   if (user_obj != Py_None) {
     user = LassoUser_get(user_obj);
   }
-  ctx = lasso_profile_context_new(LassoServer_get(server_obj),
-				  user);
+  ctx = lasso_profile_new(LassoServer_get(server_obj),
+			  user);
 
-  return (LassoProfileContext_wrap(ctx));
+  return (LassoProfile_wrap(ctx));
 }
 
-PyObject *profile_context_set_user_from_dump(PyObject *self, PyObject *args) {
+PyObject *profile_set_user_from_dump(PyObject *self, PyObject *args) {
   PyObject *ctx_obj;
   gchar *dump;
   gint   ret;
 
-  if (CheckArgs(args, "OS:profile_context_set_user_from_dump")) {
-    if(!PyArg_ParseTuple(args, (char *) "Os:profile_context_set_user_from_dump",
+  if (CheckArgs(args, "OS:profile_set_user_from_dump")) {
+    if(!PyArg_ParseTuple(args, (char *) "Os:profile_set_user_from_dump",
 			 &ctx_obj, &dump))
       return NULL;
   }
   else return NULL;
 
-  ret = lasso_profile_context_set_user_from_dump(LassoProfileContext_get(ctx_obj),
-						 dump);
+  ret = lasso_profile_set_user_from_dump(LassoProfile_get(ctx_obj),
+					 dump);
 
   return(int_wrap(ret));
 }
diff --git a/python/environs/py_profile_context.h b/python/environs/py_profile.h
index 9583aa00..7e985dd2 100644
--- a/python/environs/py_profile_context.h
+++ b/python/environs/py_profile.h
@@ -23,24 +23,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __PYLASSO_PY_PROFILE_CONTEXT_H__
-#define __PYLASSO_PY_PROFILE_CONTEXT_H__
+#ifndef __PYLASSO_PY_PROFILE_H__
+#define __PYLASSO_PY_PROFILE_H__
 
-#include <lasso/environs/profile_context.h>
+#include <lasso/environs/profile.h>
 
 typedef struct {
     PyObject_HEAD
-    LassoProfileContext *obj;
-} LassoProfileContext_object;
+    LassoProfile *obj;
+} LassoProfile_object;
 
-#define LassoProfileContext_get(v) (((v) == Py_None) ? NULL : (((LassoProfileContext_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
-PyObject *LassoProfileContext_wrap(LassoProfileContext *ctx);
+#define LassoProfile_get(v) (((v) == Py_None) ? NULL : (((LassoProfile_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
+PyObject *LassoProfile_wrap(LassoProfile *ctx);
 
-PyObject *profile_context_get_request_type_from_soap_msg(PyObject *self, PyObject *args);
+PyObject *profile_get_request_type_from_soap_msg(PyObject *self, PyObject *args);
 
-PyObject *profile_context_new(PyObject *self, PyObject *args);
-PyObject *profile_context_set_user_from_dump(PyObject *self, PyObject *args);
+PyObject *profile_new(PyObject *self, PyObject *args);
+PyObject *profile_set_user_from_dump(PyObject *self, PyObject *args);
 
-#endif /* __PYLASSO_PY_PROFILE_CONTEXT_H__ */
+#endif /* __PYLASSO_PY_PROFILE_H__ */