@@ -131,7 +131,7 @@ conversation make_conversation (pam_handle *expected_handle,

         PAM_SUCCESS

     };

     pam pam (share (new fake_pam (expected_handle, conversation_data)));

-    return create_conversation (pam);

+    return conversation::create (pam);

 }

@@ -188,7 +188,7 @@ int returns_empty_user_and_token_when_pam_cant_create_conversation()

 {

     // given

     pam pam (share (new fake_pam (PAM_SERVICE_ERR)));

-    conversation conversation = create_conversation (pam);

+    conversation conversation = conversation::create (pam);

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

     // when

@@ -212,7 +212,7 @@ int returns_empty_user_and_token_when_conversation_fails()

         PAM_SERVICE_ERR

     };

     pam pam (share (new fake_pam (0, conversation_data)));

-    conversation conversation = create_conversation (pam);

+    conversation conversation = conversation::create (pam);

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

     //when

@@ -239,7 +239,7 @@ int returns_empty_user_and_token_when_conversation_answer_fails()

         PAM_SUCCESS

     };

     pam pam (share (new fake_pam (0, conversation_data)));

-    conversation conversation = create_conversation (pam);

+    conversation conversation = conversation::create (pam);

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

     //when

@@ -67,7 +67,7 @@ bool validator_validates()

             fake_user_token_supplier (token)));

     std::string user_name = "msmith";

     directory directory (share (new fake_directory (user_name)));

-    validator validator = create_validator (directory, user_token_supplier);

+    validator validator = validator::create (directory, user_token_supplier);

     // when

     bool actual = validator.validate (user_name, token);

@@ -85,7 +85,7 @@ bool validator_fails_unknown_user()

     user_token_supplier user_token_supplier (share (new

             fake_user_token_supplier));

     directory directory (share (new fake_directory));

-    validator validator = create_validator (directory, user_token_supplier);

+    validator validator = validator::create (directory, user_token_supplier);

     // when

     bool actual = validator.validate ("notuser", token);

@@ -103,7 +103,7 @@ bool validator_fails_incorrect_token()

             fake_user_token_supplier));

     std::string user_name = "msmith";

     directory directory (share (new fake_directory (user_name)));

-    validator validator = create_validator (directory, user_token_supplier);

+    validator validator = validator::create (directory, user_token_supplier);

     // when

     bool actual = validator.validate (user_name, "token");