Merge lp:~eday/scalestack/style-updates into lp:~registry/scalestack/old-trunk

[Eric Day]

No functionality changes, just renaming. Not perfect yet, but wanted to get the bulk done in one pass then we can go back and touch up each module in smaller patches while doing another review. Need to develop some practices on variable naming so types != variable names, not really happy with the conventions used so far.

=== modified file '.bzrignore'
--- .bzrignore	2010-04-29 07:39:49 +0000
+++ .bzrignore	2010-06-03 05:01:22 +0000
@@ -35,8 +35,8 @@
 m4/ltversion.m4
 m4/lt~obsolete.m4
 bin/scalestack
-ScaleStack/Common/Macros.h
-ScaleStack/Kernel/Test/Core
-ScaleStack/Kernel/Test/Module
-ScaleStack/Kernel/Test/Option
-ScaleStack/**/Test/Run
+scalestack/common/macros.h
+scalestack/kernel/test/core
+scalestack/kernel/test/module
+scalestack/kernel/test/option
+scalestack/**/test/run

=== modified file 'Makefile.am'
--- Makefile.am	2010-04-30 03:54:30 +0000
+++ Makefile.am	2010-06-03 05:01:22 +0000
@@ -22,7 +22,7 @@
 pkgplugin_LTLIBRARIES =
 CLEANFILES =
 EXTRA_DIST = \
-	docs/Doxyfile \
+	docs/doxyfile \
 	docs/header.html.in \
 	test_run.sh
 
@@ -33,30 +33,30 @@
 lib_LTLIBRARIES += libscalestack.la
 
 libscalestack_la_SOURCES = \
-	ScaleStack/Common/Exception.cc \
-	ScaleStack/Common/Notification.cc \
-	ScaleStack/Kernel/Core.cc \
-	ScaleStack/Kernel/LogConsole.cc \
-	ScaleStack/Kernel/Module.cc \
-	ScaleStack/Kernel/Option.cc
+	scalestack/common/exception.cc \
+	scalestack/common/notification.cc \
+	scalestack/kernel/core.cc \
+	scalestack/kernel/log_console.cc \
+	scalestack/kernel/module.cc \
+	scalestack/kernel/option.cc
 
 nobase_include_HEADERS += \
-	ScaleStack/Common/DeletePointer.h \
-	ScaleStack/Common/Exception.h \
-	ScaleStack/Common/Notification.h \
-	ScaleStack/Kernel/Core.h \
-	ScaleStack/Kernel/Log.h \
-	ScaleStack/Kernel/LogConsole.h \
-	ScaleStack/Kernel/LogMessage.h \
-	ScaleStack/Kernel/Module.h \
-	ScaleStack/Kernel/Option.h \
-	ScaleStack/Kernel/Service.h
+	scalestack/common/delete_pointer.h \
+	scalestack/common/exception.h \
+	scalestack/common/notification.h \
+	scalestack/kernel/core.h \
+	scalestack/kernel/log.h \
+	scalestack/kernel/log_console.h \
+	scalestack/kernel/log_message.h \
+	scalestack/kernel/module.h \
+	scalestack/kernel/option.h \
+	scalestack/kernel/service.h
 
 noinst_HEADERS += \
-	ScaleStack/Common/Test.h
+	scalestack/common/test.h
 
-nobase_nodist_include_HEADERS = ScaleStack/Common/Macros.h
-EXTRA_DIST += ScaleStack/Common/Macros.h.in
+nobase_nodist_include_HEADERS = scalestack/common/macros.h
+EXTRA_DIST += scalestack/common/macros.h.in
 
 libscalestack_la_CXXFLAGS = \
 	$(AM_CXXFLAGS) \
@@ -68,9 +68,9 @@
 libscalestack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBSCALESTACK_VERSION)
 
 check_PROGRAMS += \
-	ScaleStack/Kernel/Test/Core \
-	ScaleStack/Kernel/Test/Module \
-	ScaleStack/Kernel/Test/Option
+	scalestack/kernel/test/core \
+	scalestack/kernel/test/module \
+	scalestack/kernel/test/option
 
 #
 # Simple scalestack application
@@ -116,7 +116,7 @@
 	@cat ${top_srcdir}/README >> docs/mainpage.h
 	@echo "</pre>" >> docs/mainpage.h
 	@echo "*/" >> docs/mainpage.h
-	${DOXYGEN} ${top_srcdir}/docs/Doxyfile
+	${DOXYGEN} ${top_srcdir}/docs/doxyfile
 	@rm docs/mainpage.h
 
 lcov: lcov-clean check
@@ -125,9 +125,9 @@
 	@echo "Make sure ./configure was run with '--enable-coverage'"
 	@echo "------------------------------------------------------"
 	@echo
-	cd ScaleStack && lcov --directory . --base-directory .. --capture --output-file lcov.out
-	cd ScaleStack && lcov --directory . --base-directory .. --extract lcov.out `pwd`/\* --output-file lcov_extract.out
-	genhtml -o lcov -t ScaleStack ScaleStack/lcov_extract.out
+	cd scalestack && lcov --directory . --base-directory .. --capture --output-file lcov.out
+	cd scalestack && lcov --directory . --base-directory .. --extract lcov.out `pwd`/\* --output-file lcov_extract.out
+	genhtml -o lcov -t scalestack scalestack/lcov_extract.out
 
 lcov-clean: clean
 	find . -name '*.gcno' -exec rm {} \;

=== modified file 'README'
--- README	2010-04-30 03:54:30 +0000
+++ README	2010-06-03 05:01:22 +0000
@@ -75,7 +75,7 @@
 any new files). Once you think you have something ready to share, push
 your branch back up to Launchpad (which requires a Launchpad account).
 
-bzr add NewModule
+bzr add new_module
 bzr commit -m "Comment describing my changes"
 bzr push lp:~johndoe/scalestack/my-changes
 
@@ -85,12 +85,12 @@
 
 https://code.launchpad.net/scalestack
 
-If you would like to add new modules, please do so in the ScaleStack
+If you would like to add new modules, please do so in the scalestack
 directory. The C++ namespace is directly translated to path names
 there, so you'll find all code in that directory. Look around at the
 other modules for examples on how to do so, but the minimum needed
-is a plugin.ini and ModuleName.cc file. Reading the documentation in
-ScaleStack/Kernel/Module.h may be helpful as well.
+is a plugin.ini and <module name>.cc file. Reading the documentation
+in scalestack/kernel/module.h may be helpful as well.
 
 
 Coding Style Guidelines
@@ -107,35 +107,32 @@
 * Comments should follow Doxygen style formatting. See existing code
   for examples.
 
-* Opening curly braces should appear on their own line. The one
-  exception to this is when defining namespaces, then it must appear
-  on the same line.
+* Opening curly braces should appear on their own line.
 
 * C++ exceptions are allowed if they derive from std::exception. Most
-  exception throwing is hidden behind logFatal messages, which throw
-  ScaleStack::Common::Exception and contains custom messages. Use of
-  this through module.logFatal() in modules is preferred.
-
-* Public method names should be camelCase starting with lower.
-
-* Private method names should be _camelCase starting with underscore
-  and lower.
-
-* Data members should always be private, start with an underscore,
-  and are all lowercase with underscores, such as _log_level. The
-  leading underscores help to easily differentiate the class members
-  from local method variables. Some data members may under the
-  protected section so derived classes can also access them.
-
-* Header files should be ordered by system and then ScaleStack headers,
-  with a empty line in between. Each set should be ordered
+  exception throwing is hidden behind log_fatal messages, which throw
+  scalestack::common::exception and contains custom messages. Use of
+  this through module.log_fatal() in modules is preferred.
+
+* All namespaces, classes, methods, and data members must be all
+  lowercase and use '_' to separate words (like the C++ STL).
+
+* Private method names should start with an underscore.
+
+* Data members should always be private and start with an underscore.
+  The leading underscores help to easily differentiate the class
+  members from local method variables. Some data members may be under
+  the protected section so derived classes can also access them.
+
+* Header files should be ordered by system and then Scale Stack
+  headers, with a empty line in between. Each set should be ordered
   alphabetically as well. The "config.h" include must be the first
   include for every non-header file, and should NEVER appear in any
   header files.
 
 * You should only use 'using namespace ...;' in source files, never in
   header files. In source files, only specify 'using namespace std;'
-  and 'using namespace ScaleStack;'. Beyond that, please write out
+  and 'using namespace scalestack;'. Beyond that, please write out
   the full namespace for objects.
 
 * In general, do the most consistent thing given the existing code

=== modified file 'bin/scalestack.cc'
--- bin/scalestack.cc	2010-04-30 03:54:30 +0000
+++ bin/scalestack.cc	2010-06-03 05:01:22 +0000
@@ -10,27 +10,27 @@
 
 /**
  * @file
- * @brief Basic application to run generic Scale Stack instance.
+ * @brief Basic application to run a generic Scale Stack instance.
  */
 
 #include <exception>
 #include <iostream>
 
-#include <ScaleStack/Kernel/Core.h>
+#include <scalestack/kernel/core.h>
 
 int main(int argc, const char* argv[])
 {
-  ScaleStack::Kernel::Core core;
+  scalestack::kernel::core core;
 
   try
   {
-    /* We use libevent as the default Event service. */
-    core.addModuleOptionValue("Event::Service", "", "Event::Libevent");
+    /* We use libevent as the default event service. */
+    core.add_module_option_value("event::service", "", "event::libevent");
 
     /* The first argv entry is the execution filename, so skip it. */
-    core.parseArguments(argc - 1, argv + 1);
+    core.parse_arguments(argc - 1, argv + 1);
 
-    core.setSignalHandlers();
+    core.set_signal_handlers();
     core.run();
   }
   catch (std::exception& e)

=== modified file 'config/pandora-plugin.ini'
--- config/pandora-plugin.ini	2010-05-01 01:14:47 +0000
+++ config/pandora-plugin.ini	2010-06-03 05:01:22 +0000
@@ -1,6 +1,6 @@
 [pandora-plugin]
-root_plugin_dir=ScaleStack
-pkgplugindir=$(libdir)/ScaleStack
+root_plugin_dir=scalestack
+pkgplugindir=$(libdir)/scalestack
 plugin_suffix=_module
 extra_cxxflags=-DBUILDING_SCALESTACK
 default_load_by_default=True

=== modified file 'configure.ac'
--- configure.ac	2010-04-27 00:25:30 +0000
+++ configure.ac	2010-06-03 05:01:22 +0000
@@ -8,9 +8,9 @@
 # the COPYING file in this directory for full text.
 #
 
-AC_INIT([ScaleStack],[0.1],[https://bugs.launchpad.net/scalestack],
-        [ScaleStack], [http://scalestack.org/])
-AC_CONFIG_SRCDIR([ScaleStack/Kernel/Core.h])
+AC_INIT([scalestack],[0.1],[https://bugs.launchpad.net/scalestack],
+        [scalestack], [http://scalestack.org/])
+AC_CONFIG_SRCDIR([scalestack/kernel/core.h])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -54,7 +54,7 @@
 AC_DEFINE_UNQUOTED([SCALESTACK_MODULE_EXT], ["$acl_cv_shlibext"],
                    [Extension to use for modules.])
 
-AC_CONFIG_FILES(Makefile ScaleStack/Common/Macros.h docs/header.html)
+AC_CONFIG_FILES(Makefile scalestack/common/macros.h docs/header.html)
 
 AC_OUTPUT
 

=== renamed file 'docs/Doxyfile' => 'docs/doxyfile'
--- docs/Doxyfile	2010-03-13 07:57:16 +0000
+++ docs/doxyfile	2010-06-03 05:01:22 +0000
@@ -568,7 +568,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = docs ScaleStack
+INPUT                  = docs scalestack
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

=== renamed directory 'ScaleStack' => 'scalestack'
=== renamed directory 'ScaleStack/Common' => 'scalestack/common'
=== renamed file 'ScaleStack/Common/DeletePointer.h' => 'scalestack/common/delete_pointer.h'
--- ScaleStack/Common/DeletePointer.h	2010-04-30 03:54:30 +0000
+++ scalestack/common/delete_pointer.h	2010-06-03 05:01:22 +0000
@@ -10,22 +10,25 @@
 
 /**
  * @file
- * @brief DeletePointer Function Object Declaration
+ * @brief Delete Pointer Function Object Declaration
  */
 
-#ifndef SCALESTACK_COMMON_DELETEPOINTER_H
-#define SCALESTACK_COMMON_DELETEPOINTER_H
+#ifndef SCALESTACK_COMMON_DELETE_POINTER_H
+#define SCALESTACK_COMMON_DELETE_POINTER_H
 
-namespace ScaleStack {
-namespace Common {
+namespace scalestack
+{
+namespace common
+{
 
 /**
  * Function object to use with containers of pointers when the objects should
  * be deleted.
  */
-class DeletePointer
+class delete_pointer
 {
 public:
+
   template<typename T>
   void operator()(const T* pointer) const
   {
@@ -33,7 +36,7 @@
   }
 };
 
-} /* namespace Common */
-} /* namespace ScaleStack */
+} /* namespace common */
+} /* namespace scalestack */
 
-#endif /* SCALESTACK_COMMON_DELETEPOINTER_H */
+#endif /* SCALESTACK_COMMON_DELETE_POINTER_H */

=== renamed file 'ScaleStack/Common/Exception.cc' => 'scalestack/common/exception.cc'
--- ScaleStack/Common/Exception.cc	2010-04-30 03:54:30 +0000
+++ scalestack/common/exception.cc	2010-06-03 05:01:22 +0000
@@ -17,20 +17,22 @@
 
 #include <cstdio>
 
-#include <ScaleStack/Common/Exception.h>
-
-namespace ScaleStack {
-namespace Common {
-
-Exception::Exception(const char* context, const char* message) throw()
+#include <scalestack/common/exception.h>
+
+namespace scalestack
+{
+namespace common
+{
+
+exception::exception(const char* context, const char* message) throw()
 {
   snprintf(_message, SCALESTACK_MAX_MESSAGE_SIZE, "[%s] %s", context, message);
 }
 
-const char* Exception::what() const throw() 
+const char* exception::what() const throw() 
 {
   return _message;
 }
 
-} /* namespace Common */
-} /* namespace ScaleStack */
+} /* namespace common */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Common/Exception.h' => 'scalestack/common/exception.h'
--- ScaleStack/Common/Exception.h	2010-04-30 03:54:30 +0000
+++ scalestack/common/exception.h	2010-06-03 05:01:22 +0000
@@ -18,15 +18,17 @@
 
 #include <exception>
 
-#include <ScaleStack/Common/Macros.h>
+#include <scalestack/common/macros.h>
 
-namespace ScaleStack {
-namespace Common {
+namespace scalestack
+{
+namespace common
+{
 
 /**
  * This class allows exceptions to be thrown with custom error mesages.
  */
-class SCALESTACK_API Exception: public std::exception
+class SCALESTACK_API exception: public std::exception
 {
 public:
 
@@ -36,7 +38,7 @@
    * @param[in] context Context where the exception occurred.
    * @param[in] message Message describing the exception.
    */
-  Exception(const char* context, const char* message) throw();
+  exception(const char* context, const char* message) throw();
 
   /**
    * Return the formatted buffer.
@@ -49,7 +51,7 @@
   char _message[SCALESTACK_MAX_MESSAGE_SIZE];
 };
 
-} /* namespace Common */
-} /* namespace ScaleStack */
+} /* namespace common */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_COMMON_EXCEPTION_H */

=== renamed file 'ScaleStack/Common/Macros.h.in' => 'scalestack/common/macros.h.in'
--- ScaleStack/Common/Macros.h.in	2010-03-29 07:57:59 +0000
+++ scalestack/common/macros.h.in	2010-06-03 05:01:22 +0000
@@ -70,4 +70,6 @@
  */
 #define SCALESTACK_MAX_MESSAGE_SIZE 1024
 
+#define _(string) string
+
 #endif /* SCALESTACK_COMMON_MACROS_H */

=== renamed file 'ScaleStack/Common/Notification.cc' => 'scalestack/common/notification.cc'
--- ScaleStack/Common/Notification.cc	2010-04-30 03:54:30 +0000
+++ scalestack/common/notification.cc	2010-06-03 05:01:22 +0000
@@ -16,40 +16,59 @@
 #include "config.h"
 
 #include <cerrno>
-
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 
-#include <ScaleStack/Common/Exception.h>
-#include <ScaleStack/Common/Notification.h>
-
-namespace ScaleStack {
-namespace Common {
-
-Notification::Notification(void)
+#include <scalestack/common/exception.h>
+#include <scalestack/common/notification.h>
+
+namespace scalestack
+{
+namespace common
+{
+
+/*
+ * Public methods.
+ */
+
+notification::notification(void)
 {
   if (pipe(_pipe) == -1)
-    throw Exception("Notification", "Could not create pipe");
+    _throw_exception(_("Could not create notification pipe"));
 }
 
-Notification::~Notification()
+notification::~notification()
 {
   close(_pipe[0]);
   close(_pipe[1]);
 }
 
-void Notification::send(void)
+void notification::send(void)
 {
   if (write(_pipe[1], "\0", 1) == -1 && errno != EINTR)
-    throw Exception("Notification", "Could not write to pipe");
+    _throw_exception(_("Could not write to notification pipe"));
 }
 
-void Notification::wait(void)
+void notification::wait(void)
 {
   char buffer[1024];
 
   if (read(_pipe[0], buffer, sizeof(buffer)) == -1 && errno != EINTR)
-    throw Exception("Notification", "Could not read from pipe");
-}
-
-} /* namespace Common */
-} /* namespace ScaleStack */
+    _throw_exception(_("Could not read from notification pipe"));
+}
+
+/*
+ * Private methods.
+ */
+
+void notification::_throw_exception(const char* prefix)
+{
+  char message[SCALESTACK_MAX_MESSAGE_SIZE];
+  snprintf(message, SCALESTACK_MAX_MESSAGE_SIZE,
+           "%s: %s", prefix, strerror(errno));
+  throw exception("notification", message);
+}
+
+} /* namespace common */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Common/Notification.h' => 'scalestack/common/notification.h'
--- ScaleStack/Common/Notification.h	2010-04-30 03:54:30 +0000
+++ scalestack/common/notification.h	2010-06-03 05:01:22 +0000
@@ -16,21 +16,23 @@
 #ifndef SCALESTACK_COMMON_NOTIFICATION_H
 #define SCALESTACK_COMMON_NOTIFICATION_H
 
-#include <ScaleStack/Common/Macros.h>
+#include <scalestack/common/macros.h>
 
-namespace ScaleStack {
-namespace Common {
+namespace scalestack
+{
+namespace common
+{
 
 /**
  * This class provides a way for different threads to notify each other.
  */
-class SCALESTACK_API Notification
+class SCALESTACK_API notification
 {
 public:
 
-  Notification(void);
+  notification(void);
 
-  ~Notification();
+  ~notification();
 
   /**
    * Send a notification.
@@ -47,17 +49,24 @@
   /**
    * Don't allow copying of objects.
    */
-  Notification(const Notification&);
+  notification(const notification&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Notification& operator=(const Notification&);
+  notification& operator=(const notification&);
+
+  /**
+   * Format an error message from errno and throw an exception.
+   *
+   * @param[in] prefix The prefix for the error message.
+   */
+  void _throw_exception(const char* prefix);
 
   int _pipe[2];
 };
 
-} /* namespace Common */
-} /* namespace ScaleStack */
+} /* namespace common */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_COMMON_NOTIFICATION_H */

=== renamed file 'ScaleStack/Common/Test.h' => 'scalestack/common/test.h'
--- ScaleStack/Common/Test.h	2010-04-30 03:54:30 +0000
+++ scalestack/common/test.h	2010-06-03 05:01:22 +0000
@@ -23,10 +23,12 @@
 #include <iostream>
 #include <string>
 
-#include <ScaleStack/Kernel/Core.h>
+#include <scalestack/kernel/core.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
+
+#define TEST_EVENT_SERVICE "event::libevent"
 
 #define TEST_SUITE_BEGIN \
 int main(int _test_argc, char* _test_argv[]) \
@@ -48,9 +50,9 @@
 
 #define TEST_BEGIN(name) \
   TEST_BEGIN_NO_CORE(name) \
-  Kernel::Core core; \
-  core.setLogThreshold(TEST_LOG_THRESHOLD); \
-  core.addModuleOptionValue("path", "", "ScaleStack/.libs");
+  kernel::core core; \
+  core.set_log_threshold(TEST_LOG_THRESHOLD); \
+  core.add_module_option_value("path", "", "scalestack/.libs");
 
 
 #define TEST_END \
@@ -80,6 +82,4 @@
   TEST_EXCEPTION_END \
 while (false)
 
-#define TEST_EVENT_SERVICE "Event::Libevent"
-
 #endif /* SCALESTACK_COMMON_TEST_H */

=== renamed directory 'ScaleStack/DatabaseProxy' => 'scalestack/database_proxy'
=== renamed file 'ScaleStack/DatabaseProxy/Client.cc' => 'scalestack/database_proxy/client.cc'
--- ScaleStack/DatabaseProxy/Client.cc	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/client.cc	2010-06-03 05:01:22 +0000
@@ -15,20 +15,22 @@
 
 #include "config.h"
 
-#include <ScaleStack/DatabaseProxy/Client.h>
-#include <ScaleStack/DatabaseProxy/ClientService.h>
-#include <ScaleStack/DatabaseProxy/Connection.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/database_proxy/client.h>
+#include <scalestack/database_proxy/client_service.h>
+#include <scalestack/database_proxy/connection.h>
+#include <scalestack/kernel/module.h>
 
-namespace ScaleStack {
-namespace DatabaseProxy {
+namespace scalestack
+{
+namespace database_proxy
+{
 
 /*
  * Public methods.
  */
 
-Client::Client(ClientService& client_service):
-  Network::Stream(client_service),
+client::client(client_service& creator):
+  network::stream(creator),
   _state(),
   _next_state(),
   _need_yield(false),
@@ -40,12 +42,12 @@
 {
 }
 
-void Client::setConnection(DatabaseProxy::Connection* connection,
-                           bool need_handshake)
+void client::set_connection(database_proxy::connection* bound_connection,
+                            bool need_handshake)
 {
-  _connection = connection;
+  _connection = bound_connection;
 
-  if (connection == NULL)
+  if (_connection == NULL)
     return;
 
   if (need_handshake && _state != SERVER_HANDSHAKE_PACKET &&
@@ -55,60 +57,60 @@
     reconnect();
   }
   else
-    runNow();
+    run_now();
 }
 
-void Client::yield(void)
+void client::yield(void)
 {
   _need_yield = true;
 }
 
-void Client::connected(void)
+void client::connected(void)
 {
   if (_connection == NULL)
     return;
 
-  _connection->continueWrite();
+  _connection->continue_write();
 }
 
-size_t Client::read(uint8_t* buffer, size_t size)
+size_t client::read(uint8_t* buffer, size_t size)
 {
   _size = size;
   _buffer = buffer;
-  return _connectionWrite();
-}
-
-void Client::continueWrite(void)
-{
-  consume(_connectionWrite());
-}
-
-void Client::flushWrite(void)
-{
-  _connection->continueWrite();
-}
-
-void Client::error(void)
+  return _connection_write();
+}
+
+void client::continue_write(void)
+{
+  consume(_connection_write());
+}
+
+void client::flush_write(void)
+{
+  _connection->continue_write();
+}
+
+void client::error(void)
 {
   _connection->error();
 }
 
-void Client::run(void)
+void client::run(void)
 {
   if (_shutdown)
   {
-    _connection->runNow();
+    _connection->run_now();
     remove();
   }
   else
-    _connection->continueWrite();
+    _connection->continue_write();
 }
 
 /*
  * Private methods.
  */
 
-size_t Client::_connectionWrite(void)
+size_t client::_connection_write(void)
 {
   if (_connection == NULL)
     return 0;
@@ -124,7 +126,7 @@
 
     _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
     _state = SERVER_HANDSHAKE_FLUSH;
-    _module.logDebug("S-HAND packet: %u", _packet_size);
+    _module.log_debug("S-HAND packet: %u", _packet_size);
 
   case SERVER_HANDSHAKE_FLUSH:
     total_written = _connection->write(_buffer, _packet_size, true);
@@ -143,7 +145,7 @@
 
     _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
     _state = RESULT_FLUSH;
-    _module.logDebug("RESULT packet: %u", _packet_size);
+    _module.log_debug("RESULT packet: %u", _packet_size);
 
     if (_buffer[4] == 0 || _buffer[4] >= 254)
       _next_state = RESULT_PACKET;
@@ -171,7 +173,7 @@
 
       _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
       _state = COLUMN_FLUSH;
-      _module.logDebug("COLUMN packet: %u", _packet_size);
+      _module.log_debug("COLUMN packet: %u", _packet_size);
 
       if (_packet_size == 9 && _buffer[4] == 254)
         _next_state = ROW_PACKET;
@@ -200,7 +202,7 @@
 
       _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
       _state = ROW_FLUSH;
-      _module.logDebug("ROW packet: %u", _packet_size);
+      _module.log_debug("ROW packet: %u", _packet_size);
 
       if (_packet_size == 9 && _buffer[4] == 254)
         _next_state = RESULT_PACKET;
@@ -232,5 +234,5 @@
   return total_written;
 }
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/DatabaseProxy/Client.h' => 'scalestack/database_proxy/client.h'
--- ScaleStack/DatabaseProxy/Client.h	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/client.h	2010-06-03 05:01:22 +0000
@@ -16,25 +16,27 @@
 #ifndef SCALESTACK_DATABASEPROXY_CLIENT_H
 #define SCALESTACK_DATABASEPROXY_CLIENT_H
 
-#include <ScaleStack/Network/Stream.h>
-
-namespace ScaleStack {
-namespace DatabaseProxy {
-
-class ClientService;
-class Connection;
-
-class Client: public Network::Stream
+#include <scalestack/network/stream.h>
+
+namespace scalestack
+{
+namespace database_proxy
+{
+
+class client_service;
+class connection;
+
+class client: public network::stream
 {
 public:
 
-  Client(ClientService& client_service);
+  client(client_service& creator);
 
   /**
    * Set the connection that uses this client.
    */
-  void setConnection(DatabaseProxy::Connection* connection,
-                     bool need_handshake);
+  void set_connection(database_proxy::connection* bound_connection,
+                      bool need_handshake);
 
   /**
    * Notify client it should be yielded once current request is complete.
@@ -47,19 +49,19 @@
   void connected(void);
 
   /**
-   * See SocketTCP::Connection::read().
+   * See Socket_tCP::connection::read().
    */
   size_t read(uint8_t* buffer, size_t size);
 
   /**
    * Continue writing to the connection from the read buffer.
    */
-  void continueWrite(void);
+  void continue_write(void);
 
   /**
-   * See SocketTCP::Connection::flushWrite().
+   * See Socket_tCP::connection::flush_write().
    */
-  void flushWrite(void);
+  void flush_write(void);
 
   /**
    * On error, notify attached connection to shutdown.
@@ -76,18 +78,18 @@
   /**
    * Don't allow copying of objects.
    */
-  Client(const Client&);
+  client(const client&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Client& operator=(const Client&);
+  client& operator=(const client&);
 
   /**
    * Write data to the connection. This is used by both the read() and
-   * continueWrite() methods.
+   * continue_write() methods.
    */
-  size_t _connectionWrite(void);
+  size_t _connection_write(void);
 
   enum
   {
@@ -105,10 +107,10 @@
   size_t _size;
   size_t _packet_size;
   uint8_t* _buffer;
-  DatabaseProxy::Connection* _connection;
+  database_proxy::connection* _connection;
 };
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_DATABASEPROXY_CLIENT_H */

=== renamed file 'ScaleStack/DatabaseProxy/ClientService.cc' => 'scalestack/database_proxy/client_service.cc'
--- ScaleStack/DatabaseProxy/ClientService.cc	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/client_service.cc	2010-06-03 05:01:22 +0000
@@ -17,24 +17,26 @@
 
 #include <algorithm>
 
-#include <ScaleStack/DatabaseProxy/Client.h>
-#include <ScaleStack/DatabaseProxy/ClientService.h>
-#include <ScaleStack/DatabaseProxy/Connection.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/database_proxy/client.h>
+#include <scalestack/database_proxy/client_service.h>
+#include <scalestack/database_proxy/connection.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
 using namespace std;
 
-namespace ScaleStack {
-namespace DatabaseProxy {
+namespace scalestack
+{
+namespace database_proxy
+{
 
 /*
  * Public functions.
  */
 
-ClientService::ClientService(Kernel::Module& module):
-  Network::IP::TCP::ConnectionService(module),
-  _max_clients(_module.getOption("max_clients").getSizeValue()),
+client_service::client_service(kernel::module& creator):
+  network::ip::tcp::connection_service(creator),
+  _max_clients(_module.get_option("max_clients").get_size_value()),
   _current_clients(),
   _queue_mutex(),
   _waiting_connections(),
@@ -42,39 +44,39 @@
 {
   int return_code = pthread_mutex_init(&_queue_mutex, NULL);
   if (return_code != 0)
-    _module.logFatal("Failed pthread_mutex_init: %d", return_code);
+    _module.log_fatal("Failed pthread_mutex_init: %d", return_code);
 }
 
-ClientService::~ClientService()
+client_service::~client_service()
 {
   shutdown();
   int return_code = pthread_mutex_destroy(&_queue_mutex);
   if (return_code != 0)
-    _module.logError("Failed pthread_mutex_destroy: %d", return_code);
+    _module.log_error("Failed pthread_mutex_destroy: %d", return_code);
 }
 
-Network::Stream* ClientService::addStream(void)
+network::stream* client_service::add_stream(void)
 {
-  return new Client(*this);
+  return new client(*this);
 }
 
-void ClientService::removeStream(Network::Stream* stream)
+void client_service::remove_stream(network::stream* old_stream)
 {
   pthread_mutex_lock(&_queue_mutex);
   --_current_clients;
   pthread_mutex_unlock(&_queue_mutex);
-  delete stream;
+  delete old_stream;
 }
 
-Client* ClientService::getClient(Connection* connection, bool need_handshake)
+client* client_service::get_client(connection* bound_connection, bool need_handshake)
 {
   pthread_mutex_lock(&_queue_mutex);
 
-  Client* client;
-  vector<Connection*>::reverse_iterator found_connection;
+  client* new_client;
+  vector<connection*>::reverse_iterator found_connection;
   found_connection = find(_waiting_connections.rbegin(),
                           _waiting_connections.rend(),
-                          connection);
+                          bound_connection);
 
   if (_free_clients.empty() ||
       (_current_clients != _max_clients && need_handshake))
@@ -82,19 +84,19 @@
     if (_current_clients == _max_clients)
     {
       if (found_connection == _waiting_connections.rend())
-        _waiting_connections.insert(_waiting_connections.begin(), connection);
+        _waiting_connections.insert(_waiting_connections.begin(), bound_connection);
       pthread_mutex_unlock(&_queue_mutex);
       return NULL;
     }
 
-    const string& host = _module.getOption("client_host").getValue();
-    const string& port = _module.getOption("client_port").getValue();
-    client = static_cast<Client*>(addConnect(host, port));
+    const string& host = _module.get_option("client_host").get_value();
+    const string& port = _module.get_option("client_port").get_value();
+    new_client = static_cast<client*>(add_connect(host, port));
     ++_current_clients;
   }
   else
   {
-    client = _free_clients.back();
+    new_client = _free_clients.back();
     _free_clients.pop_back();
   }
 
@@ -103,34 +105,34 @@
 
   pthread_mutex_unlock(&_queue_mutex);
 
-  client->setConnection(connection, need_handshake);
-  return client;
+  new_client->set_connection(bound_connection, need_handshake);
+  return new_client;
 }
 
-void ClientService::yieldClient(Client* client)
+void client_service::yield_client(client* bound_client)
 {
   pthread_mutex_lock(&_queue_mutex);
 
-  _free_clients.push_back(client);
+  _free_clients.push_back(bound_client);
   if (!_waiting_connections.empty())
-    _waiting_connections.back()->runNow();
+    _waiting_connections.back()->run_now();
 
   pthread_mutex_unlock(&_queue_mutex);
 }
 
-void ClientService::removeFromQueue(Connection* connection)
+void client_service::remove_from_queue(connection* bound_connection)
 {
   pthread_mutex_lock(&_queue_mutex);
 
-  vector<Connection*>::iterator found_connection;
+  vector<connection*>::iterator found_connection;
   found_connection = find(_waiting_connections.begin(),
                           _waiting_connections.end(),
-                          connection);
+                          bound_connection);
   if (found_connection != _waiting_connections.end())
     _waiting_connections.erase(found_connection);
 
   pthread_mutex_unlock(&_queue_mutex);
 }
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/DatabaseProxy/ClientService.h' => 'scalestack/database_proxy/client_service.h'
--- ScaleStack/DatabaseProxy/ClientService.h	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/client_service.h	2010-06-03 05:01:22 +0000
@@ -13,72 +13,74 @@
  * @brief Database Proxy Client Service Declarations
  */
 
-#ifndef SCALESTACK_DATABASEPROXY_CLIENTSERVICE_H
-#define SCALESTACK_DATABASEPROXY_CLIENTSERVICE_H
+#ifndef SCALESTACK_DATABASEPROXY_CLIENT_SERVICE_H
+#define SCALESTACK_DATABASEPROXY_CLIENT_SERVICE_H
 
 #include <vector>
 
-#include <ScaleStack/Network/IP/TCP/ConnectionService.h>
-
-namespace ScaleStack {
-namespace DatabaseProxy {
-
-class Client;
-class Connection;
-
-class ClientService: public Network::IP::TCP::ConnectionService
+#include <scalestack/network/ip/tcp/connection_service.h>
+
+namespace scalestack
+{
+namespace database_proxy
+{
+
+class client;
+class connection;
+
+class client_service: public network::ip::tcp::connection_service
 {
 public:
 
-  ClientService(Kernel::Module& module);
-
-  ~ClientService();
-
-  /**
-   * See SocketTCP::ConnectionService::addConnection().
-   */
-  Network::Stream* addStream(void);
-
-  /**
-   * See SocketTCP::ConnectionService::removeConnection().
-   */
-  void removeStream(Network::Stream* stream);
+  client_service(kernel::module& creator);
+
+  ~client_service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream* add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* old_stream);
 
   /**
    * Get a client connection to proxy to.
    */
-  Client* getClient(Connection* connection, bool need_handshake);
+  client* get_client(connection* bound_connection, bool need_handshake);
 
   /**
    * Yield a client to other pending transactions.
    */
-  void yieldClient(Client* client);
+  void yield_client(client* bound_client);
 
   /**
    * Erase a connection from the queue.
    */
-  void removeFromQueue(Connection* connection);
+  void remove_from_queue(connection* bound_connection);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  ClientService(const ClientService&);
+  client_service(const client_service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  ClientService& operator=(const ClientService&);
+  client_service& operator=(const client_service&);
 
   size_t _max_clients;
   size_t _current_clients;
   pthread_mutex_t _queue_mutex;
-  std::vector<Connection*> _waiting_connections;
-  std::vector<Client*> _free_clients;
+  std::vector<connection*> _waiting_connections;
+  std::vector<client*> _free_clients;
 };
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */
 
-#endif /* SCALESTACK_DATABASEPROXY_CLIENTSERVICE_H */
+#endif /* SCALESTACK_DATABASEPROXY_CLIENT_SERVICE_H */

=== renamed file 'ScaleStack/DatabaseProxy/Connection.cc' => 'scalestack/database_proxy/connection.cc'
--- ScaleStack/DatabaseProxy/Connection.cc	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/connection.cc	2010-06-03 05:01:22 +0000
@@ -17,20 +17,22 @@
 
 #include <cstring>
 
-#include <ScaleStack/DatabaseProxy/Client.h>
-#include <ScaleStack/DatabaseProxy/Connection.h>
-#include <ScaleStack/DatabaseProxy/Service.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/database_proxy/client.h>
+#include <scalestack/database_proxy/connection.h>
+#include <scalestack/database_proxy/service.h>
+#include <scalestack/kernel/module.h>
 
-namespace ScaleStack {
-namespace DatabaseProxy {
+namespace scalestack
+{
+namespace database_proxy
+{
 
 /*
  * Public methods.
  */
 
-Connection::Connection(Service& service):
-  Network::Stream(service),
+connection::connection(service& creator):
+  network::stream(creator),
   _state(),
   _need_handshake(true),
   _need_yield(false),
@@ -41,70 +43,70 @@
   _buffer(),
   _client()
 {
-  _client = service.getClient(this, _need_handshake);
+  _client = creator.get_client(this, _need_handshake);
 }
 
-size_t Connection::read(uint8_t* buffer, size_t size)
+size_t connection::read(uint8_t* buffer, size_t size)
 {
   _size = size;
   _buffer = buffer;
-  return _clientWrite();
+  return _client_write();
 }
 
-void Connection::continueWrite(void)
+void connection::continue_write(void)
 {
-  consume(_clientWrite());
+  consume(_client_write());
 }
 
-void Connection::flushWrite(void)
+void connection::flush_write(void)
 {
   if (_client != NULL)
-    _client->continueWrite();
+    _client->continue_write();
 }
 
-void Connection::error(void)
+void connection::error(void)
 {
   _shutdown = true;
-  runNow();
+  run_now();
 }
 
-void Connection::run(void)
+void connection::run(void)
 {
   if (_shutdown)
   {
     if (_client == NULL)
     {
-      static_cast<Service&>(_service).removeFromQueue(this);
+      static_cast<service&>(_service).remove_from_queue(this);
       remove();
       return;
     }
 
-    static_cast<Service&>(_service).yieldClient(_client);
+    static_cast<service&>(_service).yield_client(_client);
     _client = NULL;
     return;
   }
 
   if (_client == NULL)
-    _client = static_cast<Service&>(_service).getClient(this, _need_handshake);
+    _client = static_cast<service&>(_service).get_client(this, _need_handshake);
   else if (_need_yield)
   {
     _need_yield = false;
-    static_cast<Service&>(_service).yieldClient(_client);
+    static_cast<service&>(_service).yield_client(_client);
     _client = NULL;
   }
 }
 
-void Connection::yield(void)
+void connection::yield(void)
 {
   _need_yield = true;
-  runNow();
+  run_now();
 }
 
 /*
  * Private methods.
  */
 
-size_t Connection::_clientWrite(void)
+size_t connection::_client_write(void)
 {
   if (_shutdown)
     return 0;
@@ -112,13 +114,13 @@
   if (_need_yield)
   {
     _need_yield = false;
-    static_cast<Service&>(_service).yieldClient(_client);
+    static_cast<service&>(_service).yield_client(_client);
     _client = NULL;
   }
 
   if (_client == NULL)
   {
-    _client = static_cast<Service&>(_service).getClient(this, _need_handshake);
+    _client = static_cast<service&>(_service).get_client(this, _need_handshake);
     /* Just return here, the client will call this when ready. */
     return 0;
   }
@@ -133,7 +135,7 @@
 
     _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
     _state = CLIENT_HANDSHAKE_FLUSH;
-    _module.logDebug("C-HAND packet: %u", _packet_size);
+    _module.log_debug("C-HAND packet: %u", _packet_size);
 
   case CLIENT_HANDSHAKE_FLUSH:
     written = _client->write(_buffer, _packet_size, true);
@@ -155,7 +157,7 @@
 
     _packet_size = 4 + (_buffer[0] | (static_cast<size_t>(_buffer[1]) << 8) | (static_cast<size_t>(_buffer[2]) << 16));
     _state = COMMAND_FLUSH;
-    _module.logDebug("COMMAND packet: %u", _packet_size);
+    _module.log_debug("COMMAND packet: %u", _packet_size);
     if (_packet_size == 10 && _size >= 10 && !memcmp("BEGIN", _buffer + 5, 5))
       _in_transaction = true;
     else if (!_in_transaction ||
@@ -189,5 +191,5 @@
   return written;
 }
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/DatabaseProxy/Connection.h' => 'scalestack/database_proxy/connection.h'
--- ScaleStack/DatabaseProxy/Connection.h	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/connection.h	2010-06-03 05:01:22 +0000
@@ -16,34 +16,36 @@
 #ifndef SCALESTACK_DATABASEPROXY_CONNECTION_H
 #define SCALESTACK_DATABASEPROXY_CONNECTION_H
 
-#include <ScaleStack/Network/Stream.h>
-
-namespace ScaleStack {
-namespace DatabaseProxy {
-
-class Client;
-class Service;
-
-class Connection: public Network::Stream
+#include <scalestack/network/stream.h>
+
+namespace scalestack
+{
+namespace database_proxy
+{
+
+class client;
+class service;
+
+class connection: public network::stream
 {
 public:
 
-  Connection(Service& service);
+  connection(service& creator);
 
   /**
-   * See SocketTCP::Connection::read().
+   * See network::stream::read().
    */
   size_t read(uint8_t* buffer, size_t size);
 
   /**
    * Continue writing to the client from the read buffer.
    */
-  void continueWrite(void);
+  void continue_write(void);
 
   /**
-   * See SocketTCP::Connection::flushWrite().
+   * See network::stream::flush_write().
    */
-  void flushWrite(void);
+  void flush_write(void);
 
   /**
    * Start shutdown process.
@@ -65,18 +67,18 @@
   /**
    * Don't allow copying of objects.
    */
-  Connection(const Connection&);
+  connection(const connection&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Connection& operator=(const Connection&);
+  connection& operator=(const connection&);
 
   /**
    * Write data to the client. This is used by both the read() and
-   * continueWrite() methods.
+   * continue_write() methods.
    */
-  size_t _clientWrite(void);
+  size_t _client_write(void);
 
   enum
   {
@@ -92,10 +94,10 @@
   size_t _size;
   size_t _packet_size;
   uint8_t* _buffer;
-  Client* _client;
+  client* _client;
 };
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_DATABASEPROXY_CONNECTION_H */

=== renamed file 'ScaleStack/DatabaseProxy/DatabaseProxy.cc' => 'scalestack/database_proxy/database_proxy.cc'
--- ScaleStack/DatabaseProxy/DatabaseProxy.cc	2010-04-28 06:41:33 +0000
+++ scalestack/database_proxy/database_proxy.cc	2010-06-03 05:01:22 +0000
@@ -15,28 +15,28 @@
 
 #include "config.h"
 
-#include <ScaleStack/DatabaseProxy/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/database_proxy/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& current)
 {
-  Network::IP::TCP::ListenerOptions(module, "7");
-  module.addOption("client_host", "Host to proxy to.", "HOST", "127.0.0.1");
-  module.addOption("client_port", "Port to proxy to.", "PORT", "12345");
-  module.addOption("max_clients", "Maxiumum number of clients to use.",
-                   "MAX", "1");
+  network::ip::tcp::listener_options(current, "7");
+  current.add_option("client_host", "Host to proxy to.", "HOST", "127.0.0.1");
+  current.add_option("client_port", "Port to proxy to.", "PORT", "12345");
+  current.add_option("max_clients", "Maxiumum number of clients to use.",
+                     "MAX", "1");
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& current)
 {
-  DatabaseProxy::Service* service = new DatabaseProxy::Service(module);
+  database_proxy::service* service = new database_proxy::service(current);
   try
   {
-    module.getCore().addService("DatabaseProxy", service);
+    current.get_core().add_service("Database_proxy", service);
   }
   catch (exception&)
   {
@@ -45,9 +45,9 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& current)
 {
-  delete module.getCore().removeService("DatabaseProxy");
+  delete current.get_core().remove_service("Database_proxy");
 }
 
 SCALESTACK_KERNEL_MODULE(options, start, stop, NULL, NULL);

=== modified file 'scalestack/database_proxy/plugin.ini'
--- ScaleStack/DatabaseProxy/plugin.ini	2010-05-01 01:14:47 +0000
+++ scalestack/database_proxy/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,6 +4,6 @@
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Client.cc ClientService.cc Connection.cc DatabaseProxy.cc Service.cc
-headers=Client.h ClientService.h Connection.h Service.h
-dependencies=Network::IP::TCP
+sources=client.cc client_service.cc connection.cc database_proxy.cc service.cc
+headers=client.h client_service.h connection.h service.h
+dependencies=network::ip::tcp

=== renamed file 'ScaleStack/DatabaseProxy/Service.cc' => 'scalestack/database_proxy/service.cc'
--- ScaleStack/DatabaseProxy/Service.cc	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/service.cc	2010-06-03 05:01:22 +0000
@@ -15,54 +15,56 @@
 
 #include "config.h"
 
-#include <ScaleStack/DatabaseProxy/Connection.h>
-#include <ScaleStack/DatabaseProxy/Service.h>
+#include <scalestack/database_proxy/connection.h>
+#include <scalestack/database_proxy/service.h>
 
-namespace ScaleStack {
-namespace DatabaseProxy {
+namespace scalestack
+{
+namespace database_proxy
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::IP::TCP::ConnectionService(module),
-  _listener_service(module, *this),
-  _client_service(module)
+service::service(kernel::module& creator):
+  network::ip::tcp::connection_service(creator),
+  _listener_service(creator, *this),
+  _client_service(creator)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   _listener_service.shutdown();
   shutdown();
   _client_service.shutdown();
 }
 
-Network::Stream* Service::addStream(void)
-{
-  return new Connection(*this);
-}
-
-void Service::removeStream(Network::Stream* stream)
-{
-  delete stream;
-}
-
-Client* Service::getClient(Connection* connection, bool need_handshake)
-{
-  return _client_service.getClient(connection, need_handshake);
-}
-
-void Service::yieldClient(Client* client)
-{
-  _client_service.yieldClient(client);
-}
-
-void Service::removeFromQueue(Connection* connection)
-{
-  _client_service.removeFromQueue(connection);
-}
-
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+network::stream* service::add_stream(void)
+{
+  return new connection(*this);
+}
+
+void service::remove_stream(network::stream* old_stream)
+{
+  delete old_stream;
+}
+
+client* service::get_client(connection* bound_connection, bool need_handshake)
+{
+  return _client_service.get_client(bound_connection, need_handshake);
+}
+
+void service::yield_client(client* bound_client)
+{
+  _client_service.yield_client(bound_client);
+}
+
+void service::remove_from_queue(connection* bound_connection)
+{
+  _client_service.remove_from_queue(bound_connection);
+}
+
+} /* namespace database_proxy */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/DatabaseProxy/Service.h' => 'scalestack/database_proxy/service.h'
--- ScaleStack/DatabaseProxy/Service.h	2010-04-30 03:54:30 +0000
+++ scalestack/database_proxy/service.h	2010-06-03 05:01:22 +0000
@@ -16,66 +16,68 @@
 #ifndef SCALESTACK_DATABASEPROXY_SERVICE_H
 #define SCALESTACK_DATABASEPROXY_SERVICE_H
 
-#include <ScaleStack/DatabaseProxy/ClientService.h>
-#include <ScaleStack/Network/IP/TCP/ConnectionService.h>
-#include <ScaleStack/Network/IP/TCP/ListenerService.h>
-
-namespace ScaleStack {
-namespace DatabaseProxy {
-
-class Client;
-class Connection;
-
-class Service: public Network::IP::TCP::ConnectionService
+#include <scalestack/database_proxy/client_service.h>
+#include <scalestack/network/ip/tcp/connection_service.h>
+#include <scalestack/network/ip/tcp/listener_service.h>
+
+namespace scalestack
+{
+namespace database_proxy
+{
+
+class client;
+class connection;
+
+class service: public network::ip::tcp::connection_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See SocketTCP::ConnectionService::addConnection().
-   */
-  Network::Stream* addStream(void);
-
-  /**
-   * See Socket::ConnectionService::removeConnection().
-   */
-  void removeStream(Network::Stream* stream);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream* add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* old_stream);
 
   /**
    * Get a client connection to proxy to.
    */
-  Client* getClient(Connection* connection, bool need_handshake);
+  client* get_client(connection* bound_connection, bool need_handshake);
 
   /**
    * Yield a client to other pending transactions.
    */
-  void yieldClient(Client* client);
+  void yield_client(client* bound_client);
 
   /**
    * Erase a connection from the queue.
    */
-  void removeFromQueue(Connection* connection);
+  void remove_from_queue(connection* bound_connection);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 
-  Network::IP::TCP::ListenerService _listener_service;
-  ClientService _client_service;
+  network::ip::tcp::listener_service _listener_service;
+  client_service _client_service;
 };
 
-} /* namespace DatabaseProxy */
-} /* namespace ScaleStack */
+} /* namespace database_proxy */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_DATABASEPROXY_SERVICE_H */

=== renamed directory 'ScaleStack/Echo' => 'scalestack/echo'
=== renamed directory 'ScaleStack/Echo/Flood' => 'scalestack/echo/flood'
=== renamed file 'ScaleStack/Echo/Flood/Datagram.cc' => 'scalestack/echo/flood/datagram.cc'
--- ScaleStack/Echo/Flood/Datagram.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/datagram.cc	2010-06-03 05:01:22 +0000
@@ -17,48 +17,51 @@
 
 #include <cstring>
 
-#include <ScaleStack/Echo/Flood/Datagram.h>
-#include <ScaleStack/Echo/Flood/Flood.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/flood/datagram.h>
+#include <scalestack/echo/flood/flood.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
 
 /*
  * Public methods.
  */
 
-void Datagram::Options(Kernel::Module& module)
+void datagram::options(kernel::module& creator)
 {
-  module.addOption("iterations", "Number of iterations to run per datagram, 0 means forever.", "COUNT", "1");
-  module.addOption("packet_size", "Size of packets to send.", "SIZE", "4096");
+  creator.add_option("iterations", _("Number of iterations to run per datagram, 0 means forever."), "COUNT", "1");
+  creator.add_option("packet_size", _("Size of packets to send."), "SIZE", "4096");
 }
 
-Datagram::Datagram(Network::DatagramService& service):
-  Network::Datagram(service),
-  _iterations(_module.getOption("iterations").getSizeValue()),
-  _packet_size(_module.getOption("packet_size").getSizeValue()),
+datagram::datagram(network::datagram_service& creator):
+  network::datagram(creator),
+  _iterations(_module.get_option("iterations").get_size_value()),
+  _packet_size(_module.get_option("packet_size").get_size_value()),
   _read_offset(),
   _write_offset()
 {
 }
 
-Datagram::~Datagram()
-{
-}
-
-void Datagram::ready(void)
-{
-  flushSend();
-}
-
-size_t Datagram::receive(uint8_t* buffer, size_t size, struct sockaddr&, socklen_t)
+datagram::~datagram()
+{
+}
+
+void datagram::ready(void)
+{
+  flush_send();
+}
+
+size_t datagram::receive(uint8_t* buffer, size_t size, struct sockaddr&, socklen_t)
 {
   if (memcmp(random_buffer + _read_offset, buffer, size))
-    _module.logFatal("Received data did not match what was sent");
+    _module.log_fatal(_("Received data did not match what was sent"));
 
   _read_offset += size;
 
@@ -69,18 +72,18 @@
       _read_offset = 0;
       _write_offset = 0;
 
-      flushSend();
+      flush_send();
     }
     else
-      _module.getCore().shutdown();
+      _module.get_core().shutdown();
   }
   else
-    flushSend();
+    flush_send();
 
   return size;
 }
 
-void Datagram::flushSend(void)
+void datagram::flush_send(void)
 {
   size_t packet_size;
 
@@ -92,12 +95,12 @@
   _write_offset += send(random_buffer + _write_offset, packet_size);
 }
 
-void Datagram::error(void)
+void datagram::error(void)
 {
-  _module.getCore().shutdown();
+  _module.get_core().shutdown();
   remove();
 }
 
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Flood/Datagram.h' => 'scalestack/echo/flood/datagram.h'
--- ScaleStack/Echo/Flood/Datagram.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/datagram.h	2010-06-03 05:01:22 +0000
@@ -16,42 +16,46 @@
 #ifndef SCALESTACK_ECHO_FLOOD_DATAGRAM_H
 #define SCALESTACK_ECHO_FLOOD_DATAGRAM_H
 
-#include <ScaleStack/Common/Macros.h>
-#include <ScaleStack/Network/Datagram.h>
-
-namespace ScaleStack {
-namespace Kernel {
-
-class Module;
-
-} /* namespace Kernel */
-
-namespace Echo {
-namespace Flood {
+#include <scalestack/common/macros.h>
+#include <scalestack/network/datagram.h>
+
+namespace scalestack
+{
+namespace kernel
+{
+
+class module;
+
+} /* namespace kernel */
+
+namespace echo
+{
+namespace flood
+{
 
 /**
  * Class for handling datagram requests.
  */
-class SCALESTACK_API Datagram: public Network::Datagram
+class SCALESTACK_API datagram: public network::datagram
 {
 public:
 
   /**
    * Add common options for datagrams.
    */
-  static void Options(Kernel::Module& module);
-
-  Datagram(Network::DatagramService& service);
-
-  ~Datagram();
+  static void options(kernel::module& creator);
+
+  datagram(network::datagram_service& creator);
+
+  ~datagram();
 
   /**
-   * See Network::Datagram::ready().
+   * See network::datagram::ready().
    */
   void ready(void);
 
   /**
-   * See Network::Datagram::receive().
+   * See network::datagram::receive().
    */
   size_t receive(uint8_t* buffer,
                  size_t size,
@@ -59,12 +63,12 @@
                  socklen_t peer_size);
 
   /**
-   * See Network::Datagram::flushSend().
+   * See network::datagram::flush_send().
    */
-  void flushSend(void);
+  void flush_send(void);
 
   /**
-   * See Network::Datagram::error().
+   * See network::datagram::error().
    */
   void error(void);
 
@@ -73,12 +77,12 @@
   /**
    * Don't allow copying of objects.
    */
-  Datagram(const Datagram&);
+  datagram(const datagram&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Datagram& operator=(const Datagram&);
+  datagram& operator=(const datagram&);
 
   size_t _iterations;
   size_t _packet_size;
@@ -86,8 +90,8 @@
   size_t _write_offset;
 };
 
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_FLOOD_DATAGRAM_H */

=== renamed file 'ScaleStack/Echo/Flood/Flood.cc' => 'scalestack/echo/flood/flood.cc'
--- ScaleStack/Echo/Flood/Flood.cc	2010-05-02 23:02:34 +0000
+++ scalestack/echo/flood/flood.cc	2010-06-03 05:01:22 +0000
@@ -17,17 +17,17 @@
 
 #include <cstdlib>
 
-#include <ScaleStack/Echo/Flood/Flood.h>
-#include <ScaleStack/Kernel/Module.h>
-
-using namespace ScaleStack;
-
-uint8_t Echo::Flood::random_buffer[Echo::Flood::random_buffer_size];
-
-static void start(Kernel::Module&)
+#include <scalestack/echo/flood/flood.h>
+#include <scalestack/kernel/module.h>
+
+using namespace scalestack;
+
+uint8_t echo::flood::random_buffer[echo::flood::random_buffer_size];
+
+static void start(kernel::module&)
 {
-  for (size_t index = 0; index < Echo::Flood::random_buffer_size; index++)
-    Echo::Flood::random_buffer[index] = static_cast<uint8_t>(rand());
+  for (size_t index = 0; index < echo::flood::random_buffer_size; index++)
+    echo::flood::random_buffer[index] = static_cast<uint8_t>(rand());
 }
 
 SCALESTACK_KERNEL_MODULE(NULL, start, NULL, NULL, NULL);

=== renamed file 'ScaleStack/Echo/Flood/Flood.h' => 'scalestack/echo/flood/flood.h'
--- ScaleStack/Echo/Flood/Flood.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/flood.h	2010-06-03 05:01:22 +0000
@@ -19,15 +19,18 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
 
 const size_t random_buffer_size = 385637;
 extern uint8_t random_buffer[random_buffer_size];
 
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_FLOOD_FLOOD_H */

=== renamed directory 'ScaleStack/Echo/Flood/UnixStream' => 'scalestack/echo/flood/local_stream'
=== renamed file 'ScaleStack/Echo/Flood/UnixStream/UnixStream.cc' => 'scalestack/echo/flood/local_stream/local_stream.cc'
--- ScaleStack/Echo/Flood/UnixStream/UnixStream.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/local_stream/local_stream.cc	2010-06-03 05:01:22 +0000
@@ -10,33 +10,33 @@
 
 /**
  * @file
- * @brief Echo Flood Unix Stream Module Definitions
+ * @brief Echo Flood Local Stream Module Definitions
  */
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Stream.h>
-#include <ScaleStack/Echo/Flood/UnixStream/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/flood/stream.h>
+#include <scalestack/echo/flood/local_stream/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& current)
 {
-  module.addOption("unix_socket", "Unix socket to connect to.", "SOCKET", "/tmp/echoserver.socket");
-  module.addOption("count", "Number of concurrent connections to open.", "COUNT", "1");
-  Echo::Flood::Stream::Options(module);
+  current.add_option("local_socket", "Local socket to connect to.", "SOCKET", "/tmp/echoserver.socket");
+  current.add_option("count", "Number of concurrent connections to open.", "COUNT", "1");
+  echo::flood::stream::options(current);
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& current)
 {
-  Echo::Flood::UnixStream::Service* service = new Echo::Flood::UnixStream::Service(module);
+  echo::flood::local_stream::service* service = new echo::flood::local_stream::service(current);
   try
   {
-    module.getCore().addService("Echo::Flood::UnixStream", service);
+    current.get_core().add_service("echo::flood::local_stream", service);
   }
   catch (exception&)
   {
@@ -45,20 +45,20 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& current)
 {
-  delete module.getCore().removeService("Echo::Flood::UnixStream");
+  delete current.get_core().remove_service("echo::flood::local_stream");
 }
 
-static void run(Kernel::Module& module)
+static void run(kernel::module& current)
 { 
-  Echo::Flood::UnixStream::Service& service = static_cast<Echo::Flood::UnixStream::Service&>(module.getCore().getService("Echo::Flood::UnixStream"));
+  echo::flood::local_stream::service& service = static_cast<echo::flood::local_stream::service&>(current.get_core().get_service("echo::flood::local_stream"));
 
-  for (int count = module.getOption("count").getIntValue();
+  for (int count = current.get_option("count").get_int_value();
        count != 0;
        --count)
   {
-    service.addConnect(module.getOption("unix_socket").getValue());
+    service.add_connect(current.get_option("local_socket").get_value());
   }
 }
 

=== modified file 'scalestack/echo/flood/local_stream/plugin.ini'
--- ScaleStack/Echo/Flood/UnixStream/plugin.ini	2010-05-01 05:23:39 +0000
+++ scalestack/echo/flood/local_stream/plugin.ini	2010-06-03 05:01:22 +0000
@@ -1,9 +1,9 @@
 [plugin]
-title=Echo Flood Unix Stream Service
-description=Unix stream service for the echo flood client.
+title=Echo Flood Local Stream Service
+description=Local stream service for the echo flood client.
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Service.cc UnixStream.cc
-headers=Service.h
-dependencies=Echo::Flood Network::Unix::Stream
+sources=service.cc local_stream.cc
+headers=service.h
+dependencies=echo::flood network::local::stream

=== renamed file 'ScaleStack/Echo/Flood/UnixStream/Service.cc' => 'scalestack/echo/flood/local_stream/service.cc'
--- ScaleStack/Echo/Flood/UnixStream/Service.cc	2010-05-01 05:23:39 +0000
+++ scalestack/echo/flood/local_stream/service.cc	2010-06-03 05:01:22 +0000
@@ -10,44 +10,48 @@
 
 /**
  * @file
- * @brief Echo Flood Unix Stream Service Definitions
+ * @brief Echo Flood Local Stream Service Definitions
  */
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Stream.h>
-#include <ScaleStack/Echo/Flood/UnixStream/Service.h>
+#include <scalestack/echo/flood/stream.h>
+#include <scalestack/echo/flood/local_stream/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace UnixStream {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace local_stream
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::Unix::Stream::ConnectionService(module)
+service::service(kernel::module& creator):
+  network::local::stream::connection_service(creator)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   shutdown();
 }
 
-Network::Stream* Service::addStream(void)
+network::stream* service::add_stream(void)
 {
-  return new Stream(*this);
+  return new stream(*this);
 }
 
-void Service::removeStream(Network::Stream* stream)
+void service::remove_stream(network::stream* stream)
 {
   delete stream;
 }
 
-} /* namespace UnixStream */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace local_stream */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Flood/UnixStream/Service.h' => 'scalestack/echo/flood/local_stream/service.h'
--- ScaleStack/Echo/Flood/UnixStream/Service.h	2010-05-01 05:23:39 +0000
+++ scalestack/echo/flood/local_stream/service.h	2010-06-03 05:01:22 +0000
@@ -10,53 +10,57 @@
 
 /**
  * @file
- * @brief Echo Flood Unix Stream Service Declarations
+ * @brief Echo Flood Local Stream Service Declarations
  */
 
-#ifndef SCALESTACK_ECHO_FLOOD_UNIXSTREAM_SERVICE_H
-#define SCALESTACK_ECHO_FLOOD_UNIXSTREAM_SERVICE_H
-
-#include <ScaleStack/Network/Unix/Stream/ConnectionService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace UnixStream {
-
-class Service: public Network::Unix::Stream::ConnectionService
+#ifndef SCALESTACK_ECHO_FLOOD_LOCAL_STREAM_SERVICE_H
+#define SCALESTACK_ECHO_FLOOD_LOCAL_STREAM_SERVICE_H
+
+#include <scalestack/network/local/stream/connection_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace local_stream
+{
+
+class service: public network::local::stream::connection_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::StreamService::addStream().
-   */
-  Network::Stream *addStream(void);
-
-  /**
-   * See Network::StreamService::removeStream().
-   */
-  void removeStream(Network::Stream* stream);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream *add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* stream);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 };
 
-} /* namespace UnixStream */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace local_stream */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
-#endif /* SCALESTACK_ECHO_FLOOD_UNIXSTREAM_SERVICE_H */
+#endif /* SCALESTACK_ECHO_FLOOD_LOCAL_STREAM_SERVICE_H */

=== modified file 'scalestack/echo/flood/plugin.ini'
--- ScaleStack/Echo/Flood/plugin.ini	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,6 +4,6 @@
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Datagram.cc Flood.cc Stream.cc
-headers=Datagram.h Flood.h Stream.h
-dependencies=Network
+sources=datagram.cc flood.cc stream.cc
+headers=datagram.h flood.h stream.h
+dependencies=network

=== renamed file 'ScaleStack/Echo/Flood/Stream.cc' => 'scalestack/echo/flood/stream.cc'
--- ScaleStack/Echo/Flood/Stream.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/stream.cc	2010-06-03 05:01:22 +0000
@@ -17,47 +17,50 @@
 
 #include <cstring>
 
-#include <ScaleStack/Echo/Flood/Flood.h>
-#include <ScaleStack/Echo/Flood/Stream.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/flood/flood.h>
+#include <scalestack/echo/flood/stream.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
 
 /*
  * Public methods.
  */
 
-void Stream::Options(Kernel::Module& module)
+void stream::options(kernel::module& creator)
 {
-  module.addOption("iterations", "Number of iterations to run per stream, 0 means forever.", "COUNT", "1");
-  module.addOption("reconnect", "Whether to reconnect between iterations.", "BOOLEAN", "False");
+  creator.add_option("iterations", _("Number of iterations to run per stream, 0 means forever."), "COUNT", "1");
+  creator.add_option("reconnect", _("Whether to reconnect between iterations."), "BOOLEAN", "False");
 }
 
-Stream::Stream(Network::StreamService& service):
-  Network::Stream(service),
-  _iterations(_module.getOption("iterations").getSizeValue()),
+stream::stream(network::stream_service& creator):
+  network::stream(creator),
+  _iterations(_module.get_option("iterations").get_size_value()),
   _read_offset(),
   _write_offset()
 {
 }
 
-Stream::~Stream()
-{
-}
-
-void Stream::connected(void)
-{
-  flushWrite();
-}
-
-size_t Stream::read(uint8_t* buffer, size_t size)
+stream::~stream()
+{
+}
+
+void stream::connected(void)
+{
+  flush_write();
+}
+
+size_t stream::read(uint8_t* buffer, size_t size)
 {
   if (memcmp(random_buffer + _read_offset, buffer, size))
-    _module.logFatal("Read data did not match what was sent");
+    _module.log_fatal(_("Read data did not match what was sent"));
 
   _read_offset += size;
 
@@ -68,31 +71,31 @@
       _read_offset = 0;
       _write_offset = 0;
 
-      if (_module.getOption("reconnect").getBoolValue())
+      if (_module.get_option("reconnect").get_bool_value())
         reconnect();
       else
-        flushWrite();
+        flush_write();
     }
     else
-      _module.getCore().shutdown();
+      _module.get_core().shutdown();
   }
 
   return size;
 }
 
-void Stream::flushWrite(void)
+void stream::flush_write(void)
 {
   _write_offset += write(random_buffer + _write_offset,
                          random_buffer_size - _write_offset,
                          true);
 }
 
-void Stream::error(void)
+void stream::error(void)
 {
-  _module.getCore().shutdown();
+  _module.get_core().shutdown();
   remove();
 }
 
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Flood/Stream.h' => 'scalestack/echo/flood/stream.h'
--- ScaleStack/Echo/Flood/Stream.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/stream.h	2010-06-03 05:01:22 +0000
@@ -16,52 +16,56 @@
 #ifndef SCALESTACK_ECHO_FLOOD_STREAM_H
 #define SCALESTACK_ECHO_FLOOD_STREAM_H
 
-#include <ScaleStack/Common/Macros.h>
-#include <ScaleStack/Network/Stream.h>
-
-namespace ScaleStack {
-namespace Kernel {
-
-class Module;
-
-} /* namespace Kernel */
-
-namespace Echo {
-namespace Flood {
+#include <scalestack/common/macros.h>
+#include <scalestack/network/stream.h>
+
+namespace scalestack
+{
+namespace kernel
+{
+
+class module;
+
+} /* namespace kernel */
+
+namespace echo
+{
+namespace flood
+{
 
 /**
  * Class for handling stream requests.
  */
-class SCALESTACK_API Stream: public Network::Stream
+class SCALESTACK_API stream: public network::stream
 {
 public:
 
   /**
    * Add common options for streams.
    */
-  static void Options(Kernel::Module& module);
-
-  Stream(Network::StreamService& service);
-
-  ~Stream();
+  static void options(kernel::module& creator);
+
+  stream(network::stream_service& creator);
+
+  ~stream();
 
   /**
-   * See Network::Stream::connected().
+   * See network::stream::connected().
    */
   void connected(void);
 
   /**
-   * See Network::Stream::read().
+   * See network::stream::read().
    */
   size_t read(uint8_t* buffer, size_t size);
 
   /**
-   * See Network::Stream::flushWrite().
+   * See network::stream::flush_write().
    */
-  void flushWrite(void);
+  void flush_write(void);
 
   /**
-   * See Network::Stream::error().
+   * See network::stream::error().
    */
   void error(void);
 
@@ -70,20 +74,20 @@
   /**
    * Don't allow copying of objects.
    */
-  Stream(const Stream&);
+  stream(const stream&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Stream& operator=(const Stream&);
+  stream& operator=(const stream&);
 
   size_t _iterations;
   size_t _read_offset;
   size_t _write_offset;
 };
 
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_FLOOD_STREAM_H */

=== renamed directory 'ScaleStack/Echo/Flood/TCP' => 'scalestack/echo/flood/tcp'
=== modified file 'scalestack/echo/flood/tcp/plugin.ini'
--- ScaleStack/Echo/Flood/TCP/plugin.ini	2010-05-01 05:23:39 +0000
+++ scalestack/echo/flood/tcp/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,6 +4,6 @@
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Service.cc TCP.cc
-headers=Service.h
-dependencies=Echo::Flood Network::IP::TCP
+sources=service.cc tcp.cc
+headers=service.h
+dependencies=echo::flood network::ip::tcp

=== renamed file 'ScaleStack/Echo/Flood/TCP/Service.cc' => 'scalestack/echo/flood/tcp/service.cc'
--- ScaleStack/Echo/Flood/TCP/Service.cc	2010-05-01 05:23:39 +0000
+++ scalestack/echo/flood/tcp/service.cc	2010-06-03 05:01:22 +0000
@@ -15,39 +15,43 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Stream.h>
-#include <ScaleStack/Echo/Flood/TCP/Service.h>
+#include <scalestack/echo/flood/stream.h>
+#include <scalestack/echo/flood/tcp/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace TCP {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace tcp
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::IP::TCP::ConnectionService(module)
+service::service(kernel::module& creator):
+  network::ip::tcp::connection_service(creator)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   shutdown();
 }
 
-Network::Stream* Service::addStream(void)
-{
-  return new Stream(*this);
-}
-
-void Service::removeStream(Network::Stream* stream)
-{
-  delete stream;
-}
-
-} /* namespace TCP */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+network::stream* service::add_stream(void)
+{
+  return new stream(*this);
+}
+
+void service::remove_stream(network::stream* old_stream)
+{
+  delete old_stream;
+}
+
+} /* namespace tcp */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Flood/TCP/Service.h' => 'scalestack/echo/flood/tcp/service.h'
--- ScaleStack/Echo/Flood/TCP/Service.h	2010-05-02 23:02:34 +0000
+++ scalestack/echo/flood/tcp/service.h	2010-06-03 05:01:22 +0000
@@ -16,47 +16,51 @@
 #ifndef SCALESTACK_ECHO_FLOOD_TCP_SERVICE_H
 #define SCALESTACK_ECHO_FLOOD_TCP_SERVICE_H
 
-#include <ScaleStack/Network/IP/TCP/ConnectionService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace TCP {
-
-class Service: public Network::IP::TCP::ConnectionService
+#include <scalestack/network/ip/tcp/connection_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace tcp
+{
+
+class service: public network::ip::tcp::connection_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::StreamService::addStream().
-   */
-  Network::Stream* addStream(void);
-
-  /**
-   * See Network::StreamService::removeStream().
-   */
-  void removeStream(Network::Stream* stream);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream* add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* old_stream);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 };
 
-} /* namespace TCP */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace tcp */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_FLOOD_TCP_SERVICE_H */

=== renamed file 'ScaleStack/Echo/Flood/TCP/TCP.cc' => 'scalestack/echo/flood/tcp/tcp.cc'
--- ScaleStack/Echo/Flood/TCP/TCP.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/tcp/tcp.cc	2010-06-03 05:01:22 +0000
@@ -15,29 +15,29 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Stream.h>
-#include <ScaleStack/Echo/Flood/TCP/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/flood/stream.h>
+#include <scalestack/echo/flood/tcp/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& current)
 {
-  module.addOption("host", "Host to connect to.", "HOST", "localhost");
-  module.addOption("port", "Port to connect to.", "PORT", "7");
-  module.addOption("count", "Number of concurrent connections to open.", "COUNT", "1");
-  Echo::Flood::Stream::Options(module);
+  current.add_option("host", _("Host to connect to."), "HOST", "localhost");
+  current.add_option("port", _("Port to connect to."), "PORT", "7");
+  current.add_option("count", _("Number of concurrent connections to open."), "COUNT", "1");
+  echo::flood::stream::options(current);
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& current)
 {
-  Echo::Flood::TCP::Service* service = new Echo::Flood::TCP::Service(module);
+  echo::flood::tcp::service* service = new echo::flood::tcp::service(current);
   try
   {
-    module.getCore().addService("Echo::Flood::TCP", service);
+    current.get_core().add_service("echo::flood::tcp", service);
   }
   catch (exception&)
   {
@@ -46,21 +46,21 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& current)
 {
-  delete module.getCore().removeService("Echo::Flood::TCP");
+  delete current.get_core().remove_service("echo::flood::tcp");
 }
 
-static void run(Kernel::Module& module)
+static void run(kernel::module& current)
 {
-  Echo::Flood::TCP::Service& service = static_cast<Echo::Flood::TCP::Service&>(module.getCore().getService("Echo::Flood::TCP"));
+  echo::flood::tcp::service& service = static_cast<echo::flood::tcp::service&>(current.get_core().get_service("echo::flood::tcp"));
 
-  for (int count = module.getOption("count").getIntValue();
+  for (int count = current.get_option("count").get_int_value();
        count != 0;
        --count)
   {
-    service.addConnect(module.getOption("host").getValue(),
-                       module.getOption("port").getValue());
+    service.add_connect(current.get_option("host").get_value(),
+                        current.get_option("port").get_value());
   }
 }
 

=== renamed directory 'ScaleStack/Echo/Flood/UDP' => 'scalestack/echo/flood/udp'
=== modified file 'scalestack/echo/flood/udp/plugin.ini'
--- ScaleStack/Echo/Flood/UDP/plugin.ini	2010-05-02 23:02:34 +0000
+++ scalestack/echo/flood/udp/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,6 +4,6 @@
 version=0.1
 author=Chris Behrens <[e-mail]>
 license=BSD
-sources=Service.cc UDP.cc
-headers=Service.h
-dependencies=Echo::Flood Network::IP::UDP
+sources=service.cc udp.cc
+headers=service.h
+dependencies=echo::flood network::ip::udp

=== renamed file 'ScaleStack/Echo/Flood/UDP/Service.cc' => 'scalestack/echo/flood/udp/service.cc'
--- ScaleStack/Echo/Flood/UDP/Service.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/udp/service.cc	2010-06-03 05:01:22 +0000
@@ -15,39 +15,43 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Datagram.h>
-#include <ScaleStack/Echo/Flood/UDP/Service.h>
+#include <scalestack/echo/flood/datagram.h>
+#include <scalestack/echo/flood/udp/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace UDP {
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace udp
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::IP::UDP::SocketService(module)
+service::service(kernel::module& creator):
+  network::ip::udp::socket_service(creator)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   shutdown();
 }
 
-Network::Datagram* Service::addDatagram(void)
-{
-  return new Datagram(*this);
-}
-
-void Service::removeDatagram(Network::Datagram* datagram)
-{
-  delete datagram;
-}
-
-} /* namespace UDP */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+network::datagram* service::add_datagram(void)
+{
+  return new datagram(*this);
+}
+
+void service::remove_datagram(network::datagram* old_datagram)
+{
+  delete old_datagram;
+}
+
+} /* namespace udp */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Flood/UDP/Service.h' => 'scalestack/echo/flood/udp/service.h'
--- ScaleStack/Echo/Flood/UDP/Service.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/udp/service.h	2010-06-03 05:01:22 +0000
@@ -16,47 +16,51 @@
 #ifndef SCALESTACK_ECHO_FLOOD_UDP_SERVICE_H
 #define SCALESTACK_ECHO_FLOOD_UDP_SERVICE_H
 
-#include <ScaleStack/Network/IP/UDP/SocketService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Flood {
-namespace UDP {
-
-class Service: public Network::IP::UDP::SocketService
+#include <scalestack/network/ip/udp/socket_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace flood
+{
+namespace udp
+{
+
+class service: public network::ip::udp::socket_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::DatagramService::addDatagram().
-   */
-  Network::Datagram* addDatagram(void);
-
-  /**
-   * See Network::DatagramService::removeDatagram().
-   */
-  void removeDatagram(Network::Datagram* datagram);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::datagram_service::add_datagram().
+   */
+  network::datagram* add_datagram(void);
+
+  /**
+   * See network::datagram_service::remove_datagram().
+   */
+  void remove_datagram(network::datagram* old_datagram);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 };
 
-} /* namespace UDP */
-} /* namespace Flood */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace udp */
+} /* namespace flood */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_FLOOD_UDP_SERVICE_H */

=== renamed file 'ScaleStack/Echo/Flood/UDP/UDP.cc' => 'scalestack/echo/flood/udp/udp.cc'
--- ScaleStack/Echo/Flood/UDP/UDP.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/flood/udp/udp.cc	2010-06-03 05:01:22 +0000
@@ -15,28 +15,28 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Flood/Datagram.h>
-#include <ScaleStack/Echo/Flood/UDP/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/flood/datagram.h>
+#include <scalestack/echo/flood/udp/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& current)
 {
-  Network::IP::UDP::SocketService::Options(module, ":7");
-  module.addOption("count", "Number of concurrent sockets to open.", "COUNT", "1");
-  Echo::Flood::Datagram::Options(module);
+  network::ip::udp::socket_service::options(current, ":7");
+  current.add_option("count", _("Number of concurrent sockets to open."), "COUNT", "1");
+  echo::flood::datagram::options(current);
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& current)
 {
-  Echo::Flood::UDP::Service* service = new Echo::Flood::UDP::Service(module);
+  echo::flood::udp::service* service = new echo::flood::udp::service(current);
   try
   {
-    module.getCore().addService("Echo::Flood::UDP", service);
+    current.get_core().add_service("echo::flood::udp", service);
   }
   catch (exception&)
   {
@@ -45,20 +45,20 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& current)
 {
-  delete module.getCore().removeService("Echo::Flood::UDP");
+  delete current.get_core().remove_service("echo::flood::udp");
 }
 
-static void run(Kernel::Module& module)
+static void run(kernel::module& current)
 {
-  Echo::Flood::UDP::Service& service = static_cast<Echo::Flood::UDP::Service&>(module.getCore().getService("Echo::Flood::UDP"));
+  echo::flood::udp::service& service = static_cast<echo::flood::udp::service&>(current.get_core().get_service("echo::flood::udp"));
 
-  for (int count = module.getOption("count").getIntValue();
+  for (int count = current.get_option("count").get_int_value();
        count != 0;
        --count)
   {
-    service.addSocketWithPeer();
+    service.add_socket_with_peer();
   }
 }
 

=== renamed directory 'ScaleStack/Echo/Server' => 'scalestack/echo/server'
=== renamed file 'ScaleStack/Echo/Server/Datagram.cc' => 'scalestack/echo/server/datagram.cc'
--- ScaleStack/Echo/Server/Datagram.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/datagram.cc	2010-06-03 05:01:22 +0000
@@ -15,35 +15,38 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/Datagram.h>
+#include <scalestack/echo/server/datagram.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
 
 /*
  * Public methods.
  */
 
-Datagram::Datagram(Network::DatagramService& service):
-  Network::Datagram(service),
+datagram::datagram(network::datagram_service& creator):
+  network::datagram(creator),
   _size(),
   _buffer()
 {
 }
 
-Datagram::~Datagram()
+datagram::~datagram()
 {
 }
 
-size_t Datagram::receive(uint8_t* buffer, size_t size, struct sockaddr&, socklen_t)
+size_t datagram::receive(uint8_t* buffer, size_t size, struct sockaddr&, socklen_t)
 {
   _size = size;
   _buffer = buffer;
   return _echo();
 }
 
-void Datagram::flushSend(void)
+void datagram::flush_send(void)
 {
   consume(_echo());
 }
@@ -52,11 +55,11 @@
  * Private methods.
  */
 
-size_t Datagram::_echo(void)
+size_t datagram::_echo(void)
 {
   return send(_buffer, _size);
 }
 
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Server/Datagram.h' => 'scalestack/echo/server/datagram.h'
--- ScaleStack/Echo/Server/Datagram.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/datagram.h	2010-06-03 05:01:22 +0000
@@ -16,23 +16,26 @@
 #ifndef SCALESTACK_ECHO_SERVER_DATAGRAM_H
 #define SCALESTACK_ECHO_SERVER_DATAGRAM_H
 
-#include <ScaleStack/Common/Macros.h>
-#include <ScaleStack/Network/Datagram.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-
-class SCALESTACK_API Datagram: public Network::Datagram
+#include <scalestack/common/macros.h>
+#include <scalestack/network/datagram.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+
+class SCALESTACK_API datagram: public network::datagram
 {
 public:
 
-  Datagram(Network::DatagramService& service);
+  datagram(network::datagram_service& creator);
 
-  ~Datagram();
+  ~datagram();
 
   /**
-   * See Network::Datagram::receive().
+   * See network::datagram::receive().
    */
   size_t receive(uint8_t* buffer,
                  size_t size,
@@ -40,25 +43,25 @@
                  socklen_t peer_size);
 
   /**
-   * See Network::Datagram::flushSend().
+   * See network::datagram::flush_send().
    */
-  void flushSend(void);
+  void flush_send(void);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Datagram(const Datagram&);
+  datagram(const datagram&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Datagram& operator=(const Datagram&);
+  datagram& operator=(const datagram&);
 
   /**
    * Echo the data received back to the sender. This is used by both the
-   * receive() and flushSend() methods.
+   * receive() and flush_send() methods.
    */
   SCALESTACK_LOCAL
   size_t _echo(void);
@@ -67,8 +70,8 @@
   uint8_t* _buffer;
 };
 
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_SERVER_DATAGRAM_H */

=== renamed directory 'ScaleStack/Echo/Server/UnixStream' => 'scalestack/echo/server/local_stream'
=== renamed file 'ScaleStack/Echo/Server/UnixStream/UnixStream.cc' => 'scalestack/echo/server/local_stream/local_stream.cc'
--- ScaleStack/Echo/Server/UnixStream/UnixStream.cc	2010-04-30 04:19:55 +0000
+++ scalestack/echo/server/local_stream/local_stream.cc	2010-06-03 05:01:22 +0000
@@ -10,29 +10,29 @@
 
 /**
  * @file
- * @brief Echo Server Unix Stream Module Definitions
+ * @brief Echo Server Local Stream Module Definitions
  */
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/UnixStream/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/echo/server/local_stream/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& module)
 {
-  Network::Unix::Stream::ListenerOptions(module, "/tmp/echoserver.socket");
+  network::local::stream::listener_options(module, "/tmp/echoserver.socket");
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& module)
 {
-  Echo::Server::UnixStream::Service* service = new Echo::Server::UnixStream::Service(module);
+  echo::server::local_stream::service* service = new echo::server::local_stream::service(module);
   try
   {
-    module.getCore().addService("Echo::Server::UnixStream", service);
+    module.get_core().add_service("echo::server::local_stream", service);
   }
   catch (exception&)
   {
@@ -41,9 +41,9 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& module)
 {
-  delete module.getCore().removeService("Echo::Server::UnixStream");
+  delete module.get_core().remove_service("echo::server::local_stream");
 }
 
 SCALESTACK_KERNEL_MODULE(options, start, stop, NULL, NULL);

=== modified file 'scalestack/echo/server/local_stream/plugin.ini'
--- ScaleStack/Echo/Server/UnixStream/plugin.ini	2010-05-01 05:23:39 +0000
+++ scalestack/echo/server/local_stream/plugin.ini	2010-06-03 05:01:22 +0000
@@ -1,10 +1,10 @@
 [plugin]
-title=Echo Server Unix Stream Service
-description=Unix Stream Service for the echo server.
+title=Echo Server Local Stream Service
+description=Local Stream Service for the echo server.
 version=0.1
 author=Chris Behrens <[e-mail]>
 license=BSD
-sources=Service.cc UnixStream.cc
-headers=Service.h
-dependencies=Echo::Server Network::Unix::Stream
-tests=Test/Run
+sources=service.cc local_stream.cc
+headers=service.h
+dependencies=echo::server network::local::stream
+tests=test/run

=== renamed file 'ScaleStack/Echo/Server/UnixStream/Service.cc' => 'scalestack/echo/server/local_stream/service.cc'
--- ScaleStack/Echo/Server/UnixStream/Service.cc	2010-04-30 04:19:55 +0000
+++ scalestack/echo/server/local_stream/service.cc	2010-06-03 05:01:22 +0000
@@ -10,46 +10,50 @@
 
 /**
  * @file
- * @brief Echo Server Unix Stream Service Definitions
+ * @brief Echo Server Local Stream Service Definitions
  */
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/Stream.h>
-#include <ScaleStack/Echo/Server/UnixStream/Service.h>
+#include <scalestack/echo/server/stream.h>
+#include <scalestack/echo/server/local_stream/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace UnixStream {
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace local_stream
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::Unix::Stream::ConnectionService(module),
-  _listener_service(module, *this)
+service::service(kernel::module& creator):
+  network::local::stream::connection_service(creator),
+  _listener_service(creator, *this)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   _listener_service.shutdown();
   shutdown();
 }
 
-Network::Stream* Service::addStream(void)
+network::stream* service::add_stream(void)
 {
-  return new Stream(*this);
+  return new stream(*this);
 }
 
-void Service::removeStream(Network::Stream* stream)
+void service::remove_stream(network::stream* stream)
 {
   delete stream;
 }
 
-} /* namespace UnixStream */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace local_stream */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Server/UnixStream/Service.h' => 'scalestack/echo/server/local_stream/service.h'
--- ScaleStack/Echo/Server/UnixStream/Service.h	2010-04-30 04:19:55 +0000
+++ scalestack/echo/server/local_stream/service.h	2010-06-03 05:01:22 +0000
@@ -10,56 +10,60 @@
 
 /**
  * @file
- * @brief Echo Server Unix Stream Service Declarations
+ * @brief Echo Server Local Stream Service Declarations
  */
 
-#ifndef SCALESTACK_ECHO_SERVER_UNIXSTREAM_SERVICE_H
-#define SCALESTACK_ECHO_SERVER_UNIXSTREAM_SERVICE_H
-
-#include <ScaleStack/Network/Unix/Stream/ConnectionService.h>
-#include <ScaleStack/Network/Unix/Stream/ListenerService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace UnixStream {
-
-class Service: public Network::Unix::Stream::ConnectionService
+#ifndef SCALESTACK_ECHO_SERVER_LOCAL_STREAM_SERVICE_H
+#define SCALESTACK_ECHO_SERVER_LOCAL_STREAM_SERVICE_H
+
+#include <scalestack/network/local/stream/connection_service.h>
+#include <scalestack/network/local/stream/listener_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace local_stream
+{
+
+class service: public network::local::stream::connection_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::StreamService::addStream().
-   */
-  Network::Stream *addStream(void);
-
-  /**
-   * See Network::StreamService::removeStream().
-   */
-  void removeStream(Network::Stream* stream);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream *add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* stream);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 
-  Network::Unix::Stream::ListenerService _listener_service;
+  network::local::stream::listener_service _listener_service;
 };
 
-} /* namespace UnixStream */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace local_stream */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */
 
-#endif /* SCALESTACK_ECHO_SERVER_UNIXSTREAM_SERVICE_H */
+#endif /* SCALESTACK_ECHO_SERVER_LOCAL_STREAM_SERVICE_H */

=== renamed directory 'ScaleStack/Echo/Server/UnixStream/Test' => 'scalestack/echo/server/local_stream/test'
=== renamed file 'ScaleStack/Echo/Server/UnixStream/Test/Run.cc' => 'scalestack/echo/server/local_stream/test/run.cc'
--- ScaleStack/Echo/Server/UnixStream/Test/Run.cc	2010-05-04 08:58:05 +0000
+++ scalestack/echo/server/local_stream/test/run.cc	2010-06-03 05:01:22 +0000
@@ -13,40 +13,41 @@
  * @brief Echo Server Unix Domain Socket Stream Test
  */
 
-#include <ScaleStack/Common/Test.h>
+#include <scalestack/common/test.h>
 
 #include <unistd.h>
 
-static const char* test_socket = ".echoserver.unix.stream.test";
+static const char* test_socket = ".echoserver.local.stream.test";
+
 TEST_SUITE_BEGIN
 
 TEST_BEGIN(default)
   unlink(test_socket);
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UnixStream", "unix_sockets", test_socket);
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "unix_socket", test_socket);
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::local_stream", "local_sockets", test_socket);
+  core.add_module_option_value("echo::flood::local_stream", "local_socket", test_socket);
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(iterations)
   unlink(test_socket);
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UnixStream", "unix_sockets", test_socket);
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "unix_socket", test_socket);
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "iterations", "5");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::local_stream", "local_sockets", test_socket);
+  core.add_module_option_value("echo::flood::local_stream", "local_socket", test_socket);
+  core.add_module_option_value("echo::flood::local_stream", "iterations", "5");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(reconnect)
   unlink(test_socket);
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UnixStream", "unix_sockets", test_socket);
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "unix_socket", test_socket);
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "iterations", "5");
-  core.addModuleOptionValue("Echo::Flood::UnixStream", "reconnect", "True");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::local_stream", "local_sockets", test_socket);
+  core.add_module_option_value("echo::flood::local_stream", "local_socket", test_socket);
+  core.add_module_option_value("echo::flood::local_stream", "iterations", "5");
+  core.add_module_option_value("echo::flood::local_stream", "reconnect", "True");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 

=== modified file 'scalestack/echo/server/plugin.ini'
--- ScaleStack/Echo/Server/plugin.ini	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,6 +4,6 @@
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Datagram.cc Server.cc Stream.cc
-headers=Datagram.h Stream.h
-dependencies=Network
+sources=datagram.cc server.cc stream.cc
+headers=datagram.h stream.h
+dependencies=network

=== renamed file 'ScaleStack/Echo/Server/Server.cc' => 'scalestack/echo/server/server.cc'
--- ScaleStack/Echo/Server/Server.cc	2010-04-29 07:39:49 +0000
+++ scalestack/echo/server/server.cc	2010-06-03 05:01:22 +0000
@@ -15,6 +15,6 @@
 
 #include "config.h"
 
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/kernel/module.h>
 
 SCALESTACK_KERNEL_MODULE(NULL, NULL, NULL, NULL, NULL);

=== renamed file 'ScaleStack/Echo/Server/Stream.cc' => 'scalestack/echo/server/stream.cc'
--- ScaleStack/Echo/Server/Stream.cc	2010-04-29 07:39:49 +0000
+++ scalestack/echo/server/stream.cc	2010-06-03 05:01:22 +0000
@@ -15,35 +15,38 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/Stream.h>
+#include <scalestack/echo/server/stream.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
 
 /*
  * Public methods.
  */
 
-Stream::Stream(Network::StreamService& service):
-  Network::Stream(service),
+stream::stream(network::stream_service& creator):
+  network::stream(creator),
   _size(),
   _buffer()
 {
 }
 
-Stream::~Stream()
+stream::~stream()
 {
 }
 
-size_t Stream::read(uint8_t* buffer, size_t size)
+size_t stream::read(uint8_t* buffer, size_t size)
 {
   _size = size;
   _buffer = buffer;
   return _echo();
 }
 
-void Stream::flushWrite(void)
+void stream::flush_write(void)
 {
   consume(_echo());
 }
@@ -52,7 +55,7 @@
  * Private methods.
  */
 
-size_t Stream::_echo(void)
+size_t stream::_echo(void)
 {
   size_t written = write(_buffer, _size, true);
   _size -= written;
@@ -60,6 +63,6 @@
   return written;
 }
 
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Server/Stream.h' => 'scalestack/echo/server/stream.h'
--- ScaleStack/Echo/Server/Stream.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/stream.h	2010-06-03 05:01:22 +0000
@@ -16,46 +16,49 @@
 #ifndef SCALESTACK_ECHO_SERVER_STREAM_H
 #define SCALESTACK_ECHO_SERVER_STREAM_H
 
-#include <ScaleStack/Common/Macros.h>
-#include <ScaleStack/Network/Stream.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-
-class SCALESTACK_API Stream: public Network::Stream
+#include <scalestack/common/macros.h>
+#include <scalestack/network/stream.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+
+class SCALESTACK_API stream: public network::stream
 {
 public:
 
-  Stream(Network::StreamService& service);
+  stream(network::stream_service& creator);
 
-  ~Stream();
+  ~stream();
 
   /**
-   * See Network::Stream::read().
+   * See network::stream::read().
    */
   size_t read(uint8_t* buffer, size_t size);
 
   /**
-   * See Network::Stream::flushWrite().
+   * See network::stream::flush_write().
    */
-  void flushWrite(void);
+  void flush_write(void);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Stream(const Stream&);
+  stream(const stream&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Stream& operator=(const Stream&);
+  stream& operator=(const stream&);
 
   /**
    * Echo the data read back to the client. This is used by both the read()
-   * and flushWrite() methods.
+   * and flush_write() methods.
    */
   SCALESTACK_LOCAL
   size_t _echo(void);
@@ -64,8 +67,8 @@
   uint8_t* _buffer;
 };
 
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_SERVER_STREAM_H */

=== renamed directory 'ScaleStack/Echo/Server/TCP' => 'scalestack/echo/server/tcp'
=== modified file 'scalestack/echo/server/tcp/plugin.ini'
--- ScaleStack/Echo/Server/TCP/plugin.ini	2010-05-01 05:23:39 +0000
+++ scalestack/echo/server/tcp/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,7 +4,7 @@
 version=0.1
 author=Eric Day <[e-mail]>
 license=BSD
-sources=Service.cc TCP.cc
-headers=Service.h
-dependencies=Echo::Server Network::IP::TCP
-tests=Test/Run
+sources=service.cc tcp.cc
+headers=service.h
+dependencies=echo::server network::ip::tcp
+tests=test/run

=== renamed file 'ScaleStack/Echo/Server/TCP/Service.cc' => 'scalestack/echo/server/tcp/service.cc'
--- ScaleStack/Echo/Server/TCP/Service.cc	2010-04-29 07:39:49 +0000
+++ scalestack/echo/server/tcp/service.cc	2010-06-03 05:01:22 +0000
@@ -15,41 +15,45 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/Stream.h>
-#include <ScaleStack/Echo/Server/TCP/Service.h>
+#include <scalestack/echo/server/stream.h>
+#include <scalestack/echo/server/tcp/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace TCP {
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace tcp
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::IP::TCP::ConnectionService(module),
-  _listener_service(module, *this)
+service::service(kernel::module& creator):
+  network::ip::tcp::connection_service(creator),
+  _listener_service(creator, *this)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   _listener_service.shutdown();
   shutdown();
 }
 
-Network::Stream* Service::addStream(void)
+network::stream* service::add_stream(void)
 {
-  return new Stream(*this);
+  return new stream(*this);
 }
 
-void Service::removeStream(Network::Stream* stream)
+void service::remove_stream(network::stream* stream)
 {
   delete stream;
 }
 
-} /* namespace TCP */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace tcp */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Server/TCP/Service.h' => 'scalestack/echo/server/tcp/service.h'
--- ScaleStack/Echo/Server/TCP/Service.h	2010-04-29 07:39:49 +0000
+++ scalestack/echo/server/tcp/service.h	2010-06-03 05:01:22 +0000
@@ -16,50 +16,54 @@
 #ifndef SCALESTACK_ECHO_SERVER_TCP_SERVICE_H
 #define SCALESTACK_ECHO_SERVER_TCP_SERVICE_H
 
-#include <ScaleStack/Network/IP/TCP/ConnectionService.h>
-#include <ScaleStack/Network/IP/TCP/ListenerService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace TCP {
-
-class Service: public Network::IP::TCP::ConnectionService
+#include <scalestack/network/ip/tcp/connection_service.h>
+#include <scalestack/network/ip/tcp/listener_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace tcp
+{
+
+class service: public network::ip::tcp::connection_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::StreamService::addStream().
-   */
-  Network::Stream *addStream(void);
-
-  /**
-   * See Network::StreamService::removeStream().
-   */
-  void removeStream(Network::Stream* stream);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::stream_service::add_stream().
+   */
+  network::stream *add_stream(void);
+
+  /**
+   * See network::stream_service::remove_stream().
+   */
+  void remove_stream(network::stream* stream);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 
-  Network::IP::TCP::ListenerService _listener_service;
+  network::ip::tcp::listener_service _listener_service;
 };
 
-} /* namespace TCP */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace tcp */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_SERVER_TCP_SERVICE_H */

=== renamed file 'ScaleStack/Echo/Server/TCP/TCP.cc' => 'scalestack/echo/server/tcp/tcp.cc'
--- ScaleStack/Echo/Server/TCP/TCP.cc	2010-05-16 09:17:44 +0000
+++ scalestack/echo/server/tcp/tcp.cc	2010-06-03 05:01:22 +0000
@@ -15,33 +15,33 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/TCP/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/echo/server/tcp/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& module)
 {
-  Network::IP::TCP::ListenerOptions(module, "7");
+  network::ip::tcp::listener_options(module, "7");
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& module)
 {
-  Echo::Server::TCP::Service* service = new Echo::Server::TCP::Service(module);
+  echo::server::tcp::service* service = new echo::server::tcp::service(module);
   try
   {
-    module.getCore().addService("Echo::Server::TCP", service);
+    module.get_core().add_service("echo::server::tcp", service);
 
     try
     {
-      /* For future possible revamp of Network::IP::TCP */
-      //service->addListeners();
+      /* For future possible revamp of network::ip::tcp */
+      //service->add_listeners();
     }
     catch (exception&)
     {
-      module.getCore().removeService("Echo::Server::TCP");
+      module.get_core().remove_service("echo::server::tcp");
       throw;
     }
   }
@@ -52,9 +52,9 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& module)
 {
-  delete module.getCore().removeService("Echo::Server::TCP");
+  delete module.get_core().remove_service("echo::server::tcp");
 }
 
 SCALESTACK_KERNEL_MODULE(options, start, stop, NULL, NULL);

=== renamed directory 'ScaleStack/Echo/Server/TCP/Test' => 'scalestack/echo/server/tcp/test'
=== renamed file 'ScaleStack/Echo/Server/TCP/Test/Run.cc' => 'scalestack/echo/server/tcp/test/run.cc'
--- ScaleStack/Echo/Server/TCP/Test/Run.cc	2010-05-04 08:58:05 +0000
+++ scalestack/echo/server/tcp/test/run.cc	2010-06-03 05:01:22 +0000
@@ -13,36 +13,36 @@
  * @brief Echo Server TCP Test
  */
 
-#include <ScaleStack/Common/Test.h>
+#include <scalestack/common/test.h>
 
 static const char* test_port = "32123";
 
 TEST_SUITE_BEGIN
 
 TEST_BEGIN(default)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::TCP", "ports", test_port);
-  core.addModuleOptionValue("Echo::Flood::TCP", "port", test_port);
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::tcp", "ports", test_port);
+  core.add_module_option_value("echo::flood::tcp", "port", test_port);
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(iterations)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::TCP", "ports", test_port);
-  core.addModuleOptionValue("Echo::Flood::TCP", "port", test_port);
-  core.addModuleOptionValue("Echo::Flood::TCP", "iterations", "5");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::tcp", "ports", test_port);
+  core.add_module_option_value("echo::flood::tcp", "port", test_port);
+  core.add_module_option_value("echo::flood::tcp", "iterations", "5");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(reconnect)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::TCP", "ports", test_port);
-  core.addModuleOptionValue("Echo::Flood::TCP", "port", test_port);
-  core.addModuleOptionValue("Echo::Flood::TCP", "iterations", "5");
-  core.addModuleOptionValue("Echo::Flood::TCP", "reconnect", "True");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::tcp", "ports", test_port);
+  core.add_module_option_value("echo::flood::tcp", "port", test_port);
+  core.add_module_option_value("echo::flood::tcp", "iterations", "5");
+  core.add_module_option_value("echo::flood::tcp", "reconnect", "True");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 

=== renamed directory 'ScaleStack/Echo/Server/UDP' => 'scalestack/echo/server/udp'
=== modified file 'scalestack/echo/server/udp/plugin.ini'
--- ScaleStack/Echo/Server/UDP/plugin.ini	2010-05-02 23:02:34 +0000
+++ scalestack/echo/server/udp/plugin.ini	2010-06-03 05:01:22 +0000
@@ -4,7 +4,7 @@
 version=0.1
 author=Chris Behrens <[e-mail]>
 license=BSD
-sources=Service.cc UDP.cc
-headers=Service.h
-dependencies=Echo::Server Network::IP::UDP
-tests=Test/Run
+sources=service.cc udp.cc
+headers=service.h
+dependencies=echo::server network::ip::udp
+tests=test/run

=== renamed file 'ScaleStack/Echo/Server/UDP/Service.cc' => 'scalestack/echo/server/udp/service.cc'
--- ScaleStack/Echo/Server/UDP/Service.cc	2010-05-04 08:58:05 +0000
+++ scalestack/echo/server/udp/service.cc	2010-06-03 05:01:22 +0000
@@ -15,39 +15,43 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/Datagram.h>
-#include <ScaleStack/Echo/Server/UDP/Service.h>
+#include <scalestack/echo/server/datagram.h>
+#include <scalestack/echo/server/udp/service.h>
 
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace UDP {
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace udp
+{
 
 /*
  * Public functions.
  */
 
-Service::Service(Kernel::Module& module):
-  Network::IP::UDP::SocketService(module)
+service::service(kernel::module& creator):
+  network::ip::udp::socket_service(creator)
 {
 }
 
-Service::~Service()
+service::~service()
 {
   shutdown();
 }
 
-Network::Datagram* Service::addDatagram(void)
+network::datagram* service::add_datagram(void)
 {
-  return new Datagram(*this);
+  return new datagram(*this);
 }
 
-void Service::removeDatagram(Network::Datagram* datagram)
+void service::remove_datagram(network::datagram* datagram)
 {
   delete datagram;
 }
 
-} /* namespace UDP */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace udp */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */

=== renamed file 'ScaleStack/Echo/Server/UDP/Service.h' => 'scalestack/echo/server/udp/service.h'
--- ScaleStack/Echo/Server/UDP/Service.h	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/udp/service.h	2010-06-03 05:01:22 +0000
@@ -16,47 +16,51 @@
 #ifndef SCALESTACK_ECHO_SERVER_UDP_SERVICE_H
 #define SCALESTACK_ECHO_SERVER_UDP_SERVICE_H
 
-#include <ScaleStack/Network/IP/UDP/SocketService.h>
-
-namespace ScaleStack {
-namespace Echo {
-namespace Server {
-namespace UDP {
-
-class Service: public Network::IP::UDP::SocketService
+#include <scalestack/network/ip/udp/socket_service.h>
+
+namespace scalestack
+{
+namespace echo
+{
+namespace server
+{
+namespace udp
+{
+
+class service: public network::ip::udp::socket_service
 {
 public:
 
-  Service(Kernel::Module& module);
-
-  ~Service();
-
-  /**
-   * See Network::DatagramService::addDatagram().
-   */
-  Network::Datagram *addDatagram(void);
-
-  /**
-   * See Network::DatagramService::removeDatagram().
-   */
-  void removeDatagram(Network::Datagram* datagram);
+  service(kernel::module& creator);
+
+  ~service();
+
+  /**
+   * See network::datagram_service::add_datagram().
+   */
+  network::datagram *add_datagram(void);
+
+  /**
+   * See network::datagram_service::remove_datagram().
+   */
+  void remove_datagram(network::datagram* datagram);
 
 private:
 
   /**
    * Don't allow copying of objects.
    */
-  Service(const Service&);
+  service(const service&);
 
   /**
    * Don't allow assignment of objects.
    */
-  Service& operator=(const Service&);
+  service& operator=(const service&);
 };
 
-} /* namespace UDP */
-} /* namespace Server */
-} /* namespace Echo */
-} /* namespace ScaleStack */
+} /* namespace udp */
+} /* namespace server */
+} /* namespace echo */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_ECHO_SERVER_UDP_SERVICE_H */

=== renamed directory 'ScaleStack/Echo/Server/UDP/Test' => 'scalestack/echo/server/udp/test'
=== renamed file 'ScaleStack/Echo/Server/UDP/Test/Run.cc' => 'scalestack/echo/server/udp/test/run.cc'
--- ScaleStack/Echo/Server/UDP/Test/Run.cc	2010-05-16 16:49:23 +0000
+++ scalestack/echo/server/udp/test/run.cc	2010-06-03 05:01:22 +0000
@@ -13,35 +13,35 @@
  * @brief Echo Server UDP Test
  */
 
-#include <ScaleStack/Common/Test.h>
+#include <scalestack/common/test.h>
 
 static const char* test_hosts = "127.0.0.1:32123";
 
 TEST_SUITE_BEGIN
 
 TEST_BEGIN(default)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UDP", "hosts", test_hosts);
-  core.addModuleOptionValue("Echo::Flood::UDP", "hosts", test_hosts);
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::udp", "hosts", test_hosts);
+  core.add_module_option_value("echo::flood::udp", "hosts", test_hosts);
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(iterations)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UDP", "hosts", test_hosts);
-  core.addModuleOptionValue("Echo::Flood::UDP", "hosts", test_hosts);
-  core.addModuleOptionValue("Echo::Flood::UDP", "iterations", "5");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::udp", "hosts", test_hosts);
+  core.add_module_option_value("echo::flood::udp", "hosts", test_hosts);
+  core.add_module_option_value("echo::flood::udp", "iterations", "5");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 
 TEST_BEGIN(packet_size)
-  core.addModuleOptionValue("Event::Service", "", TEST_EVENT_SERVICE);
-  core.addModuleOptionValue("Echo::Server::UDP", "hosts", test_hosts);
-  core.addModuleOptionValue("Echo::Flood::UDP", "hosts", test_hosts);
-  core.addModuleOptionValue("Echo::Flood::UDP", "packet_size", "128");
-  core.setSignalHandlers();
+  core.add_module_option_value("event::service", "", TEST_EVENT_SERVICE);
+  core.add_module_option_value("echo::server::udp", "hosts", test_hosts);
+  core.add_module_option_value("echo::flood::udp", "hosts", test_hosts);
+  core.add_module_option_value("echo::flood::udp", "packet_size", "128");
+  core.set_signal_handlers();
   core.run();
 TEST_END
 

=== renamed file 'ScaleStack/Echo/Server/UDP/UDP.cc' => 'scalestack/echo/server/udp/udp.cc'
--- ScaleStack/Echo/Server/UDP/UDP.cc	2010-05-16 06:20:02 +0000
+++ scalestack/echo/server/udp/udp.cc	2010-06-03 05:01:22 +0000
@@ -15,33 +15,33 @@
 
 #include "config.h"
 
-#include <ScaleStack/Echo/Server/UDP/Service.h>
-#include <ScaleStack/Kernel/Core.h>
-#include <ScaleStack/Kernel/Module.h>
-#include <ScaleStack/Kernel/Option.h>
+#include <scalestack/echo/server/udp/service.h>
+#include <scalestack/kernel/core.h>
+#include <scalestack/kernel/module.h>
+#include <scalestack/kernel/option.h>
 
 using namespace std;
-using namespace ScaleStack;
+using namespace scalestack;
 
-static void options(Kernel::Module& module)
+static void options(kernel::module& module)
 {
-  Network::IP::UDP::SocketService::Options(module, ":7");
+  network::ip::udp::socket_service::options(module, ":7");
 }
 
-static void start(Kernel::Module& module)
+static void start(kernel::module& module)
 {
-  Echo::Server::UDP::Service* service = new Echo::Server::UDP::Service(module);
+  echo::server::udp::service* service = new echo::server::udp::service(module);
   try
   {
-    module.getCore().addService("Echo::Server::UDP", service);
+    module.get_core().add_service("echo::server::udp", service);
 
     try
     {
-      service->addSockets();
+      service->add_sockets();
     }
     catch (exception&)
     {
-      module.getCore().removeService("Echo::Server::UDP");
+      module.get_core().remove_service("echo::server::udp");
       throw;
     }
   }
@@ -52,9 +52,9 @@
   }
 }
 
-static void stop(Kernel::Module& module)
+static void stop(kernel::module& module)
 {
-  delete module.getCore().removeService("Echo::Server::UDP");
+  delete module.get_core().remove_service("echo::server::udp");
 }
 
 SCALESTACK_KERNEL_MODULE(options, start, stop, NULL, NULL);

=== renamed directory 'ScaleStack/Event' => 'scalestack/event'
=== renamed file 'ScaleStack/Event/Event.cc' => 'scalestack/event/event.cc'
--- ScaleStack/Event/Event.cc	2010-03-24 05:15:11 +0000
+++ scalestack/event/event.cc	2010-06-03 05:01:22 +0000
@@ -15,6 +15,6 @@
 
 #include "config.h"
 
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/kernel/module.h>
 
 SCALESTACK_KERNEL_MODULE(NULL, NULL, NULL, NULL, NULL);

=== renamed file 'ScaleStack/Event/Handler.h' => 'scalestack/event/handler.h'
--- ScaleStack/Event/Handler.h	2010-05-03 08:30:52 +0000
+++ scalestack/event/handler.h	2010-06-03 05:01:22 +0000
@@ -18,32 +18,34 @@
 
 #include <ctime>
 
-#include <ScaleStack/Common/Macros.h>
-#include <ScaleStack/Event/Service.h>
-
-namespace ScaleStack {
-namespace Event {
-
-class HandlerProvider;
+#include <scalestack/common/macros.h>
+#include <scalestack/event/service.h>
+
+namespace scalestack
+{
+namespace event
+{
+
+class handler_provider;
 
 /**
  * This is the event handler base class. Other classes that want to add and
  * handle events must derive from this.
  */
-class SCALESTACK_API Handler
+class SCALESTACK_API handler
 {
-  friend class HandlerProvider;
+  friend class handler_provider;
 
 public:
 
-  Handler(Service& service);
+  handler(service& creator);
 
-  virtual ~Handler();
+  virtual ~handler();
 
   /**
    * Get the service this handler belongs to.
    */
-  Service& getService(void);
+  service& get_service(void);
 
   /**
    * This method is run after the event service has added it.
@@ -67,12 +69,12 @@
    * @param[in] seconds The number of seconds from now for the timer to
    *  expire. A value of 0 cancels the timer.
    */
-  void setTimer(time_t seconds);
+  void set_timer(time_t seconds);
 
   /**
    * Run when the timer expires.
    */
-  virtual void timerExpired(void);
+  virtual void timer_expired(void);
 
   /**
    * Set the file descriptor to watch.
@@ -80,42 +82,42 @@
    * @param[in] file_descriptor The file descriptor to use when watching
    *  for read and write events.
    */
-  void setFileDescriptor(int file_descriptor);
+  void set_file_descriptor(int file_descriptor);
 
   /**
    * Watch the file descriptor for reading.
    */
-  void watchRead(void);
+  void watch_read(void);
 
   /**
    * Run when the file descriptor is ready for reading.
    */
-  virtual void readReady(int file_descriptor);
+  virtual void read_ready(int file_descriptor);
 
   /**
    * Watch the file descriptor for writing.
    */
-  void watchWrite(void);
+  void watch_write(void);
 
   /**
    * Run when the file descriptor is ready for writing.
    */
-  virtual void writeReady(int file_descriptor);
+  virtual void write_ready(int file_descriptor);
 
   /**
    * Notify the event service to run this handler now.
    */
-  void runNow(void);
+  void run_now(void);
 
   /**
-   * Run when the event service receives a runNow() request.
+   * Run when the event service receives a run_now() request.
    */
   virtual void run(void);
 
 protected:
 
-  Service& _service;
-  Kernel::Module& _module;
+  service& _service;
+  kernel::module& _module;
 
 private:
 
@@ -123,102 +125,102 @@
    * Don't allow copying of objects.
    */
   SCALESTACK_LOCAL
-  Handler(const Handler&);
+  handler(const handler&);
 
   /**
    * Don't allow assignment of objects.
    */
   SCALESTACK_LOCAL
-  Handler& operator=(const Handler&);
+  handler& operator=(const handler&);
 
-  HandlerProvider* _handler_provider;
+  handler_provider* _handler_provider;
 };
 
 /**
  * This is the base class for classes that provide event handlers. Instances
- * of this class are bound to Handler instances in order to provider the
+ * of this class are bound to handler instances in order to provider the
  * implementation.
  */
-class SCALESTACK_API HandlerProvider
+class SCALESTACK_API handler_provider
 {
 public:
 
-  HandlerProvider(void);
+  handler_provider(void);
 
-  virtual ~HandlerProvider();
+  virtual ~handler_provider();
 
   /**
-   * Get the Handler bound to this provider.
+   * Get the handler bound to this provider.
    */
-  Handler* getHandler(void) const;
+  handler* get_handler(void) const;
 
   /**
-   * Set the Handler for this HandlerProvider. This is used while initializing
-   * the event handler in the service class. This is required in order
-   * to reuse both Handler and HandlerProvider instances, which will be
-   * implemented by unrelated classes.
+   * Set the handler for this handler_provider. This is used while
+   * initializing the event handler in the service class. This is required
+   * in order to reuse both handler and handler_provider instances, which
+   * will be implemented by unrelated classes.
    *
-   * @param[in] handler Handler to set for this provider.
+   * @param[in] bound_handler Handler to bind to this provider.
    */
-  void setHandler(Handler* handler);
+  void set_handler(handler* bound_handler);
 
   /**
-   * See Handler::start().
+   * See handler::start().
    */
   void start(void);
 
   /**
-   * See Handler::remove().
+   * See handler::remove().
    */
   virtual void remove(void) = 0;
 
   /**
-   * See Handler::error().
+   * See handler::error().
    */
   void error(void);
 
   /**
-   * See Handler::setTimer().
-   */
-  virtual void setTimer(time_t seconds) = 0;
-
-  /**
-   * See Handler::timerExpired().
-   */
-  void timerExpired(void);
-
-  /**
-   * See Handler::setFileDescriptor().
-   */
-  virtual void setFileDescriptor(int file_descriptor) = 0;
-
-  /**
-   * See Handler::watchRead().
-   */
-  virtual void watchRead(void) = 0;
-
-  /**
-   * See Handler::readReady().
-   */
-  void readReady(int file_descriptor);
-
-  /**
-   * See Handler::watchWrite().
-   */
-  virtual void watchWrite(void) = 0;
-
-  /**
-   * See Handler::writeReady().
-   */
-  void writeReady(int file_descriptor);
-
-  /**
-   * See Handler::runNow().
-   */
-  virtual void runNow(void) = 0;
-
-  /**
-   * See Handler::run().
+   * See handler::set_timer().
+   */
+  virtual void set_timer(time_t seconds) = 0;
+
+  /**
+   * See handler::timer_expired().
+   */
+  void timer_expired(void);
+
+  /**
+   * See handler::set_file_descriptor().
+   */
+  virtual void set_file_descriptor(int file_descriptor) = 0;
+
+  /**
+   * See handler::watch_read().
+   */
+  virtual void watch_read(void) = 0;
+
+  /**
+   * See handler::read_ready().
+   */
+  void read_ready(int file_descriptor);
+
+  /**
+   * See handler::watch_write().
+   */
+  virtual void watch_write(void) = 0;
+
+  /**
+   * See handler::write_ready().
+   */
+  void write_ready(int file_descriptor);
+
+  /**
+   * See handler::run_now().
+   */
+  virtual void run_now(void) = 0;
+
+  /**
+   * See handler::run().
    */
   void run(void);
 
@@ -228,147 +230,147 @@
    * Don't allow copying of objects.
    */
   SCALESTACK_LOCAL
-  HandlerProvider(const HandlerProvider&);
+  handler_provider(const handler_provider&);
 
   /**
    * Don't allow assignment of objects.
    */
   SCALESTACK_LOCAL
-  HandlerProvider& operator=(const HandlerProvider&);
+  handler_provider& operator=(const handler_provider&);
 
-  Handler* _handler;
+  handler* _handler;
 };
 
 /*
- * Public Handler methods.
+ * Public handler methods.
  */
 
-inline Handler::Handler(Service& service):
-  _service(service),
-  _module(service.getModule()),
+inline handler::handler(service& creator):
+  _service(creator),
+  _module(creator.get_module()),
   _handler_provider(NULL)
 {
 }
 
-inline Handler::~Handler()
+inline handler::~handler()
 {
 }
 
-inline Service& Handler::getService(void)
+inline service& handler::get_service(void)
 {
   return _service;
 }
 
-inline void Handler::start(void)
+inline void handler::start(void)
 {
 }
 
-inline void Handler::remove(void)
+inline void handler::remove(void)
 {
   _handler_provider->remove();
 }
 
-inline void Handler::error(void)
+inline void handler::error(void)
 {
   remove();
 }
 
-inline void Handler::setTimer(time_t timer)
-{
-  _handler_provider->setTimer(timer);
-}
-
-inline void Handler::timerExpired(void)
-{
-}
-
-inline void Handler::setFileDescriptor(int file_descriptor)
-{
-  _handler_provider->setFileDescriptor(file_descriptor);
-}
-
-inline void Handler::watchRead(void)
-{
-  _handler_provider->watchRead();
-}
-
-inline void Handler::readReady(int)
-{
-}
-
-inline void Handler::watchWrite(void)
-{
-  _handler_provider->watchWrite();
-}
-
-inline void Handler::writeReady(int)
-{
-}
-
-inline void Handler::runNow(void)
-{
-  _handler_provider->runNow();
-}
-
-inline void Handler::run(void)
+inline void handler::set_timer(time_t timer)
+{
+  _handler_provider->set_timer(timer);
+}
+
+inline void handler::timer_expired(void)
+{
+}
+
+inline void handler::set_file_descriptor(int file_descriptor)
+{
+  _handler_provider->set_file_descriptor(file_descriptor);
+}
+
+inline void handler::watch_read(void)
+{
+  _handler_provider->watch_read();
+}
+
+inline void handler::read_ready(int)
+{
+}
+
+inline void handler::watch_write(void)
+{
+  _handler_provider->watch_write();
+}
+
+inline void handler::write_ready(int)
+{
+}
+
+inline void handler::run_now(void)
+{
+  _handler_provider->run_now();
+}
+
+inline void handler::run(void)
 {
 }
 
 /*
- * Public HandlerProvider methods.
+ * Public handler_provider methods.
  */
 
-inline HandlerProvider::HandlerProvider(void):
+inline handler_provider::handler_provider(void):
   _handler(NULL)
 {
 }
 
-inline HandlerProvider::~HandlerProvider()
+inline handler_provider::~handler_provider()
 {
 }
 
-inline Handler* HandlerProvider::getHandler(void) const
+inline handler* handler_provider::get_handler(void) const
 {
   return _handler;
 }
 
-inline void HandlerProvider::setHandler(Handler* handler)
+inline void handler_provider::set_handler(handler* bound_handler)
 {
-  _handler = handler;
+  _handler = bound_handler;
   _handler->_handler_provider = this;
 }
 
-inline void HandlerProvider::start(void)
+inline void handler_provider::start(void)
 {
   _handler->start();
 }
 
-inline void HandlerProvider::error(void)
+inline void handler_provider::error(void)
 {
   _handler->error();
 }
 
-inline void HandlerProvider::timerExpired(void)
-{
-  _handler->timerExpired();
-}
-
-inline void HandlerProvider::readReady(int file_descriptor)
-{
-  _handler->readReady(file_descriptor);
-}
-
-inline void HandlerProvider::writeReady(int file_descriptor)
-{
-  _handler->writeReady(file_descriptor);
-}
-
-inline void HandlerProvider::run(void)
+inline void handler_provider::timer_expired(void)
+{
+  _handler->timer_expired();
+}
+
+inline void handler_provider::read_ready(int file_descriptor)
+{
+  _handler->read_ready(file_descriptor);
+}
+
+inline void handler_provider::write_ready(int file_descriptor)
+{
+  _handler->write_ready(file_descriptor);
+}
+
+inline void handler_provider::run(void)
 {
   _handler->run();
 }
 
-} /* namespace Event */
-} /* namespace ScaleStack */
+} /* namespace event */
+} /* namespace scalestack */
 
 #endif /* SCALESTACK_EVENT_HANDLER_H */

=== renamed directory 'ScaleStack/Event/Libevent' => 'scalestack/event/libevent'
=== renamed file 'ScaleStack/Event/Libevent/HandlerProvider.cc' => 'scalestack/event/libevent/handler_provider.cc'
--- ScaleStack/Event/Libevent/HandlerProvider.cc	2010-04-30 03:54:30 +0000
+++ scalestack/event/libevent/handler_provider.cc	2010-06-03 05:01:22 +0000
@@ -19,32 +19,35 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <ScaleStack/Event/Libevent/HandlerProvider.h>
-#include <ScaleStack/Event/Libevent/Thread.h>
-#include <ScaleStack/Kernel/Module.h>
+#include <scalestack/event/libevent/handler_provider.h>
+#include <scalestack/event/libevent/thread.h>
+#include <scalestack/kernel/module.h>
 
 using namespace std;
 
-namespace ScaleStack {
-namespace Event {
-namespace Libevent {
+namespace scalestack
+{
+namespace event
+{
+namespace libevent
+{
 
 /*
  * Public functions.
  */
 
-extern "C" void HandlerProviderCallback(int file_descriptor, short events,
+extern "C" void handler_provider_callback(int file_descriptor, short events,
                                         void* context)
 {
-  HandlerProvider* handler_provider = static_cast<HandlerProvider*>(context);
-  handler_provider->_callback(file_descriptor, events);
+  handler_provider* new_handler_provider = static_cast<handler_provider*>(context);
+  new_handler_provider->_callback(file_descriptor, events);
 }
 
 /*
  * Public methods.
  */
 
-HandlerProvider::HandlerProvider(Kernel::Module& module):
+handler_provider::handler_provider(kernel::module& module):
   _in_check_queue(false),
   _need_start(false),
   _need_update(false),
@@ -68,12 +71,12 @@
 {
 }
 
-HandlerProvider::~HandlerProvider()
+handler_provider::~handler_provider()
 {
-  setThread(NULL);
+  set_thread(NULL);
 }
 
-void HandlerProvider::setThread(Thread* thread)
+void handler_provider::set_thread(thread* thread)
 {
   _thread = thread;
 
@@ -89,23 +92,23 @@
   {
     _need_start = true;
     if (!_in_check_queue)
-      _thread->checkHandlerProvider(this);
+      _thread->check_handler_provider(this);
   }
 }
 
-bool HandlerProvider::addToCheckQueue(void)
+bool handler_provider::add_to_check_queue(void)
 {
   if (_in_check_queue)
     return false;
 
-  _module.logInfo("[%X] Adding to check queue", this);
+  _module.log_info("[%X] Adding to check queue", this);
   _in_check_queue = true;
   return true;
 }
 
-void HandlerProvider::check(void)
+void handler_provider::check(void)
 {
-  _module.logInfo("[%X] Checking", this);
+  _module.log_info("[%X] Checking", this);
 
   _in_check_queue = false;
   _is_processing = true;
@@ -124,33 +127,33 @@
 
   _is_processing = false;
   _need_update = false;
-  _updateEvent();
+  _update_event();
 }
 
-bool HandlerProvider::needRemove(void)
+bool handler_provider::need_remove(void)
 {
   return _need_remove;
 }
 
-void HandlerProvider::remove(void)
+void handler_provider::remove(void)
 {
-  _module.logInfo("[%X] Removing", this);
+  _module.log_info("[%X] Removing", this);
   _need_remove = true;
   if (!_in_check_queue)
-    _thread->checkHandlerProvider(this);
+    _thread->check_handler_provider(this);
 }
 
-void HandlerProvider::setTimer(time_t seconds)
+void handler_provider::set_timer(time_t seconds)
 {
   if (seconds == 0)
     _expire_time = 0;
   else
-    _expire_time = _thread->getNow().tv_sec + seconds;
+    _expire_time = _thread->get_now().tv_sec + seconds;
 
-  _sendUpdateNotification();
+  _send_update_notification();
 }
 
-void HandlerProvider::setFileDescriptor(int file_descriptor)
+void handler_provider::set_file_descriptor(int file_descriptor)
 {
   _file_descriptor = file_descriptor;
   _file_descriptor_updated = true;
@@ -161,47 +164,47 @@
     if (return_code == -1)
     {
       close(_file_descriptor);
-      _module.logFatal("Failed fcntl: %d", errno);
+      _module.log_fatal("Failed fcntl: %d", errno);
     }
 
     return_code = fcntl(_file_descriptor, F_SETFL, return_code | O_NONBLOCK);
     if (return_code == -1)
     {
       close(_file_descriptor);
-      _module.logFatal("Failed fcntl: %d", errno);
+      _module.log_fatal("Failed fcntl: %d", errno);
     }
   }
 
-  _sendUpdateNotification();
+  _send_update_notification();
 }
 
-void HandlerProvider::watchRead(void)
+void handler_provider::watch_read(void)
 {
   _watch_read = true;
-  _sendUpdateNotification();
+  _send_update_notification();
 }
 
-void HandlerProvider::watchWrite(void)
+void handler_provider::watch_write(void)
 {
   _watch_write = true;
-  _sendUpdateNotification();
+  _send_update_notification();
 }
 
-void HandlerProvider::runNow(void)
+void handler_provider::run_now(void)
 {
   _need_run = true;
   if (!_in_check_queue)
-    _thread->checkHandlerProvider(this);
+    _thread->check_handler_provider(this);
 }
 
 /*
  * Private methods.
  */
 
-void HandlerProvider::_sendUpdateNotification(void)
+void handler_provider::_send_update_notification(void)
 {
   /*
-   * We call updateEvent() after processing callbacks, so don't bother doing
+   * We call update_event() after processing callbacks, so don't bother doing
    * anything now if we're already in callbacks. This may be due to recursion
    * or coincidence with another thread.
    */
@@ -216,11 +219,11 @@
   {
     _need_update = true;
     if (!_in_check_queue)
-      _thread->checkHandlerProvider(this);
+      _thread->check_handler_provider(this);
   }
 }
 
-void HandlerProvider::_updateEvent(void)
+void handler_provider::_update_event(void)
 {
   _need_update = false;
 
@@ -256,12 +259,12 @@
         events |= EV_WRITE;
     }
 
-    event_set(&_event, _file_descriptor, events, HandlerProviderCallback, this);
+    event_set(&_event, _file_descriptor, events, handler_provider_callback, this);
 
-    if (event_base_set(_thread->getEventBase(), &_event) == -1)
+    if (event_base_set(_thread->get_event_base(), &_event) == -1)
     {
       _is_set = false;
-      _module.logError("Failed event_base_set: -1");
+      _module.log_error("Failed event_base_set: -1");
       remove();
       return;
     }
@@ -286,7 +289,7 @@
   if (return_code == -1)
   {
     _is_added = false;
-    _module.logError("Failed event_add: -1");
+    _module.log_error("Failed event_add: -1");
     remove();
     return;
   }
@@ -294,7 +297,7 @@
   _is_added = true;
 }
 
-void HandlerProvider::_callback(int file_descriptor, short events)
+void handler_provider::_callback(int file_descriptor, short events)
 {
   _is_processing = true;
 
@@ -302,33 +305,33 @@
   {
     _set_expire_time = 0;
 
-    if (_thread->getNow().tv_sec >= _expire_time)
+    if (_thread->get_now().tv_sec >= _expire_time)
     {
-      _module.logDebug("[%X] Timer expired", this);
+      _module.log_debug("[%X] Timer expired", this);
       _expire_time = 0;
-      timerExpired();
+      timer_expired();
     }