--- a/tests/js-elapsedtimer/main.cpp	Fri Aug 11 13:45:42 2017 +0200
+++ b/tests/js-elapsedtimer/main.cpp	Tue Sep 26 17:18:47 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * main.cpp -- test Irccd.ElapsedTimer API
+ * main.cpp -- test irccd.ElapsedTimer API
  *
  * Copyright (c) 2013-2017 David Demelier <markand@malikania.fr>
  *
@@ -21,9 +21,9 @@
 #include <thread>
 
 #include <irccd/irccd.hpp>
-#include <irccd/mod-irccd.hpp>
-#include <irccd/mod-elapsed-timer.hpp>
-#include <irccd/plugin-js.hpp>
+#include <irccd/js_irccd_module.hpp>
+#include <irccd/js_elapsed_timer_module.hpp>
+#include <irccd/js_plugin.hpp>
 #include <irccd/service.hpp>
 
 using namespace irccd;
@@ -31,14 +31,14 @@
 
 class TestElapsedTimer : public testing::Test {
 protected:
-    Irccd m_irccd;
-    std::shared_ptr<JsPlugin> m_plugin;
+    irccd::irccd m_irccd;
+    std::shared_ptr<js_plugin> m_plugin;
 
     TestElapsedTimer()
-        : m_plugin(std::make_shared<JsPlugin>("empty", SOURCEDIR "/empty.js"))
+        : m_plugin(std::make_shared<js_plugin>("empty", SOURCEDIR "/empty.js"))
     {
-        IrccdModule().load(m_irccd, m_plugin);
-        ElapsedTimerModule().load(m_irccd, m_plugin);
+        js_irccd_module().load(m_irccd, m_plugin);
+        js_elapsed_timer_module().load(m_irccd, m_plugin);
     }
 };