diff --git a/adls/src/adls_client.cpp b/adls/src/adls_client.cpp
index 9ace2a2..0ef631f 100644
--- a/adls/src/adls_client.cpp
+++ b/adls/src/adls_client.cpp
@@ -111,7 +111,7 @@ namespace azure { namespace storage_adls {
 
     list_filesystems_result adls_client::list_filesystems_segmented(const std::string& prefix, const std::string& continuation_token, const int max_results)
     {
-        auto containers_segment = blob_client_adaptor<azure::storage_lite::list_constainers_segmented_response>(std::bind(&azure::storage_lite::blob_client::list_containers_segmented, m_blob_client, prefix, continuation_token, max_results, false));
+        auto containers_segment = blob_client_adaptor<azure::storage_lite::list_containers_segmented_response>(std::bind(&azure::storage_lite::blob_client::list_containers_segmented, m_blob_client, prefix, continuation_token, max_results, false));
 
         list_filesystems_result result;
         for (const auto& container_item : containers_segment.containers)
diff --git a/include/blob/blob_client.h b/include/blob/blob_client.h
index 7b93a25..6837943 100644
--- a/include/blob/blob_client.h
+++ b/include/blob/blob_client.h
@@ -197,7 +197,7 @@ namespace azure { namespace storage_lite {
         /// <param name="prefix">The container name prefix.</param>
         /// <param name="include_metadata">A bool value, return metadatas if it is true.</param>
         /// <returns>A <see cref="std::future" /> object that represents the current operation.</returns>
-        AZURE_STORAGE_API std::future<storage_outcome<list_constainers_segmented_response>> list_containers_segmented(const std::string &prefix, const std::string& continuation_token, const int max_result = 5, bool include_metadata = false);
+        AZURE_STORAGE_API std::future<storage_outcome<list_containers_segmented_response>> list_containers_segmented(const std::string &prefix, const std::string& continuation_token, const int max_result = 5, bool include_metadata = false);
 
         /// <summary>
         /// Intitiates an asynchronous operation  to list blobs in segments.
diff --git a/include/list_containers_request_base.h b/include/list_containers_request_base.h
index 7533f41..50276d8 100644
--- a/include/list_containers_request_base.h
+++ b/include/list_containers_request_base.h
@@ -34,7 +34,7 @@ namespace azure {  namespace storage_lite {
         lease_duration duration;
     };
 
-    class list_constainers_segmented_response
+    class list_containers_segmented_response
     {
     public:
         std::string ms_request_id;
diff --git a/include/tinyxml2_parser.h b/include/tinyxml2_parser.h
index 45a40c2..59b7d03 100644
--- a/include/tinyxml2_parser.h
+++ b/include/tinyxml2_parser.h
@@ -14,7 +14,7 @@ namespace azure {  namespace storage_lite {
     public:
         AZURE_STORAGE_API storage_error parse_storage_error(const std::string &xml) const override;
 
-        AZURE_STORAGE_API list_constainers_segmented_response parse_list_constainers_segmented_response(const std::string &xml) const override;
+        AZURE_STORAGE_API list_containers_segmented_response parse_list_containers_segmented_response(const std::string &xml) const override;
 
         AZURE_STORAGE_API list_blobs_response parse_list_blobs_response(const std::string &xml) const override;
 
diff --git a/include/xml_parser_base.h b/include/xml_parser_base.h
index 318c46f..aac76fa 100644
--- a/include/xml_parser_base.h
+++ b/include/xml_parser_base.h
@@ -21,7 +21,7 @@ namespace azure {  namespace storage_lite {
         template<typename RESPONSE_TYPE>
         RESPONSE_TYPE parse_response(const std::string &) const { return RESPONSE_TYPE();  }
 
-        virtual list_constainers_segmented_response parse_list_constainers_segmented_response(const std::string &xml) const = 0;
+        virtual list_containers_segmented_response parse_list_containers_segmented_response(const std::string &xml) const = 0;
 
         virtual list_blobs_response parse_list_blobs_response(const std::string &xml) const = 0;
 
@@ -33,9 +33,9 @@ namespace azure {  namespace storage_lite {
     };
 
     template<>
-    inline list_constainers_segmented_response xml_parser_base::parse_response<list_constainers_segmented_response>(const std::string &xml) const
+    inline list_containers_segmented_response xml_parser_base::parse_response<list_containers_segmented_response>(const std::string &xml) const
     {
-        return parse_list_constainers_segmented_response(xml);
+        return parse_list_containers_segmented_response(xml);
     }
 
     template<>
diff --git a/src/blob/blob_client.cpp b/src/blob/blob_client.cpp
index 0419266..0da84ea 100644
--- a/src/blob/blob_client.cpp
+++ b/src/blob/blob_client.cpp
@@ -407,7 +407,7 @@ std::future<storage_outcome<void>> blob_client::set_container_metadata(const std
     return async_executor<void>::submit(m_account, request, http, m_context);
 }
 
-std::future<storage_outcome<list_constainers_segmented_response>> blob_client::list_containers_segmented(const std::string &prefix, const std::string& continuation_token, const int max_result, bool include_metadata)
+std::future<storage_outcome<list_containers_segmented_response>> blob_client::list_containers_segmented(const std::string &prefix, const std::string& continuation_token, const int max_result, bool include_metadata)
 {
     auto http = m_client->get_handle();
 
@@ -415,7 +415,7 @@ std::future<storage_outcome<list_constainers_segmented_response>> blob_client::l
     request->set_maxresults(max_result);
     request->set_marker(continuation_token);
 
-    return async_executor<list_constainers_segmented_response>::submit(m_account, request, http, m_context);
+    return async_executor<list_containers_segmented_response>::submit(m_account, request, http, m_context);
 }
 
 std::future<storage_outcome<list_blobs_segmented_response>> blob_client::list_blobs_segmented(const std::string &container, const std::string &delimiter, const std::string &continuation_token, const std::string &prefix, int max_results)
diff --git a/src/tinyxml2_parser.cpp b/src/tinyxml2_parser.cpp
index 11a4658..ceac712 100644
--- a/src/tinyxml2_parser.cpp
+++ b/src/tinyxml2_parser.cpp
@@ -61,9 +61,9 @@ list_containers_item tinyxml2_parser::parse_list_containers_item(tinyxml2::XMLEl
     return item;
 }
 
-list_constainers_segmented_response tinyxml2_parser::parse_list_constainers_segmented_response(const std::string &xml) const
+list_containers_segmented_response tinyxml2_parser::parse_list_containers_segmented_response(const std::string &xml) const
 {
-    list_constainers_segmented_response response;
+    list_containers_segmented_response response;
 
     tinyxml2::XMLDocument xdoc;
     if (xdoc.Parse(xml.data(), xml.size()) == tinyxml2::XML_SUCCESS)