--- a/tests/CMakeLists.txt	Fri Dec 01 21:34:21 2017 +0100
+++ b/tests/CMakeLists.txt	Mon Dec 04 13:49:51 2017 +0100
@@ -20,54 +20,52 @@
 project(tests)
 
 if (WITH_TESTS)
-    add_subdirectory(cmd-plugin-config)
-    add_subdirectory(cmd-plugin-info)
-    add_subdirectory(cmd-plugin-list)
-    add_subdirectory(cmd-plugin-load)
-    add_subdirectory(cmd-plugin-reload)
-    add_subdirectory(cmd-plugin-unload)
-    add_subdirectory(cmd-rule-add)
-    add_subdirectory(cmd-rule-edit)
-    add_subdirectory(cmd-rule-info)
-    add_subdirectory(cmd-rule-list)
-    add_subdirectory(cmd-rule-move)
-    add_subdirectory(cmd-rule-remove)
-    add_subdirectory(cmd-server-connect)
-    add_subdirectory(cmd-server-disconnect)
-    add_subdirectory(cmd-server-info)
-    add_subdirectory(cmd-server-invite)
-    add_subdirectory(cmd-server-join)
-    add_subdirectory(cmd-server-kick)
-    add_subdirectory(cmd-server-list)
-    add_subdirectory(cmd-server-me)
-    add_subdirectory(cmd-server-message)
-    add_subdirectory(cmd-server-mode)
-    add_subdirectory(cmd-server-nick)
-    add_subdirectory(cmd-server-notice)
-    add_subdirectory(cmd-server-part)
-    add_subdirectory(cmd-server-reconnect)
-    add_subdirectory(cmd-server-topic)
-#    add_subdirectory(dynlib_plugin)
+    add_subdirectory(plugin-config-command)
+    add_subdirectory(plugin-info-command)
+    add_subdirectory(plugin-list-command)
+    add_subdirectory(plugin-load-command)
+    add_subdirectory(plugin-reload-command)
+    add_subdirectory(plugin-unload-command)
+    add_subdirectory(rule-add-command)
+    add_subdirectory(rule-edit-command)
+    add_subdirectory(rule-info-command)
+    add_subdirectory(rule-list-command)
+    add_subdirectory(rule-move-command)
+    add_subdirectory(rule-remove-command)
+    add_subdirectory(server-connect-command)
+    add_subdirectory(server-disconnect-command)
+    add_subdirectory(server-info-command)
+    add_subdirectory(server-invite-command)
+    add_subdirectory(server-join-command)
+    add_subdirectory(server-kick-command)
+    add_subdirectory(server-list-command)
+    add_subdirectory(server-me-command)
+    add_subdirectory(server-message-command)
+    add_subdirectory(server-mode-command)
+    add_subdirectory(server-nick-command)
+    add_subdirectory(server-notice-command)
+    add_subdirectory(server-part-command)
+    add_subdirectory(server-reconnect-command)
+    add_subdirectory(server-topic-command)
 
     add_subdirectory(irc)
     add_subdirectory(logger)
     add_subdirectory(rules)
     add_subdirectory(util)
 
-    # JS API
     if (HAVE_JS)
-        # Javascript plugin object.
         add_subdirectory(js-plugin)
 
-        add_subdirectory(js-elapsedtimer)
-        add_subdirectory(js-directory)
-        add_subdirectory(js-file)
-        add_subdirectory(js-irccd)
-        add_subdirectory(js-logger)
-        add_subdirectory(js-system)
-        add_subdirectory(js-timer)
-        add_subdirectory(js-unicode)
-        add_subdirectory(js-util)
+        add_subdirectory(elapsedtimer-jsapi)
+        add_subdirectory(directory-jsapi)
+        add_subdirectory(file-jsapi)
+        add_subdirectory(irccd-jsapi)
+        add_subdirectory(logger-jsapi)
+        add_subdirectory(system-jsapi)
+        add_subdirectory(timer-jsapi)
+        add_subdirectory(unicode-jsapi)
+        add_subdirectory(util-jsapi)
+
         add_subdirectory(plugin-ask)
         add_subdirectory(plugin-auth)
         add_subdirectory(plugin-hangman)