diff --git a/src/configuration.hpp b/src/configuration.hpp
index fd4ab93..40285e0 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -128,15 +128,13 @@
    */
   boost::optional<std::vector<std::shared_ptr<security::v2::Certificate>>> m_redirection;
   /**
-   * NameAssignmentFunc Callback function
-   */
-  NameAssignmentFunc m_nameAssignmentFunc;
-  /**
    * StatusUpdate Callback function
    */
   StatusUpdateCallback m_statusUpdateCallback;
-
-  std::vector<std::unique_ptr<NameAssignmentFuncFactory>> m_heuristic;
+  /**
+   * Name Assignment Functions
+   */
+  std::vector<std::unique_ptr<NameAssignmentFunc>> m_nameAssignmentFuncs;
 };
 
 /**