2 files changed, 17 insertions, 11 deletions

diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index ac565552..0382b1b3 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -95,6 +95,7 @@ PyObject *logout_build_response_msg(PyObject *self, PyObject *args) {
 PyObject *logout_init_request(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gchar    *remote_providerID;
+  gint      codeError;
 
   if (CheckArgs(args, "OS:logout_init_request")) {
     if(!PyArg_ParseTuple(args, (char *) "Os:logout_init_request",
@@ -103,41 +104,43 @@ PyObject *logout_init_request(PyObject *self, PyObject *args) {
   }
   else return NULL;
 
-  codeError = logout_init_request(LassoLogout_get(logout_obj), remote_providerID);
+  codeError = lasso_logout_init_request(LassoLogout_get(logout_obj), remote_providerID);
 
   return(int_wrap(codeError));
 }
 
-PyObject *logout_handle_request(PyObject *self, PyObject *args) {
+PyObject *logout_handle_request_msg(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gchar    *request_msg;
   gint      request_method;
+  gint      codeError;
 
-  if (CheckArgs(args, "OSI:logout_handle_request")) {
-    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_handle_request",
+  if (CheckArgs(args, "OSI:logout_handle_request_msg")) {
+    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_handle_request_msg",
 			 &logout_obj, &request_msg, &request_method))
       return NULL;
   }
   else return NULL;
 
-  codeError = logout_init_request(LassoLogout_get(logout_obj), request_msg, request_method);
+  codeError = lasso_logout_handle_request_msg(LassoLogout_get(logout_obj), request_msg, request_method);
 
   return(int_wrap(codeError));
 }
 
-PyObject *logout_handle_response(PyObject *self, PyObject *args) {
+PyObject *logout_handle_response_msg(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gchar    *response_msg;
   gint      response_method;
+  gint      codeError;
 
-  if (CheckArgs(args, "OSI:logout_handle_response")) {
-    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_handle_response",
+  if (CheckArgs(args, "OSI:logout_handle_response_msg")) {
+    if(!PyArg_ParseTuple(args, (char *) "Osi:logout_handle_response_msg",
 			 &logout_obj, &response_msg, &response_method))
       return NULL;
   }
   else return NULL;
 
-  codeError = logout_init_request(LassoLogout_get(logout_obj), response_msg, response_method);
+  codeError = lasso_logout_handle_response_msg(LassoLogout_get(logout_obj), response_msg, response_method);
 
   return(int_wrap(codeError));
 }
diff --git a/python/environs/py_logout.h b/python/environs/py_logout.h
index 9bd8e5b6..20806913 100644
--- a/python/environs/py_logout.h
+++ b/python/environs/py_logout.h
@@ -28,6 +28,9 @@
 
 #include <lasso/environs/logout.h>
 
+#include "py_server.h"
+#include "py_user.h"
+
 typedef struct {
     PyObject_HEAD
     LassoLogout *obj;
@@ -40,7 +43,7 @@ PyObject *logout_new(PyObject *self, PyObject *args);
 PyObject *logout_build_request_msg(PyObject *self, PyObject *args);
 PyObject *logout_build_response_msg(PyObject *self, PyObject *args);
 PyObject *logout_init_request(PyObject *self, PyObject *args);
-PyObject *logout_handle_request(PyObject *self, PyObject *args)
-PyObject *logout_handle_response(PyObject *self, PyObject *args);
+PyObject *logout_handle_request_msg(PyObject *self, PyObject *args);
+PyObject *logout_handle_response_msg(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_LOGOUT_H__ */