@@ -38,7 +38,7 @@ private:

     conversation conversation_;

     validator validator_;

     logger logger_;

-    session session_;

+    sessions sessions_;

 public:

     impl (const dual_control_configuration &configuration);

     int authenticate (const pam_request &request);

@@ -59,9 +59,9 @@ int impl::authenticate (const pam_request &request)

 {

     conversation_result input (conversation_.initiate (request));

-    session_.user_name(request);

+    sessions_.user_name(request);

-    auto requester_user_name = session_.user_name(request);

+    auto requester_user_name = sessions_.user_name(request);

     int auth_result = validator_.validate ("anyone", input.user_name,

                                            input.token) ? PAM_SUCCESS : PAM_AUTH_ERR;

@@ -7,7 +7,7 @@

 namespace

 {

-class impl : public session_ifc {

+class impl : public sessions_ifc {

     private:

         pam pam_;

     public:

@@ -21,6 +21,6 @@ class impl : public session_ifc {

 }

-session session::create(const pam &pam) {

-    return session(std::make_shared<impl>(pam));

+sessions sessions::create(const pam &pam) {

+    return sessions(std::make_shared<impl>(pam));

 }

@@ -6,23 +6,23 @@

 #include "request.h"

 #include "sys_pam.h"

-class session_ifc {

+class sessions_ifc {

     public:

-        virtual ~session_ifc () {}

+        virtual ~sessions_ifc () {}

         virtual std::string user_name (const pam_request &request)  const {

             return "";

         }

 };

-class session {

+class sessions {

     private:

-        std::shared_ptr<session_ifc> delegate_;

+        std::shared_ptr<sessions_ifc> delegate_;

     public:

-        session(std::shared_ptr<session_ifc> delegate = std::make_shared<session_ifc>()) : delegate_(delegate) {}

+        sessions(std::shared_ptr<sessions_ifc> delegate = std::make_shared<sessions_ifc>()) : delegate_(delegate) {}

         std::string user_name (const pam_request &request) const {

             return delegate_->user_name(request);

         }

-        static session create(const pam &pam);

+        static sessions create(const pam &pam);

 };

 #endif

@@ -21,11 +21,11 @@ int gets_user_from_pam() {

     //given

     std::string user_name("user");

     pam fake_sys_pam(std::make_shared<fake_sys_pam>(user_name));

-    session session(session::create(fake_sys_pam));

+    sessions sessions(sessions::create(fake_sys_pam));

     pam_request request(0, 0, 0, 0);

     //when

-    std::string actual = session.user_name(request);

+    std::string actual = sessions.user_name(request);

     //

     //then